rpms/gtk2/F-7 .cvsignore, 1.67, 1.68 gtk+-2.10.12-search.patch, 1.2, 1.3 gtk2.spec, 1.226, 1.227 sources, 1.76, 1.77

Matthias Clasen (mclasen) fedora-extras-commits at redhat.com
Wed Jun 13 05:49:07 UTC 2007 

Author: mclasen

Update of /cvs/extras/rpms/gtk2/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18834

Modified Files:
	.cvsignore gtk+-2.10.12-search.patch gtk2.spec sources 
Log Message:
2.10.13



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtk2/F-7/.cvsignore,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- .cvsignore	20 May 2007 00:16:06 -0000	1.67
+++ .cvsignore	13 Jun 2007 05:48:32 -0000	1.68
@@ -1 +1 @@
-gtk+-2.10.12.tar.bz2
+gtk+-2.10.13.tar.bz2

gtk+-2.10.12-search.patch:

Index: gtk+-2.10.12-search.patch
===================================================================
RCS file: /cvs/extras/rpms/gtk2/F-7/gtk+-2.10.12-search.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gtk+-2.10.12-search.patch	20 May 2007 00:26:02 -0000	1.2
+++ gtk+-2.10.12-search.patch	13 Jun 2007 05:48:32 -0000	1.3
@@ -1,5 +1,5 @@
---- /dev/null	2007-05-19 19:05:57.724948798 -0400
-+++ gtk+-2.10.12/gtk/gtksearchenginetracker.h	2007-05-19 19:51:53.000000000 -0400
+--- /dev/null	2007-06-12 15:51:13.163611224 -0400
++++ gtk+-2.10.13/gtk/gtksearchenginetracker.h	2007-06-13 01:04:03.000000000 -0400
 @@ -0,0 +1,59 @@
 +/*
 + * Copyright (C) 2005 Mr Jamie McCracken
@@ -60,8 +60,8 @@
 +G_END_DECLS
 +
 +#endif /* __GTK_SEARCH_ENGINE_TRACKER_H__ */
---- /dev/null	2007-05-19 19:05:57.724948798 -0400
-+++ gtk+-2.10.12/gtk/gtksearchengine.h	2007-05-19 19:51:53.000000000 -0400
+--- /dev/null	2007-06-12 15:51:13.163611224 -0400
++++ gtk+-2.10.13/gtk/gtksearchengine.h	2007-06-13 01:04:03.000000000 -0400
 @@ -0,0 +1,91 @@
 +/*
 + * Copyright (C) 2005 Novell, Inc.
@@ -154,8 +154,8 @@
 +G_END_DECLS
 +
 +#endif /* __GTK_SEARCH_ENGINE_H__ */
---- /dev/null	2007-05-19 19:05:57.724948798 -0400
-+++ gtk+-2.10.12/gtk/gtksearchenginebeagle.h	2007-05-19 19:51:53.000000000 -0400
+--- /dev/null	2007-06-12 15:51:13.163611224 -0400
++++ gtk+-2.10.13/gtk/gtksearchenginebeagle.h	2007-06-13 01:04:03.000000000 -0400
 @@ -0,0 +1,59 @@
 +/*
 + * Copyright (C) 2005 Novell, Inc.
@@ -216,8 +216,8 @@
 +G_END_DECLS
 +
 +#endif /* __GTK_SEARCH_ENGINE_BEAGLE_H__ */
---- /dev/null	2007-05-19 19:05:57.724948798 -0400
-+++ gtk+-2.10.12/gtk/gtksearchengine.c	2007-05-19 19:51:53.000000000 -0400
+--- /dev/null	2007-06-12 15:51:13.163611224 -0400
++++ gtk+-2.10.13/gtk/gtksearchengine.c	2007-06-13 01:04:03.000000000 -0400
 @@ -0,0 +1,199 @@
 +/*
 + * Copyright (C) 2005 Novell, Inc.
@@ -418,8 +418,8 @@
 +  
 +  g_signal_emit (engine, signals[ERROR], 0, error_message);
 +}
---- /dev/null	2007-05-19 19:05:57.724948798 -0400
-+++ gtk+-2.10.12/gtk/gtksearchenginetracker.c	2007-05-19 19:51:53.000000000 -0400
+--- /dev/null	2007-06-12 15:51:13.163611224 -0400
++++ gtk+-2.10.13/gtk/gtksearchenginetracker.c	2007-06-13 01:04:03.000000000 -0400
 @@ -0,0 +1,362 @@
 +/*
 + * Copyright (C) 2005 Mr Jamie McCracken
@@ -783,8 +783,8 @@
 +  
 +  return GTK_SEARCH_ENGINE (engine);
 +}
---- gtk+-2.10.12/gtk/Makefile.am.search	2007-05-02 12:41:42.000000000 -0400
-+++ gtk+-2.10.12/gtk/Makefile.am	2007-05-19 19:51:53.000000000 -0400
+--- gtk+-2.10.13/gtk/Makefile.am.search	2007-06-12 23:09:42.000000000 -0400
++++ gtk+-2.10.13/gtk/Makefile.am	2007-06-13 01:04:03.000000000 -0400
 @@ -333,6 +333,11 @@ gtk_semi_private_h_sources =    \
  
  # GTK+ header files that don't get installed
@@ -809,8 +809,8 @@
  	fnmatch.c		\
  	gtkaboutdialog.c	\
  	gtkaccelgroup.c		\
---- gtk+-2.10.12/gtk/gtkfilechooserdefault.c.search	2007-05-02 12:26:59.000000000 -0400
-+++ gtk+-2.10.12/gtk/gtkfilechooserdefault.c	2007-05-19 20:09:30.000000000 -0400
+--- gtk+-2.10.13/gtk/gtkfilechooserdefault.c.search	2007-06-12 23:09:41.000000000 -0400
++++ gtk+-2.10.13/gtk/gtkfilechooserdefault.c	2007-06-13 01:06:54.000000000 -0400
 @@ -79,6 +79,8 @@
  #include <errno.h>
  #include <string.h>
@@ -879,22 +879,7 @@
    SHORTCUTS_HOME,
    SHORTCUTS_DESKTOP,
    SHORTCUTS_VOLUMES,
-@@ -424,6 +453,14 @@ static void location_button_toggled_cb (
- 					GtkFileChooserDefault *impl);
- static void location_switch_to_path_bar (GtkFileChooserDefault *impl);
- 
-+static void     search_stop_searching        (GtkFileChooserDefault *impl);
-+static void     search_clear_model           (GtkFileChooserDefault *impl, 
-+					      gboolean               remove_from_treeview);
-+static gboolean search_should_respond        (GtkFileChooserDefault *impl);
-+static void     search_switch_to_browse_mode (GtkFileChooserDefault *impl);
-+static GSList  *search_get_selected_paths    (GtkFileChooserDefault *impl);
-+static void     search_entry_activate_cb     (GtkEntry              *entry, 
-+					      gpointer               data);
- 
- 
- 
-@@ -433,26 +470,26 @@ typedef struct {
+@@ -433,27 +462,35 @@ typedef struct {
    GtkTreeModelFilter parent;
  
    GtkFileChooserDefault *impl;
@@ -921,18 +906,28 @@
  			 GTK_TYPE_TREE_MODEL_FILTER,
  			 G_IMPLEMENT_INTERFACE (GTK_TYPE_TREE_DRAG_SOURCE,
 -						shortcuts_model_filter_drag_source_iface_init))
-+						shortcuts_pane_model_filter_drag_source_iface_init))
- 
+-
 -static GtkTreeModel *shortcuts_model_filter_new (GtkFileChooserDefault *impl,
 -						 GtkTreeModel          *child_model,
 -						 GtkTreePath           *root);
++						shortcuts_pane_model_filter_drag_source_iface_init))
+ 
 +static GtkTreeModel *shortcuts_pane_model_filter_new (GtkFileChooserDefault *impl,
-+						      GtkTreeModel          *child_model,
++				  		      GtkTreeModel          *child_model,
 +						      GtkTreePath           *root);
++
++static void     search_stop_searching        (GtkFileChooserDefault *impl);
++static void     search_clear_model           (GtkFileChooserDefault *impl, 
++					      gboolean               remove_from_treeview);
++static gboolean search_should_respond        (GtkFileChooserDefault *impl);
++static void     search_switch_to_browse_mode (GtkFileChooserDefault *impl);
++static GSList  *search_get_selected_paths    (GtkFileChooserDefault *impl);
++static void     search_entry_activate_cb     (GtkEntry              *entry, 
++					      gpointer               data);
  
  
- 
-@@ -687,6 +724,7 @@ _gtk_file_chooser_default_init (GtkFileC
+ G_DEFINE_TYPE_WITH_CODE (GtkFileChooserDefault, _gtk_file_chooser_default, GTK_TYPE_VBOX,
+@@ -688,6 +725,7 @@ _gtk_file_chooser_default_init (GtkFileC
    impl->reload_state = RELOAD_EMPTY;
    impl->pending_select_paths = NULL;
    impl->location_mode = LOCATION_MODE_PATH_BAR;
@@ -940,7 +935,7 @@
  
    gtk_box_set_spacing (GTK_BOX (impl), 12);
  
-@@ -702,22 +740,24 @@ shortcuts_free_row_data (GtkFileChooserD
+@@ -703,22 +741,24 @@ shortcuts_free_row_data (GtkFileChooserD
  			 GtkTreeIter           *iter)
  {
    gpointer col_data;
@@ -969,7 +964,7 @@
      {
        GtkFileSystemVolume *volume;
  
-@@ -728,6 +768,8 @@ shortcuts_free_row_data (GtkFileChooserD
+@@ -729,6 +769,8 @@ shortcuts_free_row_data (GtkFileChooserD
      {
        GtkFilePath *path;
  
@@ -978,7 +973,7 @@
        path = col_data;
        gtk_file_path_free (path);
      }
-@@ -814,8 +856,11 @@ gtk_file_chooser_default_finalize (GObje
+@@ -815,8 +857,11 @@ gtk_file_chooser_default_finalize (GObje
    GtkFileChooserDefault *impl = GTK_FILE_CHOOSER_DEFAULT (object);
    GSList *l;
  
@@ -992,7 +987,7 @@
  
    shortcuts_free (impl);
  
-@@ -852,6 +897,9 @@ gtk_file_chooser_default_finalize (GObje
+@@ -853,6 +898,9 @@ gtk_file_chooser_default_finalize (GObje
  
    if (impl->sort_model)
      g_object_unref (impl->sort_model);
@@ -1002,7 +997,7 @@
  
    g_free (impl->preview_display_name);
  
-@@ -1105,6 +1153,14 @@ set_preview_widget (GtkFileChooserDefaul
+@@ -1106,6 +1154,14 @@ set_preview_widget (GtkFileChooserDefaul
    update_preview_widget_visibility (impl);
  }
  
@@ -1017,7 +1012,7 @@
  /* Re-reads all the icons for the shortcuts, used when the theme changes */
  struct ReloadIconsData
  {
-@@ -1175,19 +1231,20 @@ shortcuts_reload_icons (GtkFileChooserDe
+@@ -1176,19 +1232,20 @@ shortcuts_reload_icons (GtkFileChooserDe
    do
      {
        gpointer data;
@@ -1042,7 +1037,7 @@
  	    {
  	      GtkFileSystemVolume *volume;
  
-@@ -1202,46 +1259,53 @@ shortcuts_reload_icons (GtkFileChooserDe
+@@ -1203,46 +1260,53 @@ shortcuts_reload_icons (GtkFileChooserDe
  	      if (pixbuf)
  		g_object_unref (pixbuf);
  	    }
@@ -1135,7 +1130,7 @@
  	    }
  	}
      }
-@@ -1373,7 +1437,6 @@ get_file_info_finished (GtkFileSystemHan
+@@ -1374,7 +1438,6 @@ get_file_info_finished (GtkFileSystemHan
  {
    gint pos = -1;
    gboolean cancelled = handle->cancelled;
@@ -1143,7 +1138,7 @@
    GdkPixbuf *pixbuf;
    GtkTreePath *path;
    GtkTreeIter iter;
-@@ -1438,12 +1501,15 @@ get_file_info_finished (GtkFileSystemHan
+@@ -1439,12 +1502,15 @@ get_file_info_finished (GtkFileSystemHan
  		      SHORTCUTS_COL_PIXBUF, pixbuf,
  		      SHORTCUTS_COL_PIXBUF_VISIBLE, TRUE,
  		      SHORTCUTS_COL_NAME, request->label_copy,
@@ -1162,7 +1157,7 @@
  
    if (request->type == SHORTCUTS_CURRENT_FOLDER
        && request->impl->save_folder_combo != NULL)
-@@ -1455,7 +1521,7 @@ get_file_info_finished (GtkFileSystemHan
+@@ -1456,7 +1522,7 @@ get_file_info_finished (GtkFileSystemHan
        g_signal_handlers_block_by_func (request->impl->save_folder_combo,
  				       G_CALLBACK (save_folder_combo_changed_cb),
  				       request->impl);
@@ -1171,7 +1166,7 @@
        g_signal_handlers_unblock_by_func (request->impl->save_folder_combo,
  				         G_CALLBACK (save_folder_combo_changed_cb),
  				         request->impl);
-@@ -1529,7 +1595,7 @@ _gtk_file_chooser_label_for_uri (const g
+@@ -1530,7 +1596,7 @@ _gtk_file_chooser_label_for_uri (const g
  static void
  shortcuts_insert_path (GtkFileChooserDefault *impl,
  		       int                    pos,
@@ -1180,7 +1175,7 @@
  		       GtkFileSystemVolume   *volume,
  		       const GtkFilePath     *path,
  		       const char            *label,
-@@ -1542,79 +1608,89 @@ shortcuts_insert_path (GtkFileChooserDef
+@@ -1543,79 +1609,89 @@ shortcuts_insert_path (GtkFileChooserDef
    GtkTreeIter iter;
    GtkIconTheme *icon_theme;      
  
@@ -1246,11 +1241,11 @@
 +			      SHORTCUTS_COL_TYPE, SHORTCUT_TYPE_PATH,
 +			      SHORTCUTS_COL_HANDLE, handle,
 +			      -1);
++
++          shortcuts_update_count (impl, type, 1);
  
 -      if (pos == -1)
 -	gtk_list_store_append (impl->shortcuts_model, &iter);
-+          shortcuts_update_count (impl, type, 1);
-+
 +          return;
 +        }
        else
@@ -1327,7 +1322,7 @@
      }
  
    if (pos == -1)
-@@ -1629,13 +1705,16 @@ shortcuts_insert_path (GtkFileChooserDef
+@@ -1630,13 +1706,16 @@ shortcuts_insert_path (GtkFileChooserDef
  		      SHORTCUTS_COL_PIXBUF_VISIBLE, TRUE,
  		      SHORTCUTS_COL_NAME, label_copy,
  		      SHORTCUTS_COL_DATA, data,
@@ -1347,7 +1342,7 @@
  
    if (type == SHORTCUTS_CURRENT_FOLDER && impl->save_folder_combo != NULL)
      {
-@@ -1647,7 +1726,8 @@ shortcuts_insert_path (GtkFileChooserDef
+@@ -1648,7 +1727,8 @@ shortcuts_insert_path (GtkFileChooserDef
        g_signal_handlers_block_by_func (impl->save_folder_combo,
  				       G_CALLBACK (save_folder_combo_changed_cb),
  				       impl);
@@ -1357,7 +1352,7 @@
        g_signal_handlers_unblock_by_func (impl->save_folder_combo,
  				         G_CALLBACK (save_folder_combo_changed_cb),
  				         impl);
-@@ -1661,6 +1741,30 @@ shortcuts_insert_path (GtkFileChooserDef
+@@ -1662,6 +1742,30 @@ shortcuts_insert_path (GtkFileChooserDef
    profile_end ("end", NULL);
  }
  
@@ -1388,7 +1383,7 @@
  /* Appends an item for the user's home directory to the shortcuts model */
  static void
  shortcuts_append_home (GtkFileChooserDefault *impl)
-@@ -1679,7 +1783,8 @@ shortcuts_append_home (GtkFileChooserDef
+@@ -1680,7 +1784,8 @@ shortcuts_append_home (GtkFileChooserDef
  
    home_path = gtk_file_system_filename_to_path (impl->file_system, home);
  
@@ -1398,7 +1393,7 @@
  
    gtk_file_path_free (home_path);
  
-@@ -1712,7 +1817,9 @@ shortcuts_append_desktop (GtkFileChooser
+@@ -1713,7 +1818,9 @@ shortcuts_append_desktop (GtkFileChooser
    path = gtk_file_system_filename_to_path (impl->file_system, name);
    g_free (name);
  
@@ -1409,7 +1404,7 @@
    /* We do not actually pop up an error dialog if there is no desktop directory
     * because some people may really not want to have one.
     */
-@@ -1751,7 +1858,7 @@ shortcuts_append_paths (GtkFileChooserDe
+@@ -1752,7 +1859,7 @@ shortcuts_append_paths (GtkFileChooserDe
        label = gtk_file_system_get_bookmark_label (impl->file_system, path);
  
        /* NULL GError, but we don't really want to show error boxes here */
@@ -1418,7 +1413,7 @@
        num_inserted++;
  
        g_free (label);
-@@ -1770,6 +1877,16 @@ shortcuts_get_index (GtkFileChooserDefau
+@@ -1771,6 +1878,16 @@ shortcuts_get_index (GtkFileChooserDefau
    int n;
  
    n = 0;
@@ -1435,7 +1430,7 @@
  
    if (where == SHORTCUTS_HOME)
      goto out;
-@@ -1867,15 +1984,18 @@ shortcuts_add_volumes (GtkFileChooserDef
+@@ -1868,15 +1985,18 @@ shortcuts_add_volumes (GtkFileChooserDef
  	    }
  	}
  
@@ -1457,7 +1452,7 @@
  
    impl->changing_folder = old_changing_folders;
  
-@@ -1885,11 +2005,13 @@ shortcuts_add_volumes (GtkFileChooserDef
+@@ -1886,11 +2006,13 @@ shortcuts_add_volumes (GtkFileChooserDef
  /* Inserts a separator node in the shortcuts list */
  static void
  shortcuts_insert_separator (GtkFileChooserDefault *impl,
@@ -1473,7 +1468,7 @@
  
    gtk_list_store_insert (impl->shortcuts_model, &iter,
  			 shortcuts_get_index (impl, where));
-@@ -1898,6 +2020,7 @@ shortcuts_insert_separator (GtkFileChoos
+@@ -1899,6 +2021,7 @@ shortcuts_insert_separator (GtkFileChoos
  		      SHORTCUTS_COL_PIXBUF_VISIBLE, FALSE,
  		      SHORTCUTS_COL_NAME, NULL,
  		      SHORTCUTS_COL_DATA, NULL,
@@ -1481,7 +1476,7 @@
  		      -1);
  }
  
-@@ -1910,7 +2033,7 @@ shortcuts_add_bookmarks (GtkFileChooserD
+@@ -1911,7 +2034,7 @@ shortcuts_add_bookmarks (GtkFileChooserD
    GtkTreeIter iter;
    GtkFilePath *list_selected = NULL;
    GtkFilePath *combo_selected = NULL;
@@ -1490,7 +1485,7 @@
    gpointer col_data;
  
    profile_start ("start", NULL);
-@@ -1923,10 +2046,10 @@ shortcuts_add_bookmarks (GtkFileChooserD
+@@ -1924,10 +2047,10 @@ shortcuts_add_bookmarks (GtkFileChooserD
        gtk_tree_model_get (GTK_TREE_MODEL (impl->shortcuts_model), 
  			  &iter, 
  			  SHORTCUTS_COL_DATA, &col_data,
@@ -1503,7 +1498,7 @@
  	list_selected = gtk_file_path_copy (col_data);
      }
  
-@@ -1934,13 +2057,18 @@ shortcuts_add_bookmarks (GtkFileChooserD
+@@ -1935,13 +2058,18 @@ shortcuts_add_bookmarks (GtkFileChooserD
        gtk_combo_box_get_active_iter (GTK_COMBO_BOX (impl->save_folder_combo), 
  				     &iter))
      {
@@ -1525,7 +1520,7 @@
  	combo_selected = gtk_file_path_copy (col_data);
      }
  
-@@ -1958,8 +2086,11 @@ shortcuts_add_bookmarks (GtkFileChooserD
+@@ -1959,8 +2087,11 @@ shortcuts_add_bookmarks (GtkFileChooserD
    if (impl->num_bookmarks > 0)
      shortcuts_insert_separator (impl, SHORTCUTS_BOOKMARKS_SEPARATOR);
  
@@ -1539,7 +1534,7 @@
  
    if (list_selected)
      {
-@@ -1973,8 +2104,8 @@ shortcuts_add_bookmarks (GtkFileChooserD
+@@ -1974,8 +2105,8 @@ shortcuts_add_bookmarks (GtkFileChooserD
  
        pos = shortcut_find_position (impl, combo_selected);
        if (pos != -1)
@@ -1550,7 +1545,7 @@
        gtk_file_path_free (combo_selected);
      }
    
-@@ -2019,11 +2150,11 @@ shortcuts_add_current_folder (GtkFileCho
+@@ -2020,11 +2151,11 @@ shortcuts_add_current_folder (GtkFileCho
        if (base_path &&
  	  strcmp (gtk_file_path_get_string (base_path), gtk_file_path_get_string (impl->current_folder)) == 0)
  	{
@@ -1564,7 +1559,7 @@
  	  if (volume)
  	    gtk_file_system_volume_free (impl->file_system, volume);
  	}
-@@ -2032,7 +2163,8 @@ shortcuts_add_current_folder (GtkFileCho
+@@ -2033,7 +2164,8 @@ shortcuts_add_current_folder (GtkFileCho
  	gtk_file_path_free (base_path);
      }
    else if (impl->save_folder_combo != NULL)
@@ -1574,7 +1569,7 @@
  }
  
  /* Updates the current folder row in the shortcuts model */
-@@ -2054,9 +2186,9 @@ shortcuts_update_current_folder (GtkFile
+@@ -2055,9 +2187,9 @@ shortcuts_update_current_folder (GtkFile
  
  /* Filter function used for the shortcuts filter model */
  static gboolean
@@ -1587,7 +1582,7 @@
  {
    GtkFileChooserDefault *impl;
    GtkTreePath *path;
-@@ -2083,11 +2215,17 @@ shortcuts_model_create (GtkFileChooserDe
+@@ -2084,11 +2216,17 @@ shortcuts_model_create (GtkFileChooserDe
  					      GDK_TYPE_PIXBUF,	/* pixbuf */
  					      G_TYPE_STRING,	/* name */
  					      G_TYPE_POINTER,	/* path or volume */
@@ -1606,7 +1601,7 @@
    if (impl->file_system)
      {
        shortcuts_append_home (impl);
-@@ -2095,12 +2233,12 @@ shortcuts_model_create (GtkFileChooserDe
+@@ -2096,12 +2234,12 @@ shortcuts_model_create (GtkFileChooserDe
        shortcuts_add_volumes (impl);
      }
  
@@ -1624,7 +1619,7 @@
  					  impl,
  					  NULL);
  }
-@@ -2318,16 +2456,16 @@ shortcut_find_position (GtkFileChooserDe
+@@ -2319,16 +2457,16 @@ shortcut_find_position (GtkFileChooserDe
    for (i = 0; i < current_folder_separator_idx; i++)
      {
        gpointer col_data;
@@ -1644,7 +1639,7 @@
  	    {
  	      GtkFileSystemVolume *volume;
  	      GtkFilePath *base_path;
-@@ -2343,7 +2481,7 @@ shortcut_find_position (GtkFileChooserDe
+@@ -2344,7 +2482,7 @@ shortcut_find_position (GtkFileChooserDe
  	      if (exists)
  		return i;
  	    }
@@ -1653,7 +1648,7 @@
  	    {
  	      GtkFilePath *model_path;
  
-@@ -2449,7 +2587,7 @@ shortcuts_get_selected (GtkFileChooserDe
+@@ -2450,7 +2588,7 @@ shortcuts_get_selected (GtkFileChooserDe
    if (!gtk_tree_selection_get_selected (selection, NULL, &parent_iter))
      return FALSE;
  
@@ -1662,7 +1657,7 @@
  						    iter,
  						    &parent_iter);
    return TRUE;
-@@ -2472,11 +2610,12 @@ remove_selected_bookmarks (GtkFileChoose
+@@ -2473,11 +2611,12 @@ remove_selected_bookmarks (GtkFileChoose
  		      SHORTCUTS_COL_DATA, &col_data,
  		      SHORTCUTS_COL_REMOVABLE, &removable,
  		      -1);
@@ -1676,7 +1671,7 @@
    path = col_data;
  
    error = NULL;
-@@ -2633,6 +2772,16 @@ bookmarks_check_add_sensitivity (GtkFile
+@@ -2634,6 +2773,16 @@ bookmarks_check_add_sensitivity (GtkFile
    gboolean active;
    gchar *tip;
  
@@ -1693,7 +1688,7 @@
    selection_check (impl, &num_selected, NULL, &all_folders);
  
    if (num_selected == 0)
-@@ -3146,7 +3295,7 @@ shortcuts_reorder (GtkFileChooserDefault
+@@ -3147,7 +3296,7 @@ shortcuts_reorder (GtkFileChooserDefault
  {
    GtkTreeIter iter;
    gpointer col_data;
@@ -1702,7 +1697,7 @@
    GtkTreePath *path;
    int old_position;
    int bookmarks_index;
-@@ -3171,10 +3320,10 @@ shortcuts_reorder (GtkFileChooserDefault
+@@ -3172,10 +3321,10 @@ shortcuts_reorder (GtkFileChooserDefault
    gtk_tree_model_get (GTK_TREE_MODEL (impl->shortcuts_model), &iter,
  		      SHORTCUTS_COL_NAME, &name,
  		      SHORTCUTS_COL_DATA, &col_data,
@@ -1715,7 +1710,7 @@
    
    file_path = col_data;
    file_path_copy = gtk_file_path_copy (file_path); /* removal below will free file_path, so we need a copy */
-@@ -3258,17 +3407,11 @@ shortcuts_row_separator_func (GtkTreeMod
+@@ -3259,17 +3408,11 @@ shortcuts_row_separator_func (GtkTreeMod
  			      GtkTreeIter  *iter,
  			      gpointer      data)
  {
@@ -1736,7 +1731,7 @@
  }
  
  /* Since GtkTreeView has a keybinding attached to '/', we need to catch
-@@ -3513,7 +3656,7 @@ shortcuts_list_create (GtkFileChooserDef
+@@ -3514,7 +3657,7 @@ shortcuts_list_create (GtkFileChooserDef
    /* Accessible object name for the file chooser's shortcuts pane */
    atk_object_set_name (gtk_widget_get_accessible (impl->browse_shortcuts_tree_view), _("Places"));
  
@@ -1745,7 +1740,7 @@
  
    gtk_tree_view_enable_model_drag_source (GTK_TREE_VIEW (impl->browse_shortcuts_tree_view),
  					  GDK_BUTTON1_MASK,
-@@ -3586,8 +3729,7 @@ shortcuts_list_create (GtkFileChooserDef
+@@ -3587,8 +3730,7 @@ shortcuts_list_create (GtkFileChooserDef
  
    gtk_tree_view_set_row_separator_func (GTK_TREE_VIEW (impl->browse_shortcuts_tree_view),
  					shortcuts_row_separator_func,
@@ -1755,7 +1750,7 @@
  
    gtk_tree_view_append_column (GTK_TREE_VIEW (impl->browse_shortcuts_tree_view), column);
  
-@@ -3958,6 +4100,8 @@ file_list_update_popup_menu (GtkFileChoo
+@@ -3959,6 +4101,8 @@ file_list_update_popup_menu (GtkFileChoo
  {
    file_list_build_popup_menu (impl);
  
@@ -1764,7 +1759,7 @@
    /* The sensitivity of the Add to Bookmarks item is set in
     * bookmarks_check_add_sensitivity()
     */
-@@ -4057,6 +4201,28 @@ list_button_press_event_cb (GtkWidget   
+@@ -4058,6 +4202,28 @@ list_button_press_event_cb (GtkWidget   
    return TRUE;
  }
  
@@ -1793,7 +1788,7 @@
  /* Creates the widgets for the file list */
  static GtkWidget *
  create_file_list (GtkFileChooserDefault *impl)
-@@ -4070,7 +4236,7 @@ create_file_list (GtkFileChooserDefault 
+@@ -4071,7 +4237,7 @@ create_file_list (GtkFileChooserDefault 
  
    swin = gtk_scrolled_window_new (NULL, NULL);
    gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (swin),
@@ -1802,7 +1797,7 @@
    gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (swin),
  				       GTK_SHADOW_IN);
  
-@@ -4160,6 +4326,7 @@ create_file_list (GtkFileChooserDefault 
+@@ -4161,6 +4327,7 @@ create_file_list (GtkFileChooserDefault 
    gtk_tree_view_column_set_sort_column_id (column, FILE_LIST_COL_SIZE);
    gtk_tree_view_append_column (GTK_TREE_VIEW (impl->browse_files_tree_view), column);
  #endif
@@ -1810,7 +1805,7 @@
    /* Modification time column */
  
    column = gtk_tree_view_column_new ();
-@@ -4170,8 +4337,11 @@ create_file_list (GtkFileChooserDefault 
+@@ -4171,8 +4338,11 @@ create_file_list (GtkFileChooserDefault 
    gtk_tree_view_column_pack_start (column, renderer, TRUE);
    gtk_tree_view_column_set_cell_data_func (column, renderer,
  					   list_mtime_data_func, impl, NULL);
@@ -1823,7 +1818,7 @@
    gtk_widget_show_all (swin);
  
    return swin;
-@@ -4279,9 +4449,59 @@ save_folder_combo_changed_cb (GtkComboBo
+@@ -4280,9 +4450,59 @@ save_folder_combo_changed_cb (GtkComboBo
      return;
  
    if (gtk_combo_box_get_active_iter (combo, &iter))
@@ -1884,7 +1879,7 @@
  /* Creates the combo box with the save folders */
  static GtkWidget *
  save_folder_combo_create (GtkFileChooserDefault *impl)
-@@ -4289,8 +4509,14 @@ save_folder_combo_create (GtkFileChooser
+@@ -4290,8 +4510,14 @@ save_folder_combo_create (GtkFileChooser
    GtkWidget *combo;
    GtkCellRenderer *cell;
  
@@ -1900,7 +1895,7 @@
  			"focus-on-click", FALSE,
                          NULL);
    gtk_widget_show (combo);
-@@ -4312,8 +4538,7 @@ save_folder_combo_create (GtkFileChooser
+@@ -4313,8 +4539,7 @@ save_folder_combo_create (GtkFileChooser
  
    gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (combo),
  					shortcuts_row_separator_func,
@@ -1910,7 +1905,7 @@
  
    g_signal_connect (combo, "changed",
  		    G_CALLBACK (save_folder_combo_changed_cb), impl);
-@@ -4658,6 +4883,7 @@ browse_widgets_create (GtkFileChooserDef
+@@ -4659,6 +4884,7 @@ browse_widgets_create (GtkFileChooserDef
    hbox = gtk_hbox_new (FALSE, 12);
    gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
    gtk_widget_show (hbox);
@@ -1918,7 +1913,7 @@
  
    location_button_create (impl);
    gtk_box_pack_start (GTK_BOX (hbox), impl->location_button, FALSE, FALSE, 0);
-@@ -5242,6 +5468,9 @@ gtk_file_chooser_default_dispose (GObjec
+@@ -5244,6 +5470,9 @@ gtk_file_chooser_default_dispose (GObjec
        impl->shortcuts_activate_iter_handle = NULL;
      }
  
@@ -1928,7 +1923,7 @@
    remove_settings_signal (impl, gtk_widget_get_screen (GTK_WIDGET (impl)));
  
    G_OBJECT_CLASS (_gtk_file_chooser_default_parent_class)->dispose (object);
-@@ -5519,31 +5748,32 @@ gtk_file_chooser_default_map (GtkWidget 
+@@ -5552,31 +5781,32 @@ gtk_file_chooser_default_map (GtkWidget 
  
    GTK_WIDGET_CLASS (_gtk_file_chooser_default_parent_class)->map (widget);
  
@@ -1985,7 +1980,7 @@
  
    bookmarks_changed_cb (impl->file_system, impl);
  
-@@ -6014,12 +6244,6 @@ pending_select_paths_process (GtkFileCho
+@@ -6047,12 +6277,6 @@ pending_select_paths_process (GtkFileCho
         * but rather on behalf of something else like GtkFileChooserButton.  In
         * that case, the chooser's selection should be what the caller expects,
         * as the user can't see that something else got selected.  See bug #165264.
@@ -1998,7 +1993,7 @@
         */
        if (GTK_WIDGET_MAPPED (impl) && impl->action == GTK_FILE_CHOOSER_ACTION_OPEN)
  	browse_files_select_first_row (impl);
-@@ -6066,17 +6290,11 @@ browse_files_model_finished_loading_cb (
+@@ -6099,17 +6323,11 @@ browse_files_model_finished_loading_cb (
    profile_end ("end", NULL);
  }
  
@@ -2019,7 +2014,7 @@
    if (impl->browse_files_model)
      {
        g_object_unref (impl->browse_files_model);
-@@ -6088,6 +6306,20 @@ set_list_model (GtkFileChooserDefault *i
+@@ -6121,6 +6339,20 @@ set_list_model (GtkFileChooserDefault *i
        g_object_unref (impl->sort_model);
        impl->sort_model = NULL;
      }
@@ -2040,7 +2035,7 @@
  
    set_busy_cursor (impl, TRUE);
    gtk_tree_view_set_model (GTK_TREE_VIEW (impl->browse_files_tree_view), NULL);
-@@ -6162,6 +6394,9 @@ update_chooser_entry (GtkFileChooserDefa
+@@ -6195,6 +6427,9 @@ update_chooser_entry (GtkFileChooserDefa
    struct update_chooser_entry_selected_foreach_closure closure;
    const char *file_part;
  
@@ -2050,7 +2045,7 @@
    if (!(impl->action == GTK_FILE_CHOOSER_ACTION_SAVE
  	|| impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER
  	|| ((impl->action == GTK_FILE_CHOOSER_ACTION_OPEN
-@@ -6183,35 +6418,40 @@ update_chooser_entry (GtkFileChooserDefa
+@@ -6216,35 +6451,40 @@ update_chooser_entry (GtkFileChooserDefa
      }
    else if (closure.num_selected == 1)
      {
@@ -2119,7 +2114,7 @@
      }
    else
      {
-@@ -6425,6 +6665,8 @@ gtk_file_chooser_default_update_current_
+@@ -6458,6 +6698,8 @@ gtk_file_chooser_default_update_current_
  
    profile_start ("start", (char *) path);
  
@@ -2128,7 +2123,7 @@
    g_assert (path != NULL);
  
    if (impl->local_only &&
-@@ -6467,6 +6709,9 @@ gtk_file_chooser_default_get_current_fol
+@@ -6500,6 +6742,9 @@ gtk_file_chooser_default_get_current_fol
  {
    GtkFileChooserDefault *impl = GTK_FILE_CHOOSER_DEFAULT (chooser);
  
@@ -2138,7 +2133,7 @@
    if (impl->reload_state == RELOAD_EMPTY)
      {
        char *current_working_dir;
-@@ -6527,9 +6772,9 @@ gtk_file_chooser_default_select_path (Gt
+@@ -6560,9 +6805,9 @@ gtk_file_chooser_default_select_path (Gt
      return FALSE;
  
    if (!parent_path)
@@ -2150,7 +2145,7 @@
      same_path = FALSE;
    else
      {
-@@ -6625,6 +6870,16 @@ static void
+@@ -6658,6 +6903,16 @@ static void
  gtk_file_chooser_default_select_all (GtkFileChooser *chooser)
  {
    GtkFileChooserDefault *impl = GTK_FILE_CHOOSER_DEFAULT (chooser);
@@ -2167,7 +2162,7 @@
    if (impl->select_multiple)
      gtk_tree_model_foreach (GTK_TREE_MODEL (impl->sort_model), 
  			    maybe_select, impl);
-@@ -6764,6 +7019,10 @@ gtk_file_chooser_default_get_paths (GtkF
+@@ -6797,6 +7052,10 @@ gtk_file_chooser_default_get_paths (GtkF
    struct get_paths_closure info;
    GtkWindow *toplevel;
    GtkWidget *current_focus;
@@ -2178,7 +2173,7 @@
  
    info.impl = impl;
    info.result = NULL;
-@@ -6775,12 +7034,14 @@ gtk_file_chooser_default_get_paths (GtkF
+@@ -6808,12 +7067,14 @@ gtk_file_chooser_default_get_paths (GtkF
    else
      current_focus = NULL;
  
@@ -2193,7 +2188,7 @@
        selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (impl->browse_files_tree_view));
        gtk_tree_selection_selected_foreach (selection, get_paths_foreach, &info);
  
-@@ -6815,8 +7076,12 @@ gtk_file_chooser_default_get_paths (GtkF
+@@ -6848,8 +7109,12 @@ gtk_file_chooser_default_get_paths (GtkF
  	  return NULL;
  	}
  
@@ -2208,7 +2203,7 @@
      }
    else if (impl->toplevel_last_focus_widget == impl->browse_files_tree_view)
      goto file_list;
-@@ -6985,7 +7250,7 @@ add_shortcut_get_info_cb (GtkFileSystemH
+@@ -7018,7 +7283,7 @@ add_shortcut_get_info_cb (GtkFileSystemH
  
    pos = shortcuts_get_pos_for_shortcut_folder (data->impl, data->impl->num_shortcuts);
  
@@ -2217,7 +2212,7 @@
  
  out:
    g_object_unref (data->impl);
-@@ -7099,15 +7364,15 @@ gtk_file_chooser_default_remove_shortcut
+@@ -7132,15 +7397,15 @@ gtk_file_chooser_default_remove_shortcut
    for (i = 0; i < impl->num_shortcuts; i++)
      {
        gpointer col_data;
@@ -2236,7 +2231,7 @@
  
        shortcut = col_data;
        if (gtk_file_path_compare (shortcut, path) == 0)
-@@ -7156,15 +7421,15 @@ gtk_file_chooser_default_list_shortcut_f
+@@ -7189,15 +7454,15 @@ gtk_file_chooser_default_list_shortcut_f
    for (i = 0; i < impl->num_shortcuts; i++)
      {
        gpointer col_data;
@@ -2255,7 +2250,7 @@
  
        shortcut = col_data;
        list = g_slist_prepend (list, gtk_file_path_copy (shortcut));
-@@ -7511,6 +7776,23 @@ should_respond_after_confirm_overwrite (
+@@ -7532,6 +7797,23 @@ should_respond_after_confirm_overwrite (
      }
  }
  
@@ -2279,7 +2274,7 @@
  static void
  action_create_folder_cb (GtkFileSystemHandle *handle,
  			 const GtkFilePath   *path,
-@@ -7776,6 +8058,9 @@ gtk_file_chooser_default_should_respond 
+@@ -7797,6 +8079,9 @@ gtk_file_chooser_default_should_respond 
  
        g_assert (impl->action >= GTK_FILE_CHOOSER_ACTION_OPEN && impl->action <= GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER);
  
@@ -2289,7 +2284,7 @@
        selection_check (impl, &num_selected, &all_files, &all_folders);
  
        if (num_selected > 2)
-@@ -7911,7 +8196,7 @@ gtk_file_chooser_default_should_respond 
+@@ -7932,7 +8217,7 @@ gtk_file_chooser_default_should_respond 
  	{
  	  shortcuts_activate_iter (impl, &iter);
  	  
@@ -2298,7 +2293,7 @@
  	}
        else
  	goto file_list;
-@@ -7925,6 +8210,11 @@ gtk_file_chooser_default_should_respond 
+@@ -7946,6 +8231,11 @@ gtk_file_chooser_default_should_respond 
         */
        goto file_list;
      }
@@ -2310,7 +2305,7 @@
    else if (impl->location_entry && impl->toplevel_last_focus_widget == impl->location_entry)
      {
        /* The focus is on a dialog's action area button, *and* the widget that
-@@ -7974,22 +8264,460 @@ gtk_file_chooser_default_initial_focus (
+@@ -7995,21 +8285,459 @@ gtk_file_chooser_default_initial_focus (
    gtk_widget_grab_focus (widget);
  }
  
@@ -2338,7 +2333,6 @@
 +  list = data;
  
 -      if (impl->current_filter)
--	g_object_unref (impl->current_filter);
 +  gtk_tree_model_get (model, iter, SEARCH_MODEL_COL_PATH, &file_path, -1);
 +  file_path_copy = gtk_file_path_copy (file_path);
 +  *list = g_slist_prepend (*list, file_path_copy);
@@ -2779,11 +2773,10 @@
 +	return;
 +
 +      if (impl->current_filter)
-+	g_object_unref (impl->current_filter);
+ 	g_object_unref (impl->current_filter);
        impl->current_filter = filter;
        if (impl->current_filter)
- 	{
-@@ -8022,28 +8750,44 @@ check_preview_change (GtkFileChooserDefa
+@@ -8043,28 +8771,44 @@ check_preview_change (GtkFileChooserDefa
  {
    GtkTreePath *cursor_path;
    const GtkFilePath *new_path;
@@ -2845,7 +2838,7 @@
      }
  
    if (new_path != impl->preview_path &&
-@@ -8059,7 +8803,7 @@ check_preview_change (GtkFileChooserDefa
+@@ -8080,7 +8824,7 @@ check_preview_change (GtkFileChooserDefa
        if (new_path)
  	{
  	  impl->preview_path = gtk_file_path_copy (new_path);
@@ -2854,7 +2847,7 @@
  	}
        else
  	{
-@@ -8128,6 +8872,8 @@ shortcuts_activate_volume (GtkFileChoose
+@@ -8149,6 +8893,8 @@ shortcuts_activate_volume (GtkFileChoose
  {
    GtkFilePath *path;
  
@@ -2863,7 +2856,7 @@
    /* We ref the file chooser since volume_mount() may run a main loop, and the
     * user could close the file chooser window in the meantime.
     */
-@@ -8148,6 +8894,7 @@ shortcuts_activate_volume (GtkFileChoose
+@@ -8169,6 +8915,7 @@ shortcuts_activate_volume (GtkFileChoose
        if (path != NULL)
          {
            change_folder_and_display_error (impl, path, FALSE);
@@ -2871,7 +2864,7 @@
            gtk_file_path_free (path);
          }
      }
-@@ -8180,7 +8927,10 @@ shortcuts_activate_get_info_cb (GtkFileS
+@@ -8201,7 +8948,10 @@ shortcuts_activate_get_info_cb (GtkFileS
      goto out;
  
    if (!error && gtk_file_info_get_is_folder (info))
@@ -2883,7 +2876,7 @@
    else
      gtk_file_chooser_default_select_path (GTK_FILE_CHOOSER (data->impl), data->path, NULL);
  
-@@ -8197,26 +8947,25 @@ shortcuts_activate_iter (GtkFileChooserD
+@@ -8218,26 +8968,25 @@ shortcuts_activate_iter (GtkFileChooserD
  			 GtkTreeIter           *iter)
  {
    gpointer col_data;
@@ -2915,7 +2908,7 @@
      {
        GtkFileSystemVolume *volume;
  
-@@ -8224,7 +8973,7 @@ shortcuts_activate_iter (GtkFileChooserD
+@@ -8245,7 +8994,7 @@ shortcuts_activate_iter (GtkFileChooserD
  
        shortcuts_activate_volume (impl, volume);
      }
@@ -2924,7 +2917,7 @@
      {
        struct ShortcutsActivateData *data;
  
-@@ -8237,6 +8986,10 @@ shortcuts_activate_iter (GtkFileChooserD
+@@ -8258,6 +9007,10 @@ shortcuts_activate_iter (GtkFileChooserD
  				  GTK_FILE_INFO_IS_FOLDER,
  				  shortcuts_activate_get_info_cb, data);
      }
@@ -2935,7 +2928,7 @@
  }
  
  /* Callback used when a row in the shortcuts list is activated */
-@@ -8249,15 +9002,13 @@ shortcuts_row_activated_cb (GtkTreeView 
+@@ -8270,15 +9023,13 @@ shortcuts_row_activated_cb (GtkTreeView 
    GtkTreeIter iter;
    GtkTreeIter child_iter;
  
@@ -2953,7 +2946,7 @@
  }
  
  /* Handler for GtkWidget::key-press-event on the shortcuts list */
-@@ -8297,8 +9048,15 @@ shortcuts_select_func  (GtkTreeSelection
+@@ -8318,8 +9069,15 @@ shortcuts_select_func  (GtkTreeSelection
  			gpointer           data)
  {
    GtkFileChooserDefault *impl = data;
@@ -2970,7 +2963,7 @@
  }
  
  static gboolean
-@@ -8310,6 +9068,9 @@ list_select_func  (GtkTreeSelection  *se
+@@ -8331,6 +9089,9 @@ list_select_func  (GtkTreeSelection  *se
  {
    GtkFileChooserDefault *impl = data;
  
@@ -2980,7 +2973,7 @@
    if (impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER ||
        impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER)
      {
-@@ -8335,7 +9096,7 @@ list_selection_changed (GtkTreeSelection
+@@ -8356,7 +9117,7 @@ list_selection_changed (GtkTreeSelection
  			GtkFileChooserDefault *impl)
  {
    /* See if we are in the new folder editable row for Save mode */
@@ -2989,7 +2982,7 @@
      {
        const GtkFileInfo *info;
        gboolean had_selection;
-@@ -8368,6 +9129,12 @@ list_row_activated (GtkTreeView         
+@@ -8389,6 +9150,12 @@ list_row_activated (GtkTreeView         
    GtkTreeIter iter, child_iter;
    const GtkFileInfo *info;
  
@@ -3002,7 +2995,7 @@
    if (!gtk_tree_model_get_iter (GTK_TREE_MODEL (impl->sort_model), &iter, path))
      return;
  
-@@ -8438,6 +9205,15 @@ list_icon_data_func (GtkTreeViewColumn *
+@@ -8459,6 +9226,15 @@ list_icon_data_func (GtkTreeViewColumn *
    const GtkFileInfo *info; 
    gboolean sensitive = TRUE;
  
@@ -3018,7 +3011,7 @@
    profile_start ("start", NULL);
    
    info = get_list_file_info (impl, iter);
-@@ -8487,13 +9263,33 @@ list_name_data_func (GtkTreeViewColumn *
+@@ -8508,13 +9284,33 @@ list_name_data_func (GtkTreeViewColumn *
  		     gpointer           data)
  {
    GtkFileChooserDefault *impl = data;
@@ -3054,7 +3047,7 @@
  		    NULL);
  
        return;
-@@ -8509,6 +9305,7 @@ list_name_data_func (GtkTreeViewColumn *
+@@ -8530,6 +9326,7 @@ list_name_data_func (GtkTreeViewColumn *
    g_object_set (cell,
  		"text", gtk_file_info_get_display_name (info),
  		"sensitive", sensitive,
@@ -3062,7 +3055,7 @@
  		NULL);
  }
  
-@@ -8570,7 +9367,6 @@ list_mtime_data_func (GtkTreeViewColumn 
+@@ -8591,7 +9388,6 @@ list_mtime_data_func (GtkTreeViewColumn 
  		      gpointer           data)
  {
    GtkFileChooserDefault *impl;
@@ -3070,7 +3063,7 @@
    GtkFileTime time_mtime;
    GDate mtime, now;
    int days_diff;
-@@ -8579,17 +9375,35 @@ list_mtime_data_func (GtkTreeViewColumn 
+@@ -8600,17 +9396,35 @@ list_mtime_data_func (GtkTreeViewColumn 
  
    impl = data;
  
@@ -3114,7 +3107,7 @@
  
    if (time_mtime == 0)
      strcpy (buf, _("Unknown"));
-@@ -8620,10 +9434,6 @@ list_mtime_data_func (GtkTreeViewColumn 
+@@ -8641,10 +9455,6 @@ list_mtime_data_func (GtkTreeViewColumn 
  	}
      }
  
@@ -3125,7 +3118,7 @@
    g_object_set (cell,
  		"text", buf,
  		"sensitive", sensitive,
-@@ -8649,7 +9459,23 @@ location_set_user_text (GtkFileChooserDe
+@@ -8670,7 +9480,23 @@ location_set_user_text (GtkFileChooserDe
  static void
  location_popup_handler (GtkFileChooserDefault *impl,
  			const gchar           *path)
@@ -3150,7 +3143,7 @@
    if (impl->action == GTK_FILE_CHOOSER_ACTION_OPEN
        || impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER)
      {
-@@ -8718,6 +9544,7 @@ switch_to_shortcut (GtkFileChooserDefaul
+@@ -8739,6 +9565,7 @@ switch_to_shortcut (GtkFileChooserDefaul
      g_assert_not_reached ();
  
    shortcuts_activate_iter (impl, &iter);
@@ -3158,7 +3151,7 @@
  }
  
  /* Handler for the "home-folder" keybinding signal */
-@@ -8769,26 +9596,26 @@ show_hidden_handler (GtkFileChooserDefau
+@@ -8790,26 +9617,26 @@ show_hidden_handler (GtkFileChooserDefau
  /* Drag and drop interfaces */
  
  static void
@@ -3191,7 +3184,7 @@
  
    pos = *gtk_tree_path_get_indices (path);
    bookmarks_pos = shortcuts_get_index (model->impl, SHORTCUTS_BOOKMARKS);
-@@ -8798,13 +9625,13 @@ shortcuts_model_filter_row_draggable (Gt
+@@ -8819,13 +9646,13 @@ shortcuts_model_filter_row_draggable (Gt
  
  /* GtkTreeDragSource::drag_data_get implementation for the shortcuts filter model */
  static gboolean
@@ -3210,7 +3203,7 @@
  
    /* FIXME */
  
-@@ -8813,30 +9640,30 @@ shortcuts_model_filter_drag_data_get (Gt
+@@ -8834,30 +9661,30 @@ shortcuts_model_filter_drag_data_get (Gt
  
  /* Fill the GtkTreeDragSourceIface vtable */
  static void
@@ -3252,8 +3245,8 @@
  			"child-model", child_model,
  			"virtual-root", root,
  			NULL);
---- gtk+-2.10.12/gtk/gtkfilechooserprivate.h.search	2007-05-02 12:26:59.000000000 -0400
-+++ gtk+-2.10.12/gtk/gtkfilechooserprivate.h	2007-05-19 19:51:53.000000000 -0400
+--- gtk+-2.10.13/gtk/gtkfilechooserprivate.h.search	2007-06-12 23:09:41.000000000 -0400
++++ gtk+-2.10.13/gtk/gtkfilechooserprivate.h	2007-06-13 01:04:04.000000000 -0400
 @@ -25,6 +25,8 @@
  #include "gtkfilesystem.h"
  #include "gtkfilesystemmodel.h"
@@ -3263,7 +3256,7 @@
  #include "gtktooltips.h"
  #include "gtktreemodelsort.h"
  #include "gtktreestore.h"
-@@ -147,6 +149,11 @@ typedef enum {
+@@ -143,6 +145,11 @@ typedef enum {
    LOCATION_MODE_FILENAME_ENTRY
  } LocationMode;
  
@@ -3275,7 +3268,7 @@
  struct _GtkFileChooserDefault
  {
    GtkVBox parent_instance;
-@@ -175,11 +182,19 @@ struct _GtkFileChooserDefault
+@@ -171,11 +178,19 @@ struct _GtkFileChooserDefault
    GtkWidget *browse_files_popup_menu_add_shortcut_item;
    GtkWidget *browse_files_popup_menu_hidden_files_item;
    GtkWidget *browse_new_folder_button;
@@ -3295,7 +3288,7 @@
    GtkWidget *filter_combo_hbox;
    GtkWidget *filter_combo;
    GtkWidget *preview_box;
-@@ -195,7 +210,16 @@ struct _GtkFileChooserDefault
+@@ -191,7 +206,16 @@ struct _GtkFileChooserDefault
    LocationMode location_mode;
  
    GtkListStore *shortcuts_model;
@@ -3313,7 +3306,7 @@
  
    GtkTreeModelSort *sort_model;
  
-@@ -215,6 +239,8 @@ struct _GtkFileChooserDefault
+@@ -211,6 +235,8 @@ struct _GtkFileChooserDefault
    ReloadState reload_state;
    guint load_timeout_id;
  
@@ -3322,7 +3315,7 @@
    GSList *pending_select_paths;
  
    GtkFileFilter *current_filter;
-@@ -222,9 +248,6 @@ struct _GtkFileChooserDefault
+@@ -218,9 +244,6 @@ struct _GtkFileChooserDefault
  
    GtkTooltips *tooltips;
  
@@ -3332,7 +3325,7 @@
    int num_volumes;
    int num_shortcuts;
    int num_bookmarks;
-@@ -239,6 +262,7 @@ struct _GtkFileChooserDefault
+@@ -235,6 +258,7 @@ struct _GtkFileChooserDefault
  
    GtkTreeViewColumn *list_name_column;
    GtkCellRenderer *list_name_renderer;
@@ -3340,7 +3333,7 @@
  
    GSource *edited_idle;
    char *edited_new_text;
-@@ -265,6 +289,9 @@ struct _GtkFileChooserDefault
+@@ -264,6 +288,9 @@ struct _GtkFileChooserDefault
    guint list_sort_ascending : 1;
    guint changing_folder : 1;
    guint shortcuts_current_folder_active : 1;
@@ -3350,8 +3343,8 @@
    guint expand_folders : 1;
  
  #if 0
---- /dev/null	2007-05-19 19:05:57.724948798 -0400
-+++ gtk+-2.10.12/gtk/gtksearchenginesimple.h	2007-05-19 19:51:53.000000000 -0400
+--- /dev/null	2007-06-12 15:51:13.163611224 -0400
++++ gtk+-2.10.13/gtk/gtksearchenginesimple.h	2007-06-13 01:04:04.000000000 -0400
 @@ -0,0 +1,59 @@
 +/*
 + * Copyright (C) 2005 Red Hat, Inc
@@ -3412,8 +3405,8 @@
 +G_END_DECLS
 +
 +#endif /* __GTK_SEARCH_ENGINE_SIMPLE_H__ */
---- /dev/null	2007-05-19 19:05:57.724948798 -0400
-+++ gtk+-2.10.12/gtk/gtksearchenginesimple.c	2007-05-19 19:51:53.000000000 -0400
+--- /dev/null	2007-06-12 15:51:13.163611224 -0400
++++ gtk+-2.10.13/gtk/gtksearchenginesimple.c	2007-06-13 01:04:04.000000000 -0400
 @@ -0,0 +1,374 @@
 +/*
 + * Copyright (C) 2005 Red Hat, Inc
@@ -3789,8 +3782,8 @@
 +  
 +  return engine;
 +}
---- /dev/null	2007-05-19 19:05:57.724948798 -0400
-+++ gtk+-2.10.12/gtk/gtksearchenginebeagle.c	2007-05-19 19:51:53.000000000 -0400
+--- /dev/null	2007-06-12 15:51:13.163611224 -0400
++++ gtk+-2.10.13/gtk/gtksearchenginebeagle.c	2007-06-13 01:04:04.000000000 -0400
 @@ -0,0 +1,420 @@
 +/*
 + * Copyright (C) 2005 Novell, Inc.
@@ -4212,8 +4205,8 @@
 +  
 +  return GTK_SEARCH_ENGINE (engine);
 +}
---- /dev/null	2007-05-19 19:05:57.724948798 -0400
-+++ gtk+-2.10.12/gtk/gtkquery.c	2007-05-19 19:51:53.000000000 -0400
+--- /dev/null	2007-06-12 15:51:13.163611224 -0400
++++ gtk+-2.10.13/gtk/gtkquery.c	2007-06-13 01:04:04.000000000 -0400
 @@ -0,0 +1,142 @@
 +/*
 + * Copyright (C) 2005 Novell, Inc.
@@ -4357,8 +4350,8 @@
 +					    g_strdup (mime_type));
 +}
 +
---- /dev/null	2007-05-19 19:05:57.724948798 -0400
-+++ gtk+-2.10.12/gtk/gtkquery.h	2007-05-19 19:51:53.000000000 -0400
+--- /dev/null	2007-06-12 15:51:13.163611224 -0400
++++ gtk+-2.10.13/gtk/gtkquery.h	2007-06-13 01:04:04.000000000 -0400
 @@ -0,0 +1,74 @@
 +/*
 + * Copyright (C) 2005 Novell, Inc.


Index: gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk2/F-7/gtk2.spec,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -r1.226 -r1.227
--- gtk2.spec	24 May 2007 19:32:13 -0000	1.226
+++ gtk2.spec	13 Jun 2007 05:48:32 -0000	1.227
@@ -10,13 +10,13 @@
 %define cairo_version %{cairo_base_version}-1
 %define libpng_version 2:1.2.2-16
 
-%define base_version 2.10.12
+%define base_version 2.10.13
 %define bin_version 2.10.0
 
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 2%{?dist}
+Release: 1%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.10/gtk+-%{version}.tar.bz2
@@ -288,23 +288,26 @@
 %doc tmpdocs/examples
 
 %changelog
-* Thu May 24 2007 Matthias Clasen <mclasen at redhat.com> - 1.10.12-2
+* Wed Jun 13 2007 Matthias Clasen <mclasen at redhat.com> - 2.10.13-1
+- Update to 2.10.13
+
+* Thu May 24 2007 Matthias Clasen <mclasen at redhat.com> - 2.10.12-2
 - Rebuild to fix buildsystem configuration issues
 
-* Sat May 19 2007 Matthias Clasen <mclasen at redhat.com> - 1.10.12-1
+* Sat May 19 2007 Matthias Clasen <mclasen at redhat.com> - 2.10.12-1
 - Update to 2.10.12
 - Drop upstreamed patches
 
-* Tue May 15 2007 Matthias Clasen <mclasen at redhat.com> - 1.10.11-6
+* Tue May 15 2007 Matthias Clasen <mclasen at redhat.com> - 2.10.11-6
 - Backport some fixes for the ftw()-based search engine
 
-* Tue Apr 10 2007 Matthias Clasen <mclasen at redhat.com> - 1.10.11-5
+* Tue Apr 10 2007 Matthias Clasen <mclasen at redhat.com> - 2.10.11-5
 - Use DESKTOP xdg-user-dir in the file chooser
 
-* Mon Apr  9 2007 Matthias Clasen <mclasen at redhat.com> - 1.10.11-4
+* Mon Apr  9 2007 Matthias Clasen <mclasen at redhat.com> - 2.10.11-4
 - Fix a memory leak in the search patch
 
-* Wed Mar 28 2007 Matthias Clasen <mclasen at redhat.com> - 1.10.11-3
+* Wed Mar 28 2007 Matthias Clasen <mclasen at redhat.com> - 2.10.11-3
 - Support raw printers
 
 * Tue Mar 20 2007 Florian La Roche <laroche at redhat.com> - 2.10.11-2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtk2/F-7/sources,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- sources	24 May 2007 19:32:13 -0000	1.76
+++ sources	13 Jun 2007 05:48:32 -0000	1.77
@@ -1 +1 @@
-cf969c62134c662ff07e64613ed6c11f  gtk+-2.10.12.tar.bz2
+d0af87715f3b0f05bf38a3312a528012  gtk+-2.10.13.tar.bz2

More information about the fedora-extras-commits mailing list