# HG changeset patch # User Sean Egan # Date 1186802496 0 # Node ID 1d96cfd8879f3dcd89fb2bd4ee5e2b19cd9d507b # Parent e7314d58ebe68e4005ca4557a42f9edbd80898cb# Parent 8704cb2ed8e26a1b7fd3936cd4060eb633b1f2fb merge of '408e22fd58560f1326bfd9ebb031f2d0fd99a906' and '45f3c77584e15822a1c8508ddcf2cb4f655e0980' diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/gtkconv.c --- 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, "×"); + 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),"×"); + 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) diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/act-up.png Binary file pidgin/pixmaps/emotes/default/22/act-up.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/alien.png Binary file pidgin/pixmaps/emotes/default/22/alien.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/angel.png Binary file pidgin/pixmaps/emotes/default/22/angel.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/angry.png Binary file pidgin/pixmaps/emotes/default/22/angry.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/arrogant.png Binary file pidgin/pixmaps/emotes/default/22/arrogant.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/at-wits-end.png Binary file pidgin/pixmaps/emotes/default/22/at-wits-end.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/bashful.png Binary file pidgin/pixmaps/emotes/default/22/bashful.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/beat-up.png Binary file pidgin/pixmaps/emotes/default/22/beat-up.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/beauty.png Binary file pidgin/pixmaps/emotes/default/22/beauty.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/blowkiss.png Binary file pidgin/pixmaps/emotes/default/22/blowkiss.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/bye.png Binary file pidgin/pixmaps/emotes/default/22/bye.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/call-me.png Binary file pidgin/pixmaps/emotes/default/22/call-me.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/clap.png Binary file pidgin/pixmaps/emotes/default/22/clap.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/confused.png Binary file pidgin/pixmaps/emotes/default/22/confused.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/crying.png Binary file pidgin/pixmaps/emotes/default/22/crying.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/curl-lip.png Binary file pidgin/pixmaps/emotes/default/22/curl-lip.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/curse.png Binary file pidgin/pixmaps/emotes/default/22/curse.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/cute.png Binary file pidgin/pixmaps/emotes/default/22/cute.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/dance.png Binary file pidgin/pixmaps/emotes/default/22/dance.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/dazed.png Binary file pidgin/pixmaps/emotes/default/22/dazed.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/desire.png Binary file pidgin/pixmaps/emotes/default/22/desire.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/devil.png Binary file pidgin/pixmaps/emotes/default/22/devil.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/disapointed.png Binary file pidgin/pixmaps/emotes/default/22/disapointed.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/disdain.png Binary file pidgin/pixmaps/emotes/default/22/disdain.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/doh.png Binary file pidgin/pixmaps/emotes/default/22/doh.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/dont-know.png Binary file pidgin/pixmaps/emotes/default/22/dont-know.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/drool.png Binary file pidgin/pixmaps/emotes/default/22/drool.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/eat.png Binary file pidgin/pixmaps/emotes/default/22/eat.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/embarrassed.png Binary file pidgin/pixmaps/emotes/default/22/embarrassed.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/excruciating.png Binary file pidgin/pixmaps/emotes/default/22/excruciating.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/eyeroll.png Binary file pidgin/pixmaps/emotes/default/22/eyeroll.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/fingers-crossed.png Binary file pidgin/pixmaps/emotes/default/22/fingers-crossed.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/foot-in-mouth.png Binary file pidgin/pixmaps/emotes/default/22/foot-in-mouth.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/freaked-out.png Binary file pidgin/pixmaps/emotes/default/22/freaked-out.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/glasses-cool.png Binary file pidgin/pixmaps/emotes/default/22/glasses-cool.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/glasses-nerdy.png Binary file pidgin/pixmaps/emotes/default/22/glasses-nerdy.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/go-away.png Binary file pidgin/pixmaps/emotes/default/22/go-away.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/handshake.png Binary file pidgin/pixmaps/emotes/default/22/handshake.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/highfive.png Binary file pidgin/pixmaps/emotes/default/22/highfive.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/hug-left.png Binary file pidgin/pixmaps/emotes/default/22/hug-left.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/hug-right.png Binary file pidgin/pixmaps/emotes/default/22/hug-right.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/hypnotized.png Binary file pidgin/pixmaps/emotes/default/22/hypnotized.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/in-love.png Binary file pidgin/pixmaps/emotes/default/22/in-love.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/jump.png Binary file pidgin/pixmaps/emotes/default/22/jump.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/kiss.png Binary file pidgin/pixmaps/emotes/default/22/kiss.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/lashes.png Binary file pidgin/pixmaps/emotes/default/22/lashes.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/laugh.png Binary file pidgin/pixmaps/emotes/default/22/laugh.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/lying.png Binary file pidgin/pixmaps/emotes/default/22/lying.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/mean.png Binary file pidgin/pixmaps/emotes/default/22/mean.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/meeting.png Binary file pidgin/pixmaps/emotes/default/22/meeting.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/moneymouth.png Binary file pidgin/pixmaps/emotes/default/22/moneymouth.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/nailbiting.png Binary file pidgin/pixmaps/emotes/default/22/nailbiting.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/neutral.png Binary file pidgin/pixmaps/emotes/default/22/neutral.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/on-the-phone.png Binary file pidgin/pixmaps/emotes/default/22/on-the-phone.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/party.png Binary file pidgin/pixmaps/emotes/default/22/party.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/pissed-off.png Binary file pidgin/pixmaps/emotes/default/22/pissed-off.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/pray.png Binary file pidgin/pixmaps/emotes/default/22/pray.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/question.png Binary file pidgin/pixmaps/emotes/default/22/question.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/quiet.png Binary file pidgin/pixmaps/emotes/default/22/quiet.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/rotfl.png Binary file pidgin/pixmaps/emotes/default/22/rotfl.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/sad.png Binary file pidgin/pixmaps/emotes/default/22/sad.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/sarcastic.png Binary file pidgin/pixmaps/emotes/default/22/sarcastic.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/secret.png Binary file pidgin/pixmaps/emotes/default/22/secret.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/shame.png Binary file pidgin/pixmaps/emotes/default/22/shame.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/shock.png Binary file pidgin/pixmaps/emotes/default/22/shock.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/shout.png Binary file pidgin/pixmaps/emotes/default/22/shout.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/shut-mouth.png Binary file pidgin/pixmaps/emotes/default/22/shut-mouth.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/sick.png Binary file pidgin/pixmaps/emotes/default/22/sick.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/silly.png Binary file pidgin/pixmaps/emotes/default/22/silly.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/skywalker.png Binary file pidgin/pixmaps/emotes/default/22/skywalker.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/sleepy.png Binary file pidgin/pixmaps/emotes/default/22/sleepy.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/smile-big.png Binary file pidgin/pixmaps/emotes/default/22/smile-big.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/smile.png Binary file pidgin/pixmaps/emotes/default/22/smile.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/smirk.png Binary file pidgin/pixmaps/emotes/default/22/smirk.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/snicker.png Binary file pidgin/pixmaps/emotes/default/22/snicker.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/soldier.png Binary file pidgin/pixmaps/emotes/default/22/soldier.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/starving.png Binary file pidgin/pixmaps/emotes/default/22/starving.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/struggle.png Binary file pidgin/pixmaps/emotes/default/22/struggle.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/sweat.png Binary file pidgin/pixmaps/emotes/default/22/sweat.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/teeth.png Binary file pidgin/pixmaps/emotes/default/22/teeth.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/terror.png Binary file pidgin/pixmaps/emotes/default/22/terror.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/thinking.png Binary file pidgin/pixmaps/emotes/default/22/thinking.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/time-out.png Binary file pidgin/pixmaps/emotes/default/22/time-out.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/tongue.png Binary file pidgin/pixmaps/emotes/default/22/tongue.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/tremble.png Binary file pidgin/pixmaps/emotes/default/22/tremble.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/vampire.png Binary file pidgin/pixmaps/emotes/default/22/vampire.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/victory.png Binary file pidgin/pixmaps/emotes/default/22/victory.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/waiting.png Binary file pidgin/pixmaps/emotes/default/22/waiting.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/weep.png Binary file pidgin/pixmaps/emotes/default/22/weep.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/wilt.png Binary file pidgin/pixmaps/emotes/default/22/wilt.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/wink.png Binary file pidgin/pixmaps/emotes/default/22/wink.png has changed diff -r e7314d58ebe6 -r 1d96cfd8879f pidgin/pixmaps/emotes/default/22/yawn.png Binary file pidgin/pixmaps/emotes/default/22/yawn.png has changed