pidgin: 3b7e2f38: Reorder the New Pounces/New Mail dialog ..

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 3b7e2f38dc6152b559ddfe04b44fdf8310800237
Ancestor: ff72795fd0f49fbc479afbaa9b1f66dcf2b26f1c
Author: darkrain42 at pidgin.im
Date: 2009-08-24T04:43:31
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/3b7e2f38dc6152b559ddfe04b44fdf8310800237

Modified files:
        pidgin/gtknotify.c

ChangeLog: 

Reorder the New Pounces/New Mail dialog buttons.

Every other dialog that has a 'Close' button seems to have it on the
right. Also change "Edit" to PIDGIN_STOCK_MODIFY.

-------------- next part --------------
============================================================
--- pidgin/gtknotify.c	a321a3a06df80d003e62f53ca8318374289b2b1c
+++ pidgin/gtknotify.c	b771a3451e7edb3232967b6233fab08cc5329709
@@ -1461,9 +1461,7 @@ pidgin_create_notification_dialog(Pidgin
 				G_TYPE_STRING, G_TYPE_POINTER);
 	}
 
-	dialog = gtk_dialog_new_with_buttons(NULL, NULL, 0,
-			GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
-			NULL);
+	dialog = gtk_dialog_new();
 
 	/* Setup the dialog */
 	gtk_container_set_border_width(GTK_CONTAINER(dialog), PIDGIN_HIG_BOX_SPACE);
@@ -1537,16 +1535,16 @@ pidgin_create_notification_dialog(Pidgin
 						_("IM"), GTK_RESPONSE_YES);
 		gtk_widget_set_sensitive(button, FALSE);
 		spec_dialog->open_button = button;
-	
+
 		button = gtk_dialog_add_button(GTK_DIALOG(dialog),
-						_("Dismiss"), GTK_RESPONSE_NO);
+						PIDGIN_STOCK_MODIFY, GTK_RESPONSE_APPLY);
 		gtk_widget_set_sensitive(button, FALSE);
-		spec_dialog->dismiss_button = button;
+		spec_dialog->edit_button = button;
 
 		button = gtk_dialog_add_button(GTK_DIALOG(dialog),
-						PIDGIN_STOCK_EDIT, GTK_RESPONSE_APPLY);
+						_("Dismiss"), GTK_RESPONSE_NO);
 		gtk_widget_set_sensitive(button, FALSE);
-		spec_dialog->edit_button = button;
+		spec_dialog->dismiss_button = button;
 
 		g_signal_connect(G_OBJECT(dialog), "response",
 						 G_CALLBACK(pounce_response_cb), spec_dialog);
@@ -1598,6 +1596,9 @@ pidgin_create_notification_dialog(Pidgin
 			G_CALLBACK(pounce_response_open_ims), NULL);
 	}
 
+	button = gtk_dialog_add_button(GTK_DIALOG(dialog),
+	                               GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE);
+
 	gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
 	gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
 	gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);