Mercurial > pidgin.yaz

comparison pidgin/gtkconv.c @ 30247:2ab17571bf42

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
propagate from branch 'im.pidgin.pidgin' (head 7850267e7626c94b519fd5f1c959c79f0624d34e) to branch 'im.pidgin.cpw.malu.ft_thumbnails' (head 3845c5c2ec11e409fd1891793e73ab3d934001f9)
author Marcus Lundblad <ml@update.uu.se>
date Sat, 24 Apr 2010 14:59:13 +0000
parents 0625cebc84d7
children bd0ce3844104 e9f4deddddd8
comparison
equal deleted inserted replaced
30246:816041183dda 30247:2ab17571bf42
4864 4864
4865 static void 4865 static void
4866 pidgin_conv_setup_quickfind(PidginConversation *gtkconv, GtkWidget *container) 4866 pidgin_conv_setup_quickfind(PidginConversation *gtkconv, GtkWidget *container)
4867 { 4867 {
4868 GtkWidget *widget = gtk_hbox_new(FALSE, 0); 4868 GtkWidget *widget = gtk_hbox_new(FALSE, 0);
4869 GtkWidget *label, *entry, *close, *image; 4869 GtkWidget *label, *entry, *close;
4870 4870
4871 gtk_box_pack_start(GTK_BOX(container), widget, FALSE, FALSE, 0); 4871 gtk_box_pack_start(GTK_BOX(container), widget, FALSE, FALSE, 0);
4872 4872
4873 image = gtk_image_new_from_stock(GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU); 4873 close = pidgin_create_small_button(gtk_label_new("×"));
4874 close = pidgin_create_small_button(image);
4875 gtk_box_pack_start(GTK_BOX(widget), close, FALSE, FALSE, 0); 4874 gtk_box_pack_start(GTK_BOX(widget), close, FALSE, FALSE, 0);
4876 gtk_tooltips_set_tip(gtkconv->tooltips, close, 4875 gtk_tooltips_set_tip(gtkconv->tooltips, close,
4877 _("Close Find bar"), NULL); 4876 _("Close Find bar"), NULL);
4878 4877
4879 label = gtk_label_new(_("Find:")); 4878 label = gtk_label_new(_("Find:"));
9448 PurpleConversation *conv = gtkconv->active_conv; 9447 PurpleConversation *conv = gtkconv->active_conv;
9449 PidginConversation *focus_gtkconv; 9448 PidginConversation *focus_gtkconv;
9450 GtkWidget *tab_cont = gtkconv->tab_cont; 9449 GtkWidget *tab_cont = gtkconv->tab_cont;
9451 PurpleConversationType conv_type; 9450 PurpleConversationType conv_type;
9452 const gchar *tmp_lab; 9451 const gchar *tmp_lab;
9453 GtkWidget *close_image;
9454 9452
9455 conv_type = purple_conversation_get_type(conv); 9453 conv_type = purple_conversation_get_type(conv);
9456 9454
9457 win->gtkconvs = g_list_append(win->gtkconvs, gtkconv); 9455 win->gtkconvs = g_list_append(win->gtkconvs, gtkconv);
9458 gtkconv->win = win; 9456 gtkconv->win = win;
9460 if (win->gtkconvs && win->gtkconvs->next && win->gtkconvs->next->next == NULL) 9458 if (win->gtkconvs && win->gtkconvs->next && win->gtkconvs->next->next == NULL)
9461 pidgin_conv_tab_pack(win, ((PidginConversation*)win->gtkconvs->data)); 9459 pidgin_conv_tab_pack(win, ((PidginConversation*)win->gtkconvs->data));
9462 9460
9463 9461
9464 /* Close button. */ 9462 /* Close button. */
9465 close_image = gtk_image_new_from_stock(GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU); 9463 gtkconv->close = pidgin_create_small_button(gtk_label_new("×"));
9466 gtkconv->close = pidgin_create_small_button(close_image);
9467 gtk_tooltips_set_tip(gtkconv->tooltips, gtkconv->close, 9464 gtk_tooltips_set_tip(gtkconv->tooltips, gtkconv->close,
9468 _("Close conversation"), NULL); 9465 _("Close conversation"), NULL);
9469 9466
9470 g_signal_connect(gtkconv->close, "clicked", G_CALLBACK (close_conv_cb), gtkconv); 9467 g_signal_connect(gtkconv->close, "clicked", G_CALLBACK (close_conv_cb), gtkconv);
9471 9468