r13379 - in /desktop/unstable/gtk+2.0/debian: changelog patches/040_filechooser_single-click.patch
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Sun Nov 4 14:55:51 UTC 2007
Author: joss
Date: Sun Nov 4 14:55:51 2007
New Revision: 13379
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=13379
Log:
* Conflict against xfwm4 < 4.4.1-3 (previous versions freeze on
* 021_loader-files-d.patch: enclose process_module_file in correct
* 040_filechooser_single-click.patch: filter out duplicate entries in
bookmarks. This avoids a situation where the selection is changed to
the duplicate during DnD, causing an assertion error.
Closes: #447279.
Modified:
desktop/unstable/gtk+2.0/debian/changelog
desktop/unstable/gtk+2.0/debian/patches/040_filechooser_single-click.patch
Modified: desktop/unstable/gtk+2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/changelog?rev=13379&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/changelog (original)
+++ desktop/unstable/gtk+2.0/debian/changelog Sun Nov 4 14:55:51 2007
@@ -19,12 +19,16 @@
GTK_SELECTION_SINGLE type treeviews. Allows the fix in
040_filechooser_single-click.patch to work.
* Conflict against libeel2-2.18. Closes: #443701, #499070.
- * Conflict against xfwm4 < 4.4.1-3 (previous versions freeze on
+ * Conflict against xfwm4 < 4.4.1-3 (previous versions freeze on
startup).
- * 021_loader-files-d.patch: enclose process_module_file in correct
+ * 021_loader-files-d.patch: enclose process_module_file in correct
#ifdef's.
-
- -- Josselin Mouette <joss at debian.org> Sun, 04 Nov 2007 12:38:27 +0100
+ * 040_filechooser_single-click.patch: filter out duplicate entries in
+ bookmarks. This avoids a situation where the selection is changed to
+ the duplicate during DnD, causing an assertion error.
+ Closes: #447279.
+
+ -- Josselin Mouette <joss at debian.org> Sun, 04 Nov 2007 15:51:43 +0100
gtk+2.0 (2.12.1-1) unstable; urgency=low
Modified: desktop/unstable/gtk+2.0/debian/patches/040_filechooser_single-click.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/patches/040_filechooser_single-click.patch?rev=13379&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/patches/040_filechooser_single-click.patch (original)
+++ desktop/unstable/gtk+2.0/debian/patches/040_filechooser_single-click.patch Sun Nov 4 14:55:51 2007
@@ -3,9 +3,9 @@
Index: gtk+-2.12.1/gtk/gtkfilechooserdefault.c
===================================================================
---- gtk+-2.12.1.orig/gtk/gtkfilechooserdefault.c 2007-10-16 15:20:39.000000000 +0200
-+++ gtk+-2.12.1/gtk/gtkfilechooserdefault.c 2007-11-01 11:36:04.162043185 +0100
-@@ -390,10 +390,6 @@
+--- gtk+-2.12.1.orig/gtk/gtkfilechooserdefault.c 2007-11-04 15:14:51.503352071 +0100
++++ gtk+-2.12.1/gtk/gtkfilechooserdefault.c 2007-11-04 15:47:23.358581961 +0100
+@@ -390,10 +390,6 @@ static void check_preview_change (GtkFil
static void filter_combo_changed (GtkComboBox *combo_box,
GtkFileChooserDefault *impl);
@@ -16,7 +16,42 @@
static gboolean shortcuts_key_press_event_cb (GtkWidget *widget,
GdkEventKey *event,
-@@ -3657,8 +3653,22 @@
+@@ -2004,7 +2000,7 @@ shortcuts_append_paths (GtkFileChooserDe
+
+ /* As there is no separator now, we want to start there.
+ */
+- start_row = shortcuts_get_index (impl, SHORTCUTS_BOOKMARKS_SEPARATOR);
++ start_row = shortcuts_get_index (impl, SHORTCUTS_BOOKMARKS_SEPARATOR) + 1;
+ num_inserted = 0;
+
+ for (; paths; paths = paths->next)
+@@ -2016,6 +2012,8 @@ shortcuts_append_paths (GtkFileChooserDe
+ if (impl->local_only &&
+ !gtk_file_system_path_is_local (impl->file_system, path))
+ continue;
++ if (shortcut_find_position (impl, path) != -1)
++ continue;
+
+ label = gtk_file_system_get_bookmark_label (impl->file_system, path);
+
+@@ -2245,13 +2243,14 @@ shortcuts_add_bookmarks (GtkFileChooserD
+ impl->num_bookmarks + 1);
+
+ impl->num_bookmarks = 0;
++ shortcuts_insert_separator (impl, SHORTCUTS_BOOKMARKS_SEPARATOR);
+
+ bookmarks = gtk_file_system_list_bookmarks (impl->file_system);
+ shortcuts_append_paths (impl, bookmarks);
+ gtk_file_paths_free (bookmarks);
+
+- if (impl->num_bookmarks > 0)
+- shortcuts_insert_separator (impl, SHORTCUTS_BOOKMARKS_SEPARATOR);
++ if (impl->num_bookmarks == 0)
++ shortcuts_remove_rows (impl, shortcuts_get_index (impl, SHORTCUTS_BOOKMARKS_SEPARATOR), 1);
+
+ if (impl->shortcuts_pane_filter_model)
+ gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (impl->shortcuts_pane_filter_model));
+@@ -3657,8 +3656,22 @@ static void
shortcuts_selection_changed_cb (GtkTreeSelection *selection,
GtkFileChooserDefault *impl)
{
@@ -39,7 +74,7 @@
}
static gboolean
-@@ -3930,7 +3940,7 @@
+@@ -3930,7 +3943,7 @@ shortcuts_list_create (GtkFileChooserDef
GDK_ACTION_COPY | GDK_ACTION_MOVE);
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (impl->browse_shortcuts_tree_view));
@@ -48,7 +83,7 @@
gtk_tree_selection_set_select_function (selection,
shortcuts_select_func,
impl, NULL);
-@@ -3938,9 +3948,6 @@
+@@ -3938,9 +3951,6 @@ shortcuts_list_create (GtkFileChooserDef
g_signal_connect (selection, "changed",
G_CALLBACK (shortcuts_selection_changed_cb), impl);
@@ -58,7 +93,7 @@
g_signal_connect (impl->browse_shortcuts_tree_view, "key_press_event",
G_CALLBACK (shortcuts_key_press_event_cb), impl);
-@@ -8604,25 +8611,6 @@
+@@ -8604,25 +8614,6 @@ gtk_file_chooser_default_should_respond
gtk_file_path_free (path);
return retval;
}
@@ -84,7 +119,7 @@
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
-@@ -10482,25 +10470,6 @@
+@@ -10482,25 +10473,6 @@ shortcuts_activate_iter (GtkFileChooserD
}
}
More information about the pkg-gnome-commits
mailing list