Mercurial > pidgin.yaz
diff src/gtkconv.c @ 7219:e60a007bab7d
[gaim-migrate @ 7788]
For a minute there, I lost myself. I lost myself.
committer: Tailor Script <tailor@pidgin.im>
author | Sean Egan <seanegan@gmail.com> |
---|---|
date | Thu, 09 Oct 2003 21:57:34 +0000 |
parents | 19cc14ea7599 |
children | e8972a401eb9 |
line wrap: on
line diff
--- a/src/gtkconv.c Thu Oct 09 21:50:39 2003 +0000 +++ b/src/gtkconv.c Thu Oct 09 21:57:34 2003 +0000 @@ -1940,7 +1940,8 @@ GaimGtkConversation *gtkconv; GaimGtkWindow *gtkwin; GaimConnection *gc; - + GdkPixbuf *window_icon; + win = (GaimConvWindow *)user_data; conv = gaim_conv_window_get_conversation_at(win, page_num); @@ -1960,7 +1961,6 @@ /* Update the menubar */ if (gaim_conversation_get_type(conv) == GAIM_CONV_IM) { - GdkPixbuf *pixbuf; gtk_widget_show(gtkwin->menu.view_log); if (gc && prpl_info->options & OPT_PROTO_IM_IMAGE) { @@ -2000,12 +2000,10 @@ g_timeout_add(0, (GSourceFunc)update_send_as_selection, win); if (gtkconv->u.im->anim) { - pixbuf = gdk_pixbuf_animation_get_static_image(gtkconv->u.im->anim); - gtk_window_set_icon(GTK_WINDOW(gtkwin->window), pixbuf); + window_icon = gdk_pixbuf_animation_get_static_image(gtkconv->u.im->anim); + g_object_ref(window_icon); } else { - pixbuf = get_tab_icon(conv); - gtk_window_set_icon(GTK_WINDOW(gtkwin->window), pixbuf); - g_object_unref(G_OBJECT(pixbuf)); + window_icon = get_tab_icon(conv); } } else if (gaim_conversation_get_type(conv) == GAIM_CONV_CHAT) { @@ -2038,10 +2036,11 @@ if (gtkwin->menu.send_as != NULL) g_timeout_add(0, (GSourceFunc)update_send_as_selection, win); + window_icon = get_tab_icon(conv); } update_typing_icon(conv); - + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(gtkwin->menu.logging), gaim_conversation_is_logging(conv)); @@ -2050,6 +2049,8 @@ gtk_widget_grab_focus(gtkconv->entry); + gtk_window_set_icon(GTK_WINDOW(gtkwin->window), window_icon); + g_object_unref(G_OBJECT(window_icon)); gtk_window_set_title(GTK_WINDOW(gtkwin->window), gtk_label_get_text(GTK_LABEL(gtkconv->tab_label))); }