Mercurial > pidgin.yaz
comparison src/gtkconv.c @ 5462:8355eeeb52a3
[gaim-migrate @ 5853]
Switching tabs no longer re-shows a buddy icon when hidden, or re-animates
when animation is turned off.
committer: Tailor Script <tailor@pidgin.im>
author | Christian Hammond <chipx86@chipx86.com> |
---|---|
date | Tue, 20 May 2003 19:20:35 +0000 |
parents | ad445074d239 |
children | 0a392a45e497 |
comparison
equal
deleted
inserted
replaced
5461:7883082c290a | 5462:8355eeeb52a3 |
---|---|
1778 gtkconv->make_sound); | 1778 gtkconv->make_sound); |
1779 | 1779 |
1780 gtk_widget_grab_focus(gtkconv->entry); | 1780 gtk_widget_grab_focus(gtkconv->entry); |
1781 | 1781 |
1782 gtk_window_set_title(GTK_WINDOW(gtkwin->window), | 1782 gtk_window_set_title(GTK_WINDOW(gtkwin->window), |
1783 gtk_label_get_text(GTK_LABEL(gtkconv->tab_label))); | 1783 gtk_label_get_text(GTK_LABEL(gtkconv->tab_label))); |
1784 } | 1784 } |
1785 | 1785 |
1786 /************************************************************************** | 1786 /************************************************************************** |
1787 * Utility functions | 1787 * Utility functions |
1788 **************************************************************************/ | 1788 **************************************************************************/ |
4744 struct gaim_gtk_conversation *gtkconv; | 4744 struct gaim_gtk_conversation *gtkconv; |
4745 | 4745 |
4746 char filename[256]; | 4746 char filename[256]; |
4747 FILE *file; | 4747 FILE *file; |
4748 GError *err = NULL; | 4748 GError *err = NULL; |
4749 gboolean animate = TRUE; | |
4749 | 4750 |
4750 struct buddy *buddy; | 4751 struct buddy *buddy; |
4751 | 4752 |
4752 void *data; | 4753 void *data; |
4753 int len, delay; | 4754 int len, delay; |
4766 | 4767 |
4767 return; | 4768 return; |
4768 } | 4769 } |
4769 | 4770 |
4770 gtkconv = GAIM_GTK_CONVERSATION(conv); | 4771 gtkconv = GAIM_GTK_CONVERSATION(conv); |
4772 | |
4773 if (gtkconv->u.im->icon_timer == 0 && gtkconv->u.im->icon != NULL) | |
4774 animate = FALSE; | |
4771 | 4775 |
4772 remove_icon(gtkconv); | 4776 remove_icon(gtkconv); |
4773 | 4777 |
4774 if (im_options & OPT_IM_HIDE_ICONS) | 4778 if (im_options & OPT_IM_HIDE_ICONS) |
4775 return; | 4779 return; |
4868 gtkconv->u.im->icon = gtk_image_new_from_pixmap(pm, bm); | 4872 gtkconv->u.im->icon = gtk_image_new_from_pixmap(pm, bm); |
4869 gtk_widget_set_size_request(gtkconv->u.im->icon, sf, sf); | 4873 gtk_widget_set_size_request(gtkconv->u.im->icon, sf, sf); |
4870 gtk_container_add(GTK_CONTAINER(event), gtkconv->u.im->icon); | 4874 gtk_container_add(GTK_CONTAINER(event), gtkconv->u.im->icon); |
4871 gtk_widget_show(gtkconv->u.im->icon); | 4875 gtk_widget_show(gtkconv->u.im->icon); |
4872 | 4876 |
4873 if(im_options & OPT_IM_NO_ANIMATION) | 4877 if ((im_options & OPT_IM_NO_ANIMATION) || animate == FALSE) |
4874 stop_anim(NULL, conv); | 4878 stop_anim(NULL, conv); |
4875 | 4879 |
4876 g_object_unref(G_OBJECT(pm)); | 4880 g_object_unref(G_OBJECT(pm)); |
4877 | 4881 |
4878 if (bm) | 4882 if (bm) |