Mercurial > pidgin.yaz
comparison pidgin/gtkconv.c @ 27666:a08e84032814
merge of '2348ff22f0ff3453774b8b25b36238465580c609'
and 'e76f11543c2a4aa05bdf584f087cbe3439029661'
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Sun, 12 Jul 2009 05:43:38 +0000 |
parents | 2a19181b41fa |
children | a12574d982a1 15cde23b43bc |
comparison
equal
deleted
inserted
replaced
27186:048bcf41deef | 27666:a08e84032814 |
---|---|
1768 gtk_widget_set_sensitive(button, FALSE); | 1768 gtk_widget_set_sensitive(button, FALSE); |
1769 else | 1769 else |
1770 g_object_set_data_full(G_OBJECT(button), "user_data", g_strdup(who), g_free); | 1770 g_object_set_data_full(G_OBJECT(button), "user_data", g_strdup(who), g_free); |
1771 } | 1771 } |
1772 | 1772 |
1773 button = pidgin_new_item_from_stock(menu, _("Last said"), GTK_STOCK_INDEX, | 1773 button = pidgin_new_item_from_stock(menu, _("Last Said"), GTK_STOCK_INDEX, |
1774 G_CALLBACK(menu_last_said_cb), PIDGIN_CONVERSATION(conv), 0, 0, NULL); | 1774 G_CALLBACK(menu_last_said_cb), PIDGIN_CONVERSATION(conv), 0, 0, NULL); |
1775 g_object_set_data_full(G_OBJECT(button), "user_data", g_strdup(who), g_free); | 1775 g_object_set_data_full(G_OBJECT(button), "user_data", g_strdup(who), g_free); |
1776 if (!get_mark_for_user(PIDGIN_CONVERSATION(conv), who)) | 1776 if (!get_mark_for_user(PIDGIN_CONVERSATION(conv), who)) |
1777 gtk_widget_set_sensitive(button, FALSE); | 1777 gtk_widget_set_sensitive(button, FALSE); |
1778 | 1778 |
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); |
8194 } | 8195 } |
8195 | 8196 |
8196 static void | 8197 static void |
8197 build_warn_close_dialog(PidginWindow *gtkwin) | 8198 build_warn_close_dialog(PidginWindow *gtkwin) |
8198 { | 8199 { |
8199 GtkWidget *label; | 8200 GtkWidget *label, *vbox, *hbox, *img; |
8200 GtkWidget *vbox, *hbox; | |
8201 GtkWidget *img; | |
8202 | 8201 |
8203 g_return_if_fail(warn_close_dialog == NULL); | 8202 g_return_if_fail(warn_close_dialog == NULL); |
8204 | 8203 |
8205 | 8204 warn_close_dialog = gtk_dialog_new_with_buttons(_("Confirm close"), |
8206 warn_close_dialog = gtk_dialog_new_with_buttons( | |
8207 _("Confirm close"), | |
8208 GTK_WINDOW(gtkwin->window), GTK_DIALOG_MODAL, | 8205 GTK_WINDOW(gtkwin->window), GTK_DIALOG_MODAL, |
8209 GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, | 8206 GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, |
8210 GTK_STOCK_CLOSE, GTK_RESPONSE_OK, NULL); | 8207 GTK_STOCK_CLOSE, GTK_RESPONSE_OK, NULL); |
8211 | 8208 |
8212 gtk_dialog_set_default_response(GTK_DIALOG(warn_close_dialog), | 8209 gtk_dialog_set_default_response(GTK_DIALOG(warn_close_dialog), |