[Xfce4-commits] [xfce/xfce4-session] 01/01: Clean up some of the message dialogs

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

eric pushed a commit to branch master
in repository xfce/xfce4-session.

commit 43e532f6c83cae09b4b55a2b4d2e8e97d43f7e60
Author: Eric Koegel <eric.koegel at gmail.com>
Date:   Mon Jun 6 08:26:12 2016 +0300

    Clean up some of the message dialogs
---
 engines/balou/config.c       | 3 ++-
 settings/session-editor.c    | 8 ++++----
 xfce4-session/xfsm-manager.c | 4 ++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/engines/balou/config.c b/engines/balou/config.c
index 7c21a2a..13709cb 100644
--- a/engines/balou/config.c
+++ b/engines/balou/config.c
@@ -341,7 +341,8 @@ config_install_theme (GtkWidget *item,
                                primary,
                                _("Please check that the file is a valid splash "
                                  "theme archive."),
-                               _("_Close"), GTK_RESPONSE_ACCEPT, NULL);
+                               XFCE_BUTTON_TYPE_MIXED, "window-close", _("_Close"), GTK_RESPONSE_ACCEPT,
+                               NULL);
           g_free (primary);
         }
 
diff --git a/settings/session-editor.c b/settings/session-editor.c
index afc2239..8d3b809 100644
--- a/settings/session-editor.c
+++ b/settings/session-editor.c
@@ -129,7 +129,7 @@ session_editor_save_session(GtkWidget *btn,
                             _("Session Save Error"), "dialog-error",
                             _("Unable to save the session"),
                             error->message,
-                            _("_Close"), GTK_RESPONSE_ACCEPT,
+                            XFCE_BUTTON_TYPE_MIXED, "window-close", _("_Close"), GTK_RESPONSE_ACCEPT,
                             NULL);
         gtk_widget_set_sensitive(btn, TRUE);
         g_error_free(error);
@@ -171,7 +171,7 @@ session_editor_clear_sessions(GtkWidget *btn,
                            _("Are you sure you want to empty the session cache?"),
                            _("The saved states of your applications will not be restored during your next login."),
                            _("_Cancel"), GTK_RESPONSE_CANCEL,
-                           XFCE_BUTTON_TYPE_MIXED, _("_Ok"), _("_Proceed"), GTK_RESPONSE_ACCEPT,
+                           _("_Proceed"), GTK_RESPONSE_ACCEPT,
                            NULL) == GTK_RESPONSE_ACCEPT)
     {
         const gchar *item_name;
@@ -255,7 +255,7 @@ session_editor_quit_client(GtkWidget *btn,
                            primary,
                            _("The application will lose any unsaved state and will not be restarted in your next session."),
                            _("_Cancel"), GTK_RESPONSE_CANCEL,
-                           XFCE_BUTTON_TYPE_MIXED, _("_Quit"), _("_Quit Program"), GTK_RESPONSE_ACCEPT,
+                           XFCE_BUTTON_TYPE_MIXED, "application-exit", _("_Quit Program"), GTK_RESPONSE_ACCEPT,
                            NULL) == GTK_RESPONSE_ACCEPT)
     {
         GError *error = NULL;
@@ -286,7 +286,7 @@ session_editor_quit_client(GtkWidget *btn,
                                 _("Terminate Program"), "dialog-error",
                                 _("Unable to terminate program."),
                                 error->message,
-                                _("Close"), GTK_RESPONSE_ACCEPT,
+                                XFCE_BUTTON_TYPE_MIXED, "window-close", _("_Close"), GTK_RESPONSE_ACCEPT,
                                 NULL);
             g_error_free(error);
         }
diff --git a/xfce4-session/xfsm-manager.c b/xfce4-session/xfsm-manager.c
index e6832d5..e53dd69 100644
--- a/xfce4-session/xfsm-manager.c
+++ b/xfce4-session/xfsm-manager.c
@@ -722,7 +722,7 @@ xfsm_manager_load_settings (XfsmManager   *manager,
                                "dialog-error",
                                _("Unable to load a failsafe session"),
                                errorstr,
-                               _("_Quit"), GTK_RESPONSE_ACCEPT, NULL);
+                               XFCE_BUTTON_TYPE_MIXED, "application-exit", _("_Quit"), GTK_RESPONSE_ACCEPT, NULL);
           g_free (errorstr);
           exit (EXIT_FAILURE);
         }
@@ -1142,7 +1142,7 @@ xfsm_manager_save_yourself_global (XfsmManager     *manager,
                                    ? _("Failed to suspend session")
                                    : _("Failed to hibernate session"),
                                    error->message,
-                                   _("_Close"), GTK_RESPONSE_ACCEPT,
+                                   XFCE_BUTTON_TYPE_MIXED, "window-close", _("_Close"), GTK_RESPONSE_ACCEPT,
                                    NULL);
               g_error_free (error);
             }

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.