Mercurial > pidgin.yaz
diff pidgin/gtkconv.c @ 27963:85fa979b08c2
propagate from branch 'im.pidgin.pidgin' (head 921a6693312cc38dd6dbc93e91d6bf5c60938634)
to branch 'im.pidgin.pidgin.yaz' (head 1f0dc57711925c17aef0a129bec2d272c21236ba)
| author | Yoshiki Yazawa <yaz@honeyplanet.jp> |
|---|---|
| date | Tue, 07 Jul 2009 06:09:35 +0000 |
| parents | c815b2aa78ee 9c0a18f16fce |
| children | e1cd44c7c7af |
line wrap: on
line diff
--- a/pidgin/gtkconv.c Sun Jul 05 09:18:35 2009 +0000 +++ b/pidgin/gtkconv.c Tue Jul 07 06:09:35 2009 +0000 @@ -1826,7 +1826,7 @@ g_object_set_data_full(G_OBJECT(button), "user_data", g_strdup(who), g_free); } - button = pidgin_new_item_from_stock(menu, _("Last said"), GTK_STOCK_INDEX, + button = pidgin_new_item_from_stock(menu, _("Last Said"), GTK_STOCK_INDEX, G_CALLBACK(menu_last_said_cb), PIDGIN_CONVERSATION(conv), 0, 0, NULL); g_object_set_data_full(G_OBJECT(button), "user_data", g_strdup(who), g_free); if (!get_mark_for_user(PIDGIN_CONVERSATION(conv), who)) @@ -8329,15 +8329,11 @@ static void build_warn_close_dialog(PidginWindow *gtkwin) { - GtkWidget *label; - GtkWidget *vbox, *hbox; - GtkWidget *img; + GtkWidget *label, *vbox, *hbox, *img; g_return_if_fail(warn_close_dialog == NULL); - - warn_close_dialog = gtk_dialog_new_with_buttons( - _("Confirm close"), + warn_close_dialog = gtk_dialog_new_with_buttons(_("Confirm close"), GTK_WINDOW(gtkwin->window), GTK_DIALOG_MODAL, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_CLOSE, GTK_RESPONSE_OK, NULL);