[gnumeric] GUI: Fix certain dialogs' button order.

[Morten Welinder <mortenw src gnome org>]

commit 50585a13d1788722a37eccce79422c8ae375ff74
Author: Morten Welinder <terra gnome org>
Date:   Thu Oct 17 13:24:03 2013 -0400

    GUI: Fix certain dialogs' button order.
    
    For consistency.

 NEWS                        |    3 +++
 src/dialogs/ChangeLog       |    5 +++++
 src/dialogs/sheet-rename.ui |   12 ++++++------
 src/dialogs/sheet-resize.ui |    8 ++++----
 4 files changed, 18 insertions(+), 10 deletions(-)
---
diff --git a/NEWS b/NEWS
index ef7b587..acb3b51 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,9 @@ Gnumeric 1.12.9
 Morten:
        * Minor improvement to history dialog.
 
+Xabier Rodríguez Calvar:
+       * Fix dialog button order. [#710378]
+
 --------------------------------------------------------------------------
 Gnumeric 1.12.8
 
diff --git a/src/dialogs/ChangeLog b/src/dialogs/ChangeLog
index db2fbdb..00c0906 100644
--- a/src/dialogs/ChangeLog
+++ b/src/dialogs/ChangeLog
@@ -1,3 +1,8 @@
+2013-10-17  Morten Welinder  <terra gnome org>
+
+       * sheet-rename.ui, sheet-resize.ui: Fix button order.  Patches
+       from Xabier Rodríguez Calvar, #710378.
+
 2013-10-09  Morten Welinder  <terra gnome org>
 
        * dialog-recent.c (url_renderer_func): If we have a filename, use
diff --git a/src/dialogs/sheet-rename.ui b/src/dialogs/sheet-rename.ui
index a7ad335..3e250c9 100644
--- a/src/dialogs/sheet-rename.ui
+++ b/src/dialogs/sheet-rename.ui
@@ -18,13 +18,11 @@
             <property name="can_focus">False</property>
             <property name="layout_style">end</property>
             <child>
-              <object class="GtkButton" id="ok_button">
-                <property name="label">gtk-ok</property>
+              <object class="GtkButton" id="cancel_button">
+                <property name="label">gtk-cancel</property>
                 <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="has_default">True</property>
                 <property name="receives_default">False</property>
                 <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
@@ -36,11 +34,13 @@
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="cancel_button">
-                <property name="label">gtk-cancel</property>
+              <object class="GtkButton" id="ok_button">
+                <property name="label">gtk-ok</property>
                 <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="has_default">True</property>
                 <property name="receives_default">False</property>
                 <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
diff --git a/src/dialogs/sheet-resize.ui b/src/dialogs/sheet-resize.ui
index 6a85cc3..6cba6c5 100644
--- a/src/dialogs/sheet-resize.ui
+++ b/src/dialogs/sheet-resize.ui
@@ -18,8 +18,8 @@
             <property name="can_focus">False</property>
             <property name="layout_style">end</property>
             <child>
-              <object class="GtkButton" id="ok_button">
-                <property name="label">gtk-ok</property>
+              <object class="GtkButton" id="cancel_button">
+                <property name="label">gtk-cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -33,8 +33,8 @@
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="cancel_button">
-                <property name="label">gtk-cancel</property>
+              <object class="GtkButton" id="ok_button">
+                <property name="label">gtk-ok</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>