--- a/pidgin/gtkconv.c Fri Aug 10 17:45:05 2007 +0000
+++ b/pidgin/gtkconv.c Sat Aug 11 03:21:36 2007 +0000
@@ -8540,6 +8540,22 @@
gtkconv->tab_cont));
}
+static gboolean
+close_button_left_cb(GtkWidget *widget, GdkEventCrossing *event, GtkLabel *label)
+{
+ gtk_label_set_markup(label, "×");
+ return FALSE;
+}
+
+static gboolean
+close_button_entered_cb(GtkWidget *widget, GdkEventCrossing *event, GtkLabel *label)
+{
+ gtk_label_set_markup(label, "<b>×</b>");
+ return FALSE;
+}
+
+
+
void
pidgin_conv_window_add_gtkconv(PidginWindow *win, PidginConversation *gtkconv)
{
@@ -8562,8 +8578,10 @@
/* Close button. */
gtkconv->close = gtk_event_box_new();
gtk_event_box_set_visible_window(GTK_EVENT_BOX(gtkconv->close), FALSE);
- close_image = gtk_label_new(NULL);
- gtk_label_set_markup(GTK_LABEL(close_image),"<b>×</b>");
+ gtk_widget_set_events(gtkconv->close, GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK);
+ close_image = gtk_label_new("×");
+ g_signal_connect(G_OBJECT(gtkconv->close), "enter-notify-event", G_CALLBACK(close_button_entered_cb), close_image);
+ g_signal_connect(G_OBJECT(gtkconv->close), "leave-notify-event", G_CALLBACK(close_button_left_cb), close_image);
gtk_widget_show(close_image);
gtk_container_add(GTK_CONTAINER(gtkconv->close), close_image);
gtk_tooltips_set_tip(gtkconv->tooltips, gtkconv->close,
@@ -8616,9 +8634,6 @@
if (pidgin_conv_window_get_gtkconv_count(win) == 1) {
/* Er, bug in notebooks? Switch to the page manually. */
gtk_notebook_set_current_page(GTK_NOTEBOOK(win->notebook), 0);
-
- gtk_notebook_set_show_tabs(GTK_NOTEBOOK(win->notebook),
- purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/tabs"));
} else {
gtk_notebook_set_show_tabs(GTK_NOTEBOOK(win->notebook), TRUE);
}
@@ -8717,6 +8732,12 @@
!tabs_side && !angle && pidgin_conv_window_get_gtkconv_count(win) > 1,
TRUE, GTK_PACK_START);
+ if (pidgin_conv_window_get_gtkconv_count(win) == 1)
+ gtk_notebook_set_show_tabs(GTK_NOTEBOOK(win->notebook),
+ !purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/im/show_buddy_icons") ||
+ purple_prefs_get_int(PIDGIN_PREFS_ROOT "/conversations/tab_side") == GTK_POS_LEFT ||
+ purple_prefs_get_int(PIDGIN_PREFS_ROOT "/conversations/tab_side") == GTK_POS_RIGHT);
+
/* show the widgets */
/* gtk_widget_show(gtkconv->icon); */
gtk_widget_show(gtkconv->tab_label);
@@ -8740,12 +8761,6 @@
gtk_notebook_remove_page(GTK_NOTEBOOK(win->notebook), index);
- /* go back to tabless */
- if (pidgin_conv_window_get_gtkconv_count(win) <= 2) {
- gtk_notebook_set_show_tabs(GTK_NOTEBOOK(win->notebook),
- purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/tabs"));
- }
-
win->gtkconvs = g_list_remove(win->gtkconvs, gtkconv);
if (win->gtkconvs && win->gtkconvs->next == NULL)
Binary file pidgin/pixmaps/emotes/default/22/act-up.png has changed
Binary file pidgin/pixmaps/emotes/default/22/alien.png has changed
Binary file pidgin/pixmaps/emotes/default/22/angel.png has changed
Binary file pidgin/pixmaps/emotes/default/22/angry.png has changed
Binary file pidgin/pixmaps/emotes/default/22/arrogant.png has changed
Binary file pidgin/pixmaps/emotes/default/22/at-wits-end.png has changed
Binary file pidgin/pixmaps/emotes/default/22/bashful.png has changed
Binary file pidgin/pixmaps/emotes/default/22/beat-up.png has changed
Binary file pidgin/pixmaps/emotes/default/22/beauty.png has changed
Binary file pidgin/pixmaps/emotes/default/22/blowkiss.png has changed
Binary file pidgin/pixmaps/emotes/default/22/bye.png has changed
Binary file pidgin/pixmaps/emotes/default/22/call-me.png has changed
Binary file pidgin/pixmaps/emotes/default/22/clap.png has changed
Binary file pidgin/pixmaps/emotes/default/22/confused.png has changed
Binary file pidgin/pixmaps/emotes/default/22/crying.png has changed
Binary file pidgin/pixmaps/emotes/default/22/curl-lip.png has changed
Binary file pidgin/pixmaps/emotes/default/22/curse.png has changed
Binary file pidgin/pixmaps/emotes/default/22/cute.png has changed
Binary file pidgin/pixmaps/emotes/default/22/dance.png has changed
Binary file pidgin/pixmaps/emotes/default/22/dazed.png has changed
Binary file pidgin/pixmaps/emotes/default/22/desire.png has changed
Binary file pidgin/pixmaps/emotes/default/22/devil.png has changed
Binary file pidgin/pixmaps/emotes/default/22/disapointed.png has changed
Binary file pidgin/pixmaps/emotes/default/22/disdain.png has changed
Binary file pidgin/pixmaps/emotes/default/22/doh.png has changed
Binary file pidgin/pixmaps/emotes/default/22/dont-know.png has changed
Binary file pidgin/pixmaps/emotes/default/22/drool.png has changed
Binary file pidgin/pixmaps/emotes/default/22/eat.png has changed
Binary file pidgin/pixmaps/emotes/default/22/embarrassed.png has changed
Binary file pidgin/pixmaps/emotes/default/22/excruciating.png has changed
Binary file pidgin/pixmaps/emotes/default/22/eyeroll.png has changed
Binary file pidgin/pixmaps/emotes/default/22/fingers-crossed.png has changed
Binary file pidgin/pixmaps/emotes/default/22/foot-in-mouth.png has changed
Binary file pidgin/pixmaps/emotes/default/22/freaked-out.png has changed
Binary file pidgin/pixmaps/emotes/default/22/glasses-cool.png has changed
Binary file pidgin/pixmaps/emotes/default/22/glasses-nerdy.png has changed
Binary file pidgin/pixmaps/emotes/default/22/go-away.png has changed
Binary file pidgin/pixmaps/emotes/default/22/handshake.png has changed
Binary file pidgin/pixmaps/emotes/default/22/highfive.png has changed
Binary file pidgin/pixmaps/emotes/default/22/hug-left.png has changed
Binary file pidgin/pixmaps/emotes/default/22/hug-right.png has changed
Binary file pidgin/pixmaps/emotes/default/22/hypnotized.png has changed
Binary file pidgin/pixmaps/emotes/default/22/in-love.png has changed
Binary file pidgin/pixmaps/emotes/default/22/jump.png has changed
Binary file pidgin/pixmaps/emotes/default/22/kiss.png has changed
Binary file pidgin/pixmaps/emotes/default/22/lashes.png has changed
Binary file pidgin/pixmaps/emotes/default/22/laugh.png has changed
Binary file pidgin/pixmaps/emotes/default/22/lying.png has changed
Binary file pidgin/pixmaps/emotes/default/22/mean.png has changed
Binary file pidgin/pixmaps/emotes/default/22/meeting.png has changed
Binary file pidgin/pixmaps/emotes/default/22/moneymouth.png has changed
Binary file pidgin/pixmaps/emotes/default/22/nailbiting.png has changed
Binary file pidgin/pixmaps/emotes/default/22/neutral.png has changed
Binary file pidgin/pixmaps/emotes/default/22/on-the-phone.png has changed
Binary file pidgin/pixmaps/emotes/default/22/party.png has changed
Binary file pidgin/pixmaps/emotes/default/22/pissed-off.png has changed
Binary file pidgin/pixmaps/emotes/default/22/pray.png has changed
Binary file pidgin/pixmaps/emotes/default/22/question.png has changed
Binary file pidgin/pixmaps/emotes/default/22/quiet.png has changed
Binary file pidgin/pixmaps/emotes/default/22/rotfl.png has changed
Binary file pidgin/pixmaps/emotes/default/22/sad.png has changed
Binary file pidgin/pixmaps/emotes/default/22/sarcastic.png has changed
Binary file pidgin/pixmaps/emotes/default/22/secret.png has changed
Binary file pidgin/pixmaps/emotes/default/22/shame.png has changed
Binary file pidgin/pixmaps/emotes/default/22/shock.png has changed
Binary file pidgin/pixmaps/emotes/default/22/shout.png has changed
Binary file pidgin/pixmaps/emotes/default/22/shut-mouth.png has changed
Binary file pidgin/pixmaps/emotes/default/22/sick.png has changed
Binary file pidgin/pixmaps/emotes/default/22/silly.png has changed
Binary file pidgin/pixmaps/emotes/default/22/skywalker.png has changed
Binary file pidgin/pixmaps/emotes/default/22/sleepy.png has changed
Binary file pidgin/pixmaps/emotes/default/22/smile-big.png has changed
Binary file pidgin/pixmaps/emotes/default/22/smile.png has changed
Binary file pidgin/pixmaps/emotes/default/22/smirk.png has changed
Binary file pidgin/pixmaps/emotes/default/22/snicker.png has changed
Binary file pidgin/pixmaps/emotes/default/22/soldier.png has changed
Binary file pidgin/pixmaps/emotes/default/22/starving.png has changed
Binary file pidgin/pixmaps/emotes/default/22/struggle.png has changed
Binary file pidgin/pixmaps/emotes/default/22/sweat.png has changed
Binary file pidgin/pixmaps/emotes/default/22/teeth.png has changed
Binary file pidgin/pixmaps/emotes/default/22/terror.png has changed
Binary file pidgin/pixmaps/emotes/default/22/thinking.png has changed
Binary file pidgin/pixmaps/emotes/default/22/time-out.png has changed
Binary file pidgin/pixmaps/emotes/default/22/tongue.png has changed
Binary file pidgin/pixmaps/emotes/default/22/tremble.png has changed
Binary file pidgin/pixmaps/emotes/default/22/vampire.png has changed
Binary file pidgin/pixmaps/emotes/default/22/victory.png has changed
Binary file pidgin/pixmaps/emotes/default/22/waiting.png has changed
Binary file pidgin/pixmaps/emotes/default/22/weep.png has changed
Binary file pidgin/pixmaps/emotes/default/22/wilt.png has changed
Binary file pidgin/pixmaps/emotes/default/22/wink.png has changed
Binary file pidgin/pixmaps/emotes/default/22/yawn.png has changed
