Use a Save or an Open stock button for the C-l dialog depending on the

2004-06-22  Federico Mena Quintero  <federico@ximian.com>

	* gtk/gtkfilechooserdefault.c (location_popup_handler): Use a Save
	or an Open stock button for the C-l dialog depending on the action
	in which the file chooser operates.  Fixes #141753.

diff --git a/ChangeLog b/ChangeLog
index 1350232edfebdb7160513fca69e172ed7500ff43..c015b35083c3f28e2f1f8938995cb7b7b7cf911b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-06-22  Federico Mena Quintero  <federico@ximian.com>
+
+       * gtk/gtkfilechooserdefault.c (location_popup_handler): Use a Save
+       or an Open stock button for the C-l dialog depending on the action
+       in which the file chooser operates.  Fixes #141753.
+
 2004-06-22  Federico Mena Quintero  <federico@ximian.com>
 
        Fixes the GTK+ part of #142308:

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 1350232edfebdb7160513fca69e172ed7500ff43..c015b35083c3f28e2f1f8938995cb7b7b7cf911b 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2004-06-22  Federico Mena Quintero  <federico@ximian.com>
+
+       * gtk/gtkfilechooserdefault.c (location_popup_handler): Use a Save
+       or an Open stock button for the C-l dialog depending on the action
+       in which the file chooser operates.  Fixes #141753.
+
 2004-06-22  Federico Mena Quintero  <federico@ximian.com>
 
        Fixes the GTK+ part of #142308:

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 1350232edfebdb7160513fca69e172ed7500ff43..c015b35083c3f28e2f1f8938995cb7b7b7cf911b 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+2004-06-22  Federico Mena Quintero  <federico@ximian.com>
+
+       * gtk/gtkfilechooserdefault.c (location_popup_handler): Use a Save
+       or an Open stock button for the C-l dialog depending on the action
+       in which the file chooser operates.  Fixes #141753.
+
 2004-06-22  Federico Mena Quintero  <federico@ximian.com>
 
        Fixes the GTK+ part of #142308:

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 1350232edfebdb7160513fca69e172ed7500ff43..c015b35083c3f28e2f1f8938995cb7b7b7cf911b 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2004-06-22  Federico Mena Quintero  <federico@ximian.com>
+
+       * gtk/gtkfilechooserdefault.c (location_popup_handler): Use a Save
+       or an Open stock button for the C-l dialog depending on the action
+       in which the file chooser operates.  Fixes #141753.
+
 2004-06-22  Federico Mena Quintero  <federico@ximian.com>
 
        Fixes the GTK+ part of #142308:

diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index 4c4b685a9efc09bc5b7d718b4afed0312cc92cc4..19708c7d1d9ed0d4e73b0261f5ea08c67031a670 100644 (file)
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -5328,7 +5328,8 @@ location_popup_handler (GtkFileChooserDefault *impl)
   GtkWidget *label;
   GtkWidget *entry;
   gboolean refocus;
-  char *title;
+  const char *title;
+  const char *accept_stock;
 
   /* Create dialog */
 
@@ -5338,19 +5339,21 @@ location_popup_handler (GtkFileChooserDefault *impl)
       || impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER)
     {
       title = _("Open Location");
+      accept_stock = GTK_STOCK_OPEN;
     }
   else
     {
       g_assert (impl->action == GTK_FILE_CHOOSER_ACTION_SAVE
                || impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER);
       title = _("Save in Location");
+      accept_stock = GTK_STOCK_SAVE;
     }
 
   dialog = gtk_dialog_new_with_buttons (title,
                                        toplevel,
                                        GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR,
                                        GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                                       GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
+                                       accept_stock, GTK_RESPONSE_ACCEPT,
                                        NULL);
   gtk_window_set_default_size (GTK_WINDOW (dialog), 300, -1);
   gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);