callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* 040_filechooser_single-click.patch: remove shortcut-related actions

Browse Source 
in the response callback. This fixes the annoying bug where you need 
  to click twice on "save" after clicking on a shortcut.
This commit is contained in:
Josselin Mouette
2007-04-11 23:19:43 +00:00
parent 2a01082a53
commit 30a12923d7
2 changed files with 36 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
debian/changelog vendored
View File

@ -1,5 +1,6 @@
gtk+2.0 (2.10.11-2) UNRELEASED; urgency=low
[ Loic Minier ]
* Bump libwmf conflicts to << 0.2.8.4-5.
* Fix control generation.
* Include the new uploaders.mk from gnome-pkg-tools instead of duplicating
@ -11,7 +12,12 @@ gtk+2.0 (2.10.11-2) UNRELEASED; urgency=low
installation dirs.
* Call dh_installman -a.
-- Loic Minier <lool@dooz.org> Wed, 11 Apr 2007 18:38:17 +0200
[ Josselin Mouette ]
* 040_filechooser_single-click.patch: remove shortcut-related actions
in the response callback. This fixes the annoying bug where you need
to click twice on "save" after clicking on a shortcut.
-- Josselin Mouette <joss@debian.org> Wed, 11 Apr 2007 16:46:26 +0200
gtk+2.0 (2.10.11-1) experimental; urgency=low

47
debian/patches/040_filechooser_single-click.patch vendored
View File

@ -1,7 +1,7 @@
Index: gtk+2.0-2.10.10/gtk/gtkfilechooserdefault.c
Index: gtk+-2.10.11/gtk/gtkfilechooserdefault.c
===================================================================
--- gtk+2.0-2.10.10.orig/gtk/gtkfilechooserdefault.c 2007-03-12 14:50:39.000000000 +0100
+++ gtk+2.0-2.10.10/gtk/gtkfilechooserdefault.c 2007-03-13 14:10:47.000000000 +0100
--- gtk+-2.10.11.orig/gtk/gtkfilechooserdefault.c 2007-03-14 05:07:03.000000000 +0100
+++ gtk+-2.10.11/gtk/gtkfilechooserdefault.c 2007-04-11 16:45:23.062368250 +0200
@@ -3225,8 +3225,22 @@
shortcuts_selection_changed_cb (GtkTreeSelection *selection,
GtkFileChooserDefault *impl)
@ -25,22 +25,33 @@ Index: gtk+2.0-2.10.10/gtk/gtkfilechooserdefault.c
}
static gboolean
@@ -7849,10 +7863,13 @@
/* The focus is on a dialog's action area button, *and* the widget that
* was focused immediately before it is the shortcuts list. Switch to the
* selected shortcut and tell the caller not to respond.
+ * Exception: in the specific SELECT_FOLDER case, we want to return the
+ * currently selected shortcut.
*/
GtkTreeIter iter;
@@ -7844,25 +7858,6 @@
gtk_file_path_free (path);
return retval;
}
- else if (impl->toplevel_last_focus_widget == impl->browse_shortcuts_tree_view)
- {
- /* The focus is on a dialog's action area button, *and* the widget that
- * was focused immediately before it is the shortcuts list. Switch to the
- * selected shortcut and tell the caller not to respond.
- */
- GtkTreeIter iter;
-
- if (shortcuts_get_selected (impl, &iter))
+ if (impl->action != GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER
+ && shortcuts_get_selected (impl, &iter))
{
shortcuts_activate_iter (impl, &iter);
@@ -8191,17 +8208,6 @@
- {
- shortcuts_activate_iter (impl, &iter);
-
- gtk_widget_grab_focus (impl->browse_files_tree_view);
- }
- else
- goto file_list;
-
- return FALSE;
- }
else if (impl->toplevel_last_focus_widget == impl->browse_files_tree_view)
{
/* The focus is on a dialog's action area button, *and* the widget that
@@ -8191,17 +8186,6 @@
GtkTreeViewColumn *column,
GtkFileChooserDefault *impl)
{