[evolution/wip/webkit-composer: 845/966] Bug 725241: [webkit-composer] Buttons in popup dialogs in a wrong order

[Tomas Popela <tpopela src gnome org>]

commit 693a431952d7202993853c67007f6dbe399eb9fb
Author: Tomas Popela <tpopela redhat com>
Date:   Fri Feb 28 07:10:22 2014 +0100

    Bug 725241: [webkit-composer] Buttons in popup dialogs in a wrong order

 e-util/e-color-chooser-widget.c |    4 ++--
 e-util/e-editor-actions.c       |    8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/e-util/e-color-chooser-widget.c b/e-util/e-color-chooser-widget.c
index a662a3c..5761ebf 100644
--- a/e-util/e-color-chooser-widget.c
+++ b/e-util/e-color-chooser-widget.c
@@ -114,8 +114,8 @@ run_color_chooser_dialog (gpointer user_data)
                N_("Choose custom color"),
                GTK_WINDOW (parent_window),
                GTK_DIALOG_MODAL,
-               GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
-               GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, NULL);
+               GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
+               GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL);
 
        chooser = gtk_color_chooser_widget_new ();
        g_object_set (G_OBJECT (chooser), "show-editor", TRUE, NULL);
diff --git a/e-util/e-editor-actions.c b/e-util/e-editor-actions.c
index 53b0e15..c06b346 100644
--- a/e-util/e-editor-actions.c
+++ b/e-util/e-editor-actions.c
@@ -467,8 +467,8 @@ action_insert_html_file_cb (GtkToggleAction *action,
        dialog = gtk_file_chooser_dialog_new (
                _("Insert HTML File"), NULL,
                GTK_FILE_CHOOSER_ACTION_OPEN,
-               GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
-               GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, NULL);
+               GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+               GTK_STOCK_OPEN, GTK_RESPONSE_OK, NULL);
 
        filter = gtk_file_filter_new ();
        gtk_file_filter_set_name (filter, _("HTML file"));
@@ -560,8 +560,8 @@ action_insert_text_file_cb (GtkAction *action,
        dialog = gtk_file_chooser_dialog_new (
                _("Insert text file"), NULL,
                GTK_FILE_CHOOSER_ACTION_OPEN,
-               GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
-               GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, NULL);
+               GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+               GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL);
 
        filter = gtk_file_filter_new ();
        gtk_file_filter_set_name (filter, _("Text file"));