[gedit] FileChooserDialog: reverse order of accept_label and cancel_label

[Sébastien Wilmet <swilmet src gnome org>]

commit d325144f806c0c82307fe7bcb3d839d882371628
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Thu Jun 4 23:47:39 2020 +0200

    FileChooserDialog: reverse order of accept_label and cancel_label
    
    To be in the same order as gtk_file_chooser_native_new().

 gedit/gedit-commands-file.c           |  8 ++++----
 gedit/gedit-file-chooser-dialog-gtk.c |  4 ++--
 gedit/gedit-file-chooser-dialog-gtk.h |  4 ++--
 gedit/gedit-file-chooser-dialog-osx.h |  4 ++--
 gedit/gedit-file-chooser-dialog-osx.m |  4 ++--
 gedit/gedit-file-chooser-dialog.c     | 12 ++++++------
 gedit/gedit-file-chooser-dialog.h     |  4 ++--
 7 files changed, 20 insertions(+), 20 deletions(-)
---
diff --git a/gedit/gedit-commands-file.c b/gedit/gedit-commands-file.c
index eb9a64267..ce4e86c73 100644
--- a/gedit/gedit-commands-file.c
+++ b/gedit/gedit-commands-file.c
@@ -454,8 +454,8 @@ _gedit_cmd_file_open (GSimpleAction *action,
        open_dialog = gedit_file_chooser_dialog_create (C_("window title", "Open Files"),
                                                        window != NULL ? GTK_WINDOW (window) : NULL,
                                                        GEDIT_FILE_CHOOSER_OPEN,
-                                                       _("_Cancel"),
-                                                       _("_Open"));
+                                                       _("_Open"),
+                                                       _("_Cancel"));
 
        if (window != NULL)
        {
@@ -842,8 +842,8 @@ save_as_tab_async (GeditTab            *tab,
        save_dialog = gedit_file_chooser_dialog_create (C_("window title", "Save As"),
                                                        GTK_WINDOW (window),
                                                        GEDIT_FILE_CHOOSER_SAVE,
-                                                       _("_Cancel"),
-                                                       _("_Save"));
+                                                       _("_Save"),
+                                                       _("_Cancel"));
 
        gedit_file_chooser_dialog_set_do_overwrite_confirmation (save_dialog, TRUE);
 
diff --git a/gedit/gedit-file-chooser-dialog-gtk.c b/gedit/gedit-file-chooser-dialog-gtk.c
index ea25c7a2b..45038d45d 100644
--- a/gedit/gedit-file-chooser-dialog-gtk.c
+++ b/gedit/gedit-file-chooser-dialog-gtk.c
@@ -550,8 +550,8 @@ GeditFileChooserDialog *
 gedit_file_chooser_dialog_gtk_create (const gchar           *title,
                                      GtkWindow             *parent,
                                      GeditFileChooserFlags  flags,
-                                     const gchar           *cancel_label,
-                                     const gchar           *accept_label)
+                                     const gchar           *accept_label,
+                                     const gchar           *cancel_label)
 {
        GeditFileChooserDialogGtk *result;
        GtkFileFilter *filter;
diff --git a/gedit/gedit-file-chooser-dialog-gtk.h b/gedit/gedit-file-chooser-dialog-gtk.h
index 533e94ab1..40726af54 100644
--- a/gedit/gedit-file-chooser-dialog-gtk.h
+++ b/gedit/gedit-file-chooser-dialog-gtk.h
@@ -36,8 +36,8 @@ G_DECLARE_FINAL_TYPE (GeditFileChooserDialogGtk, gedit_file_chooser_dialog_gtk,
 GeditFileChooserDialog *       gedit_file_chooser_dialog_gtk_create    (const gchar           *title,
                                                                         GtkWindow             *parent,
                                                                         GeditFileChooserFlags  flags,
-                                                                        const gchar           *cancel_label,
-                                                                        const gchar           *accept_label);
+                                                                        const gchar           *accept_label,
+                                                                        const gchar           *cancel_label);
 
 G_END_DECLS
 
diff --git a/gedit/gedit-file-chooser-dialog-osx.h b/gedit/gedit-file-chooser-dialog-osx.h
index c9e776ce3..aaefb53d5 100644
--- a/gedit/gedit-file-chooser-dialog-osx.h
+++ b/gedit/gedit-file-chooser-dialog-osx.h
@@ -36,8 +36,8 @@ G_DECLARE_FINAL_TYPE (GeditFileChooserDialogOSX, gedit_file_chooser_dialog_osx,
 GeditFileChooserDialog *       gedit_file_chooser_dialog_osx_create    (const gchar           *title,
                                                                         GtkWindow             *parent,
                                                                         GeditFileChooserFlags  flags,
-                                                                        const gchar           *cancel_label,
-                                                                        const gchar           *accept_label);
+                                                                        const gchar           *accept_label,
+                                                                        const gchar           *cancel_label);
 
 G_END_DECLS
 
diff --git a/gedit/gedit-file-chooser-dialog-osx.m b/gedit/gedit-file-chooser-dialog-osx.m
index 5fc7f0a67..105961464 100644
--- a/gedit/gedit-file-chooser-dialog-osx.m
+++ b/gedit/gedit-file-chooser-dialog-osx.m
@@ -862,8 +862,8 @@ GeditFileChooserDialog *
 gedit_file_chooser_dialog_osx_create (const gchar           *title,
                                      GtkWindow             *parent,
                                      GeditFileChooserFlags  flags,
-                                     const gchar           *cancel_label,
-                                     const gchar           *accept_label)
+                                     const gchar           *accept_label,
+                                     const gchar           *cancel_label)
 {
        GeditFileChooserDialogOSX *ret;
        gchar *nomnem;
diff --git a/gedit/gedit-file-chooser-dialog.c b/gedit/gedit-file-chooser-dialog.c
index ef60a73c2..17ec36bde 100644
--- a/gedit/gedit-file-chooser-dialog.c
+++ b/gedit/gedit-file-chooser-dialog.c
@@ -71,21 +71,21 @@ GeditFileChooserDialog *
 gedit_file_chooser_dialog_create (const gchar           *title,
                                  GtkWindow             *parent,
                                  GeditFileChooserFlags  flags,
-                                 const gchar           *cancel_label,
-                                 const gchar           *accept_label)
+                                 const gchar           *accept_label,
+                                 const gchar           *cancel_label)
 {
 #ifdef OS_OSX
        return gedit_file_chooser_dialog_osx_create (title,
                                                     parent,
                                                     flags,
-                                                    cancel_label,
-                                                    accept_label);
+                                                    accept_label,
+                                                    cancel_label);
 #else
        return gedit_file_chooser_dialog_gtk_create (title,
                                                     parent,
                                                     flags,
-                                                    cancel_label,
-                                                    accept_label);
+                                                    accept_label,
+                                                    cancel_label);
 #endif
 }
 
diff --git a/gedit/gedit-file-chooser-dialog.h b/gedit/gedit-file-chooser-dialog.h
index 3619d14f4..98df302fa 100644
--- a/gedit/gedit-file-chooser-dialog.h
+++ b/gedit/gedit-file-chooser-dialog.h
@@ -85,8 +85,8 @@ GeditFileChooserDialog *
                gedit_file_chooser_dialog_create                (const gchar              *title,
                                                                 GtkWindow                *parent,
                                                                 GeditFileChooserFlags     flags,
-                                                                const gchar              *cancel_label,
-                                                                const gchar              *accept_label);
+                                                                const gchar              *accept_label,
+                                                                const gchar              *cancel_label);
 
 void            gedit_file_chooser_dialog_destroy              (GeditFileChooserDialog   *dialog);