2004-07-26 Jim Evins <evins@snaught.com>

	* src/merge-properties-dialog.c: (gl_merge_properties_dialog_init):
		Corrected button order of merge properties dialog.

git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@435 f5e0f49d-192f-0410-a22d-a8d8700d0965

diff --git a/glabels2/ChangeLog b/glabels2/ChangeLog
index 2503762616693e9274e319936741df0038c5a2d9..e774ad95a97e8aad73bd8ff0040876babeb48300 100644 (file)
--- a/glabels2/ChangeLog
+++ b/glabels2/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-26  Jim Evins  <evins@snaught.com>
+
+       * src/merge-properties-dialog.c: (gl_merge_properties_dialog_init):
+               Corrected button order of merge properties dialog.
+
 2004-07-18  Jim Evins  <evins@snaught.com>
 
        * data/glabels-2.0.dtd:

diff --git a/glabels2/src/merge-properties-dialog.c b/glabels2/src/merge-properties-dialog.c
index c00b5536d7f33e5cbf0ca0e0524403759e20d432..1eca27e8f137be45edf475d74de851908fce0329 100644 (file)
--- a/glabels2/src/merge-properties-dialog.c
+++ b/glabels2/src/merge-properties-dialog.c
@@ -148,8 +148,8 @@ gl_merge_properties_dialog_init (glMergePropertiesDialog *dialog)
        dialog->private = g_new0 (glMergePropertiesDialogPrivate, 1);
 
        gtk_dialog_add_buttons (GTK_DIALOG(dialog),
-                               GTK_STOCK_OK, GTK_RESPONSE_OK,
                                GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+                               GTK_STOCK_OK, GTK_RESPONSE_OK,
                                NULL);
 
        g_signal_connect (G_OBJECT(dialog), "response",