summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego González <dggonz@src.gnome.org>2002-04-19 16:53:26 +0000
committerDiego González <dggonz@src.gnome.org>2002-04-19 16:53:26 +0000
commitb261127c43d23d3b28103e2286537693e62580f6 (patch)
treeb86b4fe11012b3849c56b8c34107bd79de3646f9
parentcb38b690db1272ed8eff1ada9ae26e4a63a79f74 (diff)
downloadnautilus-b261127c43d23d3b28103e2286537693e62580f6.tar.gz
fix for bug 74949
-rw-r--r--ChangeLog6
-rw-r--r--src/nautilus-navigation-window-menus.c19
-rw-r--r--src/nautilus-window-menus.c19
3 files changed, 32 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog
index 891de7336..66d5a9dc1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-04-19 Diego González <diego@pemas.net>
+
+ * src/nautilus-window-menus.c (forget_history_if_confirmed):
+ use eel_create_question_dialog to show the buttons with the
+ proper strings. This fixes bug 74949.
+
2002-04-19 Anders Carlsson <andersca@gnu.org>
* src/file-manager/fm-directory-view.c:
diff --git a/src/nautilus-navigation-window-menus.c b/src/nautilus-navigation-window-menus.c
index 3d5fecf91..695299433 100644
--- a/src/nautilus-navigation-window-menus.c
+++ b/src/nautilus-navigation-window-menus.c
@@ -96,6 +96,8 @@
#define CUSTOMER_FEEDBACK_URI "http://www.eazel.com/feedback.html"
#define START_HERE_URI "start-here:"
+#define RESPONSE_FORGET 1000
+
static GtkWindow *bookmarks_window = NULL;
static void append_bookmark_to_menu (NautilusWindow *window,
@@ -320,7 +322,7 @@ go_menu_start_here_callback (BonoboUIComponent *component,
static void
forget_history_if_yes (GtkDialog *dialog, int response, gpointer callback_data)
{
- if (response == GTK_RESPONSE_YES) {
+ if (response == RESPONSE_FORGET) {
nautilus_forget_history ();
}
gtk_object_destroy (GTK_OBJECT (dialog));
@@ -347,15 +349,20 @@ forget_history_if_confirmed (NautilusWindow *window)
"which locations you have visited?"));
}
- dialog = eel_show_yes_no_dialog (prompt,
- _("Forget History?"), _("Forget"), GTK_STOCK_CANCEL,
- GTK_WINDOW (window));
+ dialog = eel_create_question_dialog (prompt,
+ _("Forget History?"),
+ _("Forget"), RESPONSE_FORGET,
+ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ GTK_WINDOW (window));
+
+ gtk_widget_show (GTK_WIDGET (dialog));
+
g_free (prompt);
g_signal_connect (dialog, "response",
G_CALLBACK (forget_history_if_yes), NULL);
-
- gtk_dialog_set_default_response (dialog, GTK_RESPONSE_NO);
+
+ gtk_dialog_set_default_response (dialog, GTK_RESPONSE_CANCEL);
}
static void
diff --git a/src/nautilus-window-menus.c b/src/nautilus-window-menus.c
index 3d5fecf91..695299433 100644
--- a/src/nautilus-window-menus.c
+++ b/src/nautilus-window-menus.c
@@ -96,6 +96,8 @@
#define CUSTOMER_FEEDBACK_URI "http://www.eazel.com/feedback.html"
#define START_HERE_URI "start-here:"
+#define RESPONSE_FORGET 1000
+
static GtkWindow *bookmarks_window = NULL;
static void append_bookmark_to_menu (NautilusWindow *window,
@@ -320,7 +322,7 @@ go_menu_start_here_callback (BonoboUIComponent *component,
static void
forget_history_if_yes (GtkDialog *dialog, int response, gpointer callback_data)
{
- if (response == GTK_RESPONSE_YES) {
+ if (response == RESPONSE_FORGET) {
nautilus_forget_history ();
}
gtk_object_destroy (GTK_OBJECT (dialog));
@@ -347,15 +349,20 @@ forget_history_if_confirmed (NautilusWindow *window)
"which locations you have visited?"));
}
- dialog = eel_show_yes_no_dialog (prompt,
- _("Forget History?"), _("Forget"), GTK_STOCK_CANCEL,
- GTK_WINDOW (window));
+ dialog = eel_create_question_dialog (prompt,
+ _("Forget History?"),
+ _("Forget"), RESPONSE_FORGET,
+ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ GTK_WINDOW (window));
+
+ gtk_widget_show (GTK_WIDGET (dialog));
+
g_free (prompt);
g_signal_connect (dialog, "response",
G_CALLBACK (forget_history_if_yes), NULL);
-
- gtk_dialog_set_default_response (dialog, GTK_RESPONSE_NO);
+
+ gtk_dialog_set_default_response (dialog, GTK_RESPONSE_CANCEL);
}
static void