Merged from gtk-2-4:

2004-11-19  Federico Mena Quintero  <federico@ximian.com>

	Merged from gtk-2-4:

	Fix #141077.  Based on a patch by Christian Neumair <chris@gnome-de.org>:

	* gtk/gtkfilechooserdefault.c (new_folder_button_clicked):
	Desensitize the "new folder" button.
	(edited_idle_cb): Sensitize the button back.

diff --git a/ChangeLog b/ChangeLog
index 9492c159446de3b8238bb456b736fa5274b39318..9356db4a8abbe6691020494ea0a7fa148f2927f4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2004-11-19  Federico Mena Quintero  <federico@ximian.com>
+
+       Merged from gtk-2-4:
+
+       Fix #141077.  Based on a patch by Christian Neumair <chris@gnome-de.org>:
+
+       * gtk/gtkfilechooserdefault.c (new_folder_button_clicked):
+       Desensitize the "new folder" button.
+       (edited_idle_cb): Sensitize the button back.
+
 2004-11-19  Federico Mena Quintero  <federico@ximian.com>
 
        Merged from gtk-2-4:

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 9492c159446de3b8238bb456b736fa5274b39318..9356db4a8abbe6691020494ea0a7fa148f2927f4 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,13 @@
+2004-11-19  Federico Mena Quintero  <federico@ximian.com>
+
+       Merged from gtk-2-4:
+
+       Fix #141077.  Based on a patch by Christian Neumair <chris@gnome-de.org>:
+
+       * gtk/gtkfilechooserdefault.c (new_folder_button_clicked):
+       Desensitize the "new folder" button.
+       (edited_idle_cb): Sensitize the button back.
+
 2004-11-19  Federico Mena Quintero  <federico@ximian.com>
 
        Merged from gtk-2-4:

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 9492c159446de3b8238bb456b736fa5274b39318..9356db4a8abbe6691020494ea0a7fa148f2927f4 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,13 @@
+2004-11-19  Federico Mena Quintero  <federico@ximian.com>
+
+       Merged from gtk-2-4:
+
+       Fix #141077.  Based on a patch by Christian Neumair <chris@gnome-de.org>:
+
+       * gtk/gtkfilechooserdefault.c (new_folder_button_clicked):
+       Desensitize the "new folder" button.
+       (edited_idle_cb): Sensitize the button back.
+
 2004-11-19  Federico Mena Quintero  <federico@ximian.com>
 
        Merged from gtk-2-4:

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 9492c159446de3b8238bb456b736fa5274b39318..9356db4a8abbe6691020494ea0a7fa148f2927f4 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,13 @@
+2004-11-19  Federico Mena Quintero  <federico@ximian.com>
+
+       Merged from gtk-2-4:
+
+       Fix #141077.  Based on a patch by Christian Neumair <chris@gnome-de.org>:
+
+       * gtk/gtkfilechooserdefault.c (new_folder_button_clicked):
+       Desensitize the "new folder" button.
+       (edited_idle_cb): Sensitize the button back.
+
 2004-11-19  Federico Mena Quintero  <federico@ximian.com>
 
        Merged from gtk-2-4:

diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index a47576a5bf7e66aadd802c9cd3c61797c33f2f3d..6ca67556df8560fbe1b0a7bfab5740927e273f68 100644 (file)
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -1568,6 +1568,9 @@ new_folder_button_clicked (GtkButton             *button,
   if (!impl->browse_files_model)
     return; /* FIXME: this sucks.  Disable the New Folder button or something. */
 
+  /* Prevent button from being clicked twice */
+  gtk_widget_set_sensitive (impl->browse_new_folder_button, FALSE);
+
   _gtk_file_system_model_add_editable (impl->browse_files_model, &iter);
 
   path = gtk_tree_model_get_path (GTK_TREE_MODEL (impl->browse_files_model), &iter);
@@ -1596,6 +1599,8 @@ edited_idle_cb (GtkFileChooserDefault *impl)
   _gtk_file_system_model_remove_editable (impl->browse_files_model);
   g_object_set (impl->list_name_renderer, "editable", FALSE, NULL);
 
+  gtk_widget_set_sensitive (impl->browse_new_folder_button, TRUE);
+
   if (impl->edited_new_text) /* not cancelled? */
     {
       GError *error;