[file-roller] ui: use "close" (not "Ok") buttons to close dialogs



commit e999cadcde26d4afd35e94968a03f1d33525b75d
Author: Frédéric Péters <fpeters 0d be>
Date:   Sun Jan 12 19:22:35 2014 +0100

    ui: use "close" (not "Ok") buttons to close dialogs
    
    https://bugzilla.gnome.org/show_bug.cgi?id=722051

 src/dlg-extract.c |    2 +-
 src/fr-window.c   |    4 ++--
 src/gtk-utils.c   |    2 +-
 src/gtk-utils.h   |    1 -
 4 files changed, 4 insertions(+), 5 deletions(-)
---
diff --git a/src/dlg-extract.c b/src/dlg-extract.c
index ca3c813..c4fbf00 100644
--- a/src/dlg-extract.c
+++ b/src/dlg-extract.c
@@ -140,7 +140,7 @@ extract_cb (GtkWidget   *w,
                                             _GTK_ICON_NAME_DIALOG_WARNING,
                                             _("Extraction not performed"),
                                             NULL,
-                                            _GTK_LABEL_OK, GTK_RESPONSE_OK,
+                                            _GTK_LABEL_CLOSE, GTK_RESPONSE_OK,
                                             NULL);
                gtk_dialog_set_default_response (GTK_DIALOG (d), GTK_RESPONSE_OK);
                gtk_dialog_run (GTK_DIALOG (d));
diff --git a/src/fr-window.c b/src/fr-window.c
index e5e1342..61fab82 100644
--- a/src/fr-window.c
+++ b/src/fr-window.c
@@ -6544,7 +6544,7 @@ _fr_window_ask_overwrite_dialog (OverwriteData *odata)
                                             _GTK_ICON_NAME_DIALOG_WARNING,
                                             _("Extraction not performed"),
                                             NULL,
-                                            _GTK_LABEL_OK, GTK_RESPONSE_OK,
+                                            _GTK_LABEL_CLOSE, GTK_RESPONSE_OK,
                                             NULL);
                gtk_dialog_set_default_response (GTK_DIALOG (d), GTK_RESPONSE_OK);
                fr_window_show_error_dialog (odata->window, d, GTK_WINDOW (odata->window), _("Extraction not 
performed"));
@@ -6691,7 +6691,7 @@ fr_window_archive_extract (FrWindow    *window,
                                             _GTK_ICON_NAME_DIALOG_WARNING,
                                             _("Extraction not performed"),
                                             NULL,
-                                            _GTK_LABEL_OK, GTK_RESPONSE_OK,
+                                            _GTK_LABEL_CLOSE, GTK_RESPONSE_OK,
                                             NULL);
                gtk_dialog_set_default_response (GTK_DIALOG (d), GTK_RESPONSE_OK);
                fr_window_show_error_dialog (window, d, GTK_WINDOW (window), _("Extraction not performed"));
diff --git a/src/gtk-utils.c b/src/gtk-utils.c
index fdb5dd4..5c7f8cb 100644
--- a/src/gtk-utils.c
+++ b/src/gtk-utils.c
@@ -535,7 +535,7 @@ _gtk_show_help_dialog (GtkWindow  *parent,
                                                  _GTK_ICON_NAME_DIALOG_ERROR,
                                                  _("Could not display help"),
                                                  error->message,
-                                                 _GTK_LABEL_OK, GTK_RESPONSE_OK,
+                                                 _GTK_LABEL_CLOSE, GTK_RESPONSE_OK,
                                                  NULL);
                gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
 
diff --git a/src/gtk-utils.h b/src/gtk-utils.h
index f6f366b..eee4085 100644
--- a/src/gtk-utils.h
+++ b/src/gtk-utils.h
@@ -36,7 +36,6 @@
 #define _GTK_LABEL_CLOSE _("_Close")
 #define _GTK_LABEL_CREATE_ARCHIVE _("C_reate")
 #define _GTK_LABEL_EXTRACT _("_Extract")
-#define _GTK_LABEL_OK _("_Ok")
 #define _GTK_LABEL_OPEN _("_Open")
 #define _GTK_LABEL_SAVE _("_Save")
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]