Mercurial > pidgin.yaz

comparison pidgin/gtkconv.c @ 27994:c43c87965db9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge of '2c429e7e623da14e68de42a031909190e1f9dbac' and '481dcc62a70f66aaa407732e9195d711b6d6b17c'
author Etan Reisner <pidgin@unreliablesource.net>
date Wed, 22 Jul 2009 02:36:28 +0000
parents 605b950f4644 429fce11f244
children
comparison
equal deleted inserted replaced
27972:605b950f4644 27994:c43c87965db9
3291 if ((buddy == NULL) && (gtkconv->imhtml != NULL)) { 3291 if ((buddy == NULL) && (gtkconv->imhtml != NULL)) {
3292 buddy = purple_buddy_new(conv->account, conv->name, NULL); 3292 buddy = purple_buddy_new(conv->account, conv->name, NULL);
3293 purple_blist_node_set_flags((PurpleBlistNode *)buddy, 3293 purple_blist_node_set_flags((PurpleBlistNode *)buddy,
3294 PURPLE_BLIST_NODE_FLAG_NO_SAVE); 3294 PURPLE_BLIST_NODE_FLAG_NO_SAVE);
3295 g_object_set_data_full(G_OBJECT(gtkconv->imhtml), "transient_buddy", 3295 g_object_set_data_full(G_OBJECT(gtkconv->imhtml), "transient_buddy",
3296 buddy, (GDestroyNotify)purple_blist_remove_buddy); 3296 buddy, (GDestroyNotify)purple_buddy_destroy);
3297 } 3297 }
3298 } 3298 }
3299 } 3299 }
3300 3300
3301 if (chat) 3301 if (chat)
4937 } 4937 }
4938 gtk_widget_show(frame); 4938 gtk_widget_show(frame);
4939 4939
4940 gtk_widget_set_name(gtkconv->imhtml, "pidgin_conv_imhtml"); 4940 gtk_widget_set_name(gtkconv->imhtml, "pidgin_conv_imhtml");
4941 gtk_imhtml_show_comments(GTK_IMHTML(gtkconv->imhtml),TRUE); 4941 gtk_imhtml_show_comments(GTK_IMHTML(gtkconv->imhtml),TRUE);
4942 g_object_set_data(G_OBJECT(gtkconv->imhtml), "gtkconv", gtkconv);
4942 4943
4943 gtk_scrolled_window_get_policy(GTK_SCROLLED_WINDOW(imhtml_sw), 4944 gtk_scrolled_window_get_policy(GTK_SCROLLED_WINDOW(imhtml_sw),
4944 &imhtml_sw_hscroll, NULL); 4945 &imhtml_sw_hscroll, NULL);
4945 gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(imhtml_sw), 4946 gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(imhtml_sw),
4946 imhtml_sw_hscroll, GTK_POLICY_ALWAYS); 4947 imhtml_sw_hscroll, GTK_POLICY_ALWAYS);
6982 6983
6983 if (data == NULL) { 6984 if (data == NULL) {
6984 icon = purple_conv_im_get_icon(PURPLE_CONV_IM(conv)); 6985 icon = purple_conv_im_get_icon(PURPLE_CONV_IM(conv));
6985 6986
6986 if (icon == NULL) 6987 if (icon == NULL)
6988 {
6989 gtk_widget_set_size_request(gtkconv->u.im->icon_container,
6990 -1, BUDDYICON_SIZE_MIN);
6987 return; 6991 return;
6992 }
6988 6993
6989 data = purple_buddy_icon_get_data(icon, &len); 6994 data = purple_buddy_icon_get_data(icon, &len);
6990 6995
6991 if (data == NULL) 6996 if (data == NULL)
6997 {
6998 gtk_widget_set_size_request(gtkconv->u.im->icon_container,
6999 -1, BUDDYICON_SIZE_MIN);
6992 return; 7000 return;
7001 }
6993 } 7002 }
6994 7003
6995 loader = gdk_pixbuf_loader_new(); 7004 loader = gdk_pixbuf_loader_new();
6996 gdk_pixbuf_loader_write(loader, data, len, NULL); 7005 gdk_pixbuf_loader_write(loader, data, len, NULL);
6997 gdk_pixbuf_loader_close(loader, &err); 7006 gdk_pixbuf_loader_close(loader, &err);