rpms/gtk2/devel gtk+-2.10.8-search.patch, 1.3, 1.4 gtk2.spec, 1.222, 1.223
Matthias Clasen (mclasen)
fedora-extras-commits at redhat.com
Tue May 15 05:11:37 UTC 2007
Author: mclasen
Update of /cvs/extras/rpms/gtk2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7635
Modified Files:
gtk+-2.10.8-search.patch gtk2.spec
Log Message:
Backport some fixes for the ftw()-based search engine
gtk+-2.10.8-search.patch:
Index: gtk+-2.10.8-search.patch
===================================================================
RCS file: /cvs/extras/rpms/gtk2/devel/gtk+-2.10.8-search.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gtk+-2.10.8-search.patch 9 Apr 2007 21:10:38 -0000 1.3
+++ gtk+-2.10.8-search.patch 15 May 2007 05:11:03 -0000 1.4
@@ -1,5 +1,5 @@
---- /dev/null 2007-04-09 09:59:25.840251204 +0200
-+++ gtk+-2.10.11/gtk/gtksearchenginetracker.h 2007-04-09 22:42:19.000000000 +0200
+--- /dev/null 2007-05-14 19:53:51.012713345 -0400
++++ gtk+-2.10.11/gtk/gtksearchenginetracker.h 2007-05-15 01:04:07.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-04-09 09:59:25.840251204 +0200
-+++ gtk+-2.10.11/gtk/gtksearchengine.h 2007-04-09 22:42:19.000000000 +0200
+--- /dev/null 2007-05-14 19:53:51.012713345 -0400
++++ gtk+-2.10.11/gtk/gtksearchengine.h 2007-05-15 01:04:07.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-04-09 09:59:25.840251204 +0200
-+++ gtk+-2.10.11/gtk/gtksearchenginebeagle.h 2007-04-09 22:42:19.000000000 +0200
+--- /dev/null 2007-05-14 19:53:51.012713345 -0400
++++ gtk+-2.10.11/gtk/gtksearchenginebeagle.h 2007-05-15 01:04:07.000000000 -0400
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2005 Novell, Inc.
@@ -216,9 +216,9 @@
+G_END_DECLS
+
+#endif /* __GTK_SEARCH_ENGINE_BEAGLE_H__ */
---- /dev/null 2007-04-09 09:59:25.840251204 +0200
-+++ gtk+-2.10.11/gtk/gtksearchengine.c 2007-04-09 22:42:19.000000000 +0200
-@@ -0,0 +1,197 @@
+--- /dev/null 2007-05-14 19:53:51.012713345 -0400
++++ gtk+-2.10.11/gtk/gtksearchengine.c 2007-05-15 01:05:14.000000000 -0400
+@@ -0,0 +1,199 @@
+/*
+ * Copyright (C) 2005 Novell, Inc.
+ *
@@ -339,7 +339,9 @@
+ return engine;
+#endif
+
-+ engine = _gtk_search_engine_simple_new ();
++ if (g_thread_supported ())
++ engine = _gtk_search_engine_simple_new ();
++
+ return engine;
+}
+
@@ -416,8 +418,8 @@
+
+ g_signal_emit (engine, signals[ERROR], 0, error_message);
+}
---- /dev/null 2007-04-09 09:59:25.840251204 +0200
-+++ gtk+-2.10.11/gtk/gtksearchenginetracker.c 2007-04-09 22:42:19.000000000 +0200
+--- /dev/null 2007-05-14 19:53:51.012713345 -0400
++++ gtk+-2.10.11/gtk/gtksearchenginetracker.c 2007-05-15 01:04:07.000000000 -0400
@@ -0,0 +1,362 @@
+/*
+ * Copyright (C) 2005 Mr Jamie McCracken
@@ -781,9 +783,9 @@
+
+ return GTK_SEARCH_ENGINE (engine);
+}
---- gtk+-2.10.11/gtk/Makefile.am.search 2007-03-14 05:07:06.000000000 +0100
-+++ gtk+-2.10.11/gtk/Makefile.am 2007-04-09 22:42:19.000000000 +0200
-@@ -332,6 +332,11 @@
+--- gtk+-2.10.11/gtk/Makefile.am.search 2007-03-14 00:07:06.000000000 -0400
++++ gtk+-2.10.11/gtk/Makefile.am 2007-05-15 01:04:07.000000000 -0400
+@@ -332,6 +332,11 @@ gtk_semi_private_h_sources = \
# GTK+ header files that don't get installed
gtk_private_h_sources = \
@@ -795,7 +797,7 @@
gtkdndcursors.h \
gtkentryprivate.h \
gtkfilechooserdefault.h \
-@@ -374,6 +379,11 @@
+@@ -374,6 +379,11 @@ gtk_private_h_sources = \
# GTK+ C sources to build the library from
gtk_base_c_sources = \
@@ -807,8 +809,8 @@
fnmatch.c \
gtkaboutdialog.c \
gtkaccelgroup.c \
---- gtk+-2.10.11/gtk/gtkfilechooserdefault.c.search 2007-03-14 05:07:03.000000000 +0100
-+++ gtk+-2.10.11/gtk/gtkfilechooserdefault.c 2007-04-09 22:46:41.000000000 +0200
+--- gtk+-2.10.11/gtk/gtkfilechooserdefault.c.search 2007-03-14 00:07:03.000000000 -0400
++++ gtk+-2.10.11/gtk/gtkfilechooserdefault.c 2007-05-15 01:04:07.000000000 -0400
@@ -79,6 +79,8 @@
#include <errno.h>
#include <string.h>
@@ -818,7 +820,7 @@
-@@ -172,13 +174,20 @@
+@@ -172,13 +174,20 @@ enum {
SHORTCUTS_COL_PIXBUF,
SHORTCUTS_COL_NAME,
SHORTCUTS_COL_DATA,
@@ -840,7 +842,7 @@
/* Column numbers for the file list */
enum {
FILE_LIST_COL_NAME,
-@@ -187,6 +196,16 @@
+@@ -187,6 +196,16 @@ enum {
FILE_LIST_COL_NUM_COLUMNS
};
@@ -857,7 +859,7 @@
/* Identifiers for target types */
enum {
GTK_TREE_MODEL_ROW,
-@@ -226,9 +245,19 @@
+@@ -226,9 +245,19 @@ static const GtkTargetEntry file_list_de
static const int num_file_list_dest_targets = (sizeof (file_list_dest_targets)
/ sizeof (file_list_dest_targets[0]));
@@ -877,7 +879,7 @@
SHORTCUTS_HOME,
SHORTCUTS_DESKTOP,
SHORTCUTS_VOLUMES,
-@@ -420,6 +449,14 @@
+@@ -420,6 +449,14 @@ static void location_button_toggled_cb (
GtkFileChooserDefault *impl);
static void location_switch_to_path_bar (GtkFileChooserDefault *impl);
@@ -892,7 +894,7 @@
-@@ -429,26 +466,26 @@
+@@ -429,26 +466,26 @@ typedef struct {
GtkTreeModelFilter parent;
GtkFileChooserDefault *impl;
@@ -930,7 +932,7 @@
-@@ -664,6 +701,7 @@
+@@ -664,6 +701,7 @@ _gtk_file_chooser_default_init (GtkFileC
impl->reload_state = RELOAD_EMPTY;
impl->pending_select_paths = NULL;
impl->location_mode = LOCATION_MODE_PATH_BAR;
@@ -938,7 +940,7 @@
gtk_box_set_spacing (GTK_BOX (impl), 12);
-@@ -679,22 +717,24 @@
+@@ -679,22 +717,24 @@ shortcuts_free_row_data (GtkFileChooserD
GtkTreeIter *iter)
{
gpointer col_data;
@@ -967,7 +969,7 @@
{
GtkFileSystemVolume *volume;
-@@ -705,6 +745,8 @@
+@@ -705,6 +745,8 @@ shortcuts_free_row_data (GtkFileChooserD
{
GtkFilePath *path;
@@ -976,7 +978,7 @@
path = col_data;
gtk_file_path_free (path);
}
-@@ -791,8 +833,11 @@
+@@ -791,8 +833,11 @@ gtk_file_chooser_default_finalize (GObje
GtkFileChooserDefault *impl = GTK_FILE_CHOOSER_DEFAULT (object);
GSList *l;
@@ -990,7 +992,7 @@
shortcuts_free (impl);
-@@ -829,6 +874,9 @@
+@@ -829,6 +874,9 @@ gtk_file_chooser_default_finalize (GObje
if (impl->sort_model)
g_object_unref (impl->sort_model);
@@ -1000,7 +1002,7 @@
g_free (impl->preview_display_name);
-@@ -1081,6 +1129,14 @@
+@@ -1081,6 +1129,14 @@ set_preview_widget (GtkFileChooserDefaul
update_preview_widget_visibility (impl);
}
@@ -1015,7 +1017,7 @@
/* Re-reads all the icons for the shortcuts, used when the theme changes */
struct ReloadIconsData
{
-@@ -1151,19 +1207,20 @@
+@@ -1151,19 +1207,20 @@ shortcuts_reload_icons (GtkFileChooserDe
do
{
gpointer data;
@@ -1040,7 +1042,7 @@
{
GtkFileSystemVolume *volume;
-@@ -1178,46 +1235,53 @@
+@@ -1178,46 +1235,53 @@ shortcuts_reload_icons (GtkFileChooserDe
if (pixbuf)
g_object_unref (pixbuf);
}
@@ -1133,7 +1135,7 @@
}
}
}
-@@ -1349,7 +1413,6 @@
+@@ -1349,7 +1413,6 @@ get_file_info_finished (GtkFileSystemHan
{
gint pos = -1;
gboolean cancelled = handle->cancelled;
@@ -1141,7 +1143,7 @@
GdkPixbuf *pixbuf;
GtkTreePath *path;
GtkTreeIter iter;
-@@ -1414,12 +1477,15 @@
+@@ -1414,12 +1477,15 @@ get_file_info_finished (GtkFileSystemHan
SHORTCUTS_COL_PIXBUF, pixbuf,
SHORTCUTS_COL_PIXBUF_VISIBLE, TRUE,
SHORTCUTS_COL_NAME, request->label_copy,
@@ -1160,7 +1162,7 @@
if (request->type == SHORTCUTS_CURRENT_FOLDER
&& request->impl->save_folder_combo != NULL)
-@@ -1431,7 +1497,7 @@
+@@ -1431,7 +1497,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);
@@ -1169,7 +1171,7 @@
g_signal_handlers_unblock_by_func (request->impl->save_folder_combo,
G_CALLBACK (save_folder_combo_changed_cb),
request->impl);
-@@ -1505,7 +1571,7 @@
+@@ -1505,7 +1571,7 @@ _gtk_file_chooser_label_for_uri (const g
static void
shortcuts_insert_path (GtkFileChooserDefault *impl,
int pos,
@@ -1178,7 +1180,7 @@
GtkFileSystemVolume *volume,
const GtkFilePath *path,
const char *label,
-@@ -1518,79 +1584,89 @@
+@@ -1518,79 +1584,89 @@ shortcuts_insert_path (GtkFileChooserDef
GtkTreeIter iter;
GtkIconTheme *icon_theme;
@@ -1325,7 +1327,7 @@
}
if (pos == -1)
-@@ -1605,13 +1681,16 @@
+@@ -1605,13 +1681,16 @@ shortcuts_insert_path (GtkFileChooserDef
SHORTCUTS_COL_PIXBUF_VISIBLE, TRUE,
SHORTCUTS_COL_NAME, label_copy,
SHORTCUTS_COL_DATA, data,
@@ -1345,7 +1347,7 @@
if (type == SHORTCUTS_CURRENT_FOLDER && impl->save_folder_combo != NULL)
{
-@@ -1623,7 +1702,8 @@
+@@ -1623,7 +1702,8 @@ shortcuts_insert_path (GtkFileChooserDef
g_signal_handlers_block_by_func (impl->save_folder_combo,
G_CALLBACK (save_folder_combo_changed_cb),
impl);
@@ -1355,7 +1357,7 @@
g_signal_handlers_unblock_by_func (impl->save_folder_combo,
G_CALLBACK (save_folder_combo_changed_cb),
impl);
-@@ -1637,6 +1717,30 @@
+@@ -1637,6 +1717,30 @@ shortcuts_insert_path (GtkFileChooserDef
profile_end ("end", NULL);
}
@@ -1386,7 +1388,7 @@
/* Appends an item for the user's home directory to the shortcuts model */
static void
shortcuts_append_home (GtkFileChooserDefault *impl)
-@@ -1655,7 +1759,8 @@
+@@ -1655,7 +1759,8 @@ shortcuts_append_home (GtkFileChooserDef
home_path = gtk_file_system_filename_to_path (impl->file_system, home);
@@ -1396,7 +1398,7 @@
gtk_file_path_free (home_path);
-@@ -1688,7 +1793,9 @@
+@@ -1688,7 +1793,9 @@ shortcuts_append_desktop (GtkFileChooser
path = gtk_file_system_filename_to_path (impl->file_system, name);
g_free (name);
@@ -1407,7 +1409,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.
*/
-@@ -1727,7 +1834,7 @@
+@@ -1727,7 +1834,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 */
@@ -1416,7 +1418,7 @@
num_inserted++;
g_free (label);
-@@ -1746,6 +1853,16 @@
+@@ -1746,6 +1853,16 @@ shortcuts_get_index (GtkFileChooserDefau
int n;
n = 0;
@@ -1433,7 +1435,7 @@
if (where == SHORTCUTS_HOME)
goto out;
-@@ -1843,15 +1960,18 @@
+@@ -1843,15 +1960,18 @@ shortcuts_add_volumes (GtkFileChooserDef
}
}
@@ -1455,7 +1457,7 @@
impl->changing_folder = old_changing_folders;
-@@ -1861,11 +1981,13 @@
+@@ -1861,11 +1981,13 @@ shortcuts_add_volumes (GtkFileChooserDef
/* Inserts a separator node in the shortcuts list */
static void
shortcuts_insert_separator (GtkFileChooserDefault *impl,
@@ -1471,7 +1473,7 @@
gtk_list_store_insert (impl->shortcuts_model, &iter,
shortcuts_get_index (impl, where));
-@@ -1874,6 +1996,7 @@
+@@ -1874,6 +1996,7 @@ shortcuts_insert_separator (GtkFileChoos
SHORTCUTS_COL_PIXBUF_VISIBLE, FALSE,
SHORTCUTS_COL_NAME, NULL,
SHORTCUTS_COL_DATA, NULL,
@@ -1479,7 +1481,7 @@
-1);
}
-@@ -1886,7 +2009,7 @@
+@@ -1886,7 +2009,7 @@ shortcuts_add_bookmarks (GtkFileChooserD
GtkTreeIter iter;
GtkFilePath *list_selected = NULL;
GtkFilePath *combo_selected = NULL;
@@ -1488,7 +1490,7 @@
gpointer col_data;
profile_start ("start", NULL);
-@@ -1899,10 +2022,10 @@
+@@ -1899,10 +2022,10 @@ shortcuts_add_bookmarks (GtkFileChooserD
gtk_tree_model_get (GTK_TREE_MODEL (impl->shortcuts_model),
&iter,
SHORTCUTS_COL_DATA, &col_data,
@@ -1501,7 +1503,7 @@
list_selected = gtk_file_path_copy (col_data);
}
-@@ -1910,13 +2033,18 @@
+@@ -1910,13 +2033,18 @@ shortcuts_add_bookmarks (GtkFileChooserD
gtk_combo_box_get_active_iter (GTK_COMBO_BOX (impl->save_folder_combo),
&iter))
{
@@ -1523,7 +1525,7 @@
combo_selected = gtk_file_path_copy (col_data);
}
-@@ -1934,8 +2062,11 @@
+@@ -1934,8 +2062,11 @@ shortcuts_add_bookmarks (GtkFileChooserD
if (impl->num_bookmarks > 0)
shortcuts_insert_separator (impl, SHORTCUTS_BOOKMARKS_SEPARATOR);
@@ -1537,7 +1539,7 @@
if (list_selected)
{
-@@ -1949,8 +2080,8 @@
+@@ -1949,8 +2080,8 @@ shortcuts_add_bookmarks (GtkFileChooserD
pos = shortcut_find_position (impl, combo_selected);
if (pos != -1)
@@ -1548,7 +1550,7 @@
gtk_file_path_free (combo_selected);
}
-@@ -1995,11 +2126,11 @@
+@@ -1995,11 +2126,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)
{
@@ -1562,7 +1564,7 @@
if (volume)
gtk_file_system_volume_free (impl->file_system, volume);
}
-@@ -2008,7 +2139,8 @@
+@@ -2008,7 +2139,8 @@ shortcuts_add_current_folder (GtkFileCho
gtk_file_path_free (base_path);
}
else if (impl->save_folder_combo != NULL)
@@ -1572,7 +1574,7 @@
}
/* Updates the current folder row in the shortcuts model */
-@@ -2030,9 +2162,9 @@
+@@ -2030,9 +2162,9 @@ shortcuts_update_current_folder (GtkFile
/* Filter function used for the shortcuts filter model */
static gboolean
@@ -1585,7 +1587,7 @@
{
GtkFileChooserDefault *impl;
GtkTreePath *path;
-@@ -2059,11 +2191,17 @@
+@@ -2059,11 +2191,17 @@ shortcuts_model_create (GtkFileChooserDe
GDK_TYPE_PIXBUF, /* pixbuf */
G_TYPE_STRING, /* name */
G_TYPE_POINTER, /* path or volume */
@@ -1604,7 +1606,7 @@
if (impl->file_system)
{
shortcuts_append_home (impl);
-@@ -2071,12 +2209,12 @@
+@@ -2071,12 +2209,12 @@ shortcuts_model_create (GtkFileChooserDe
shortcuts_add_volumes (impl);
}
@@ -1622,7 +1624,7 @@
impl,
NULL);
}
-@@ -2294,16 +2432,16 @@
+@@ -2294,16 +2432,16 @@ shortcut_find_position (GtkFileChooserDe
for (i = 0; i < current_folder_separator_idx; i++)
{
gpointer col_data;
@@ -1642,7 +1644,7 @@
{
GtkFileSystemVolume *volume;
GtkFilePath *base_path;
-@@ -2319,7 +2457,7 @@
+@@ -2319,7 +2457,7 @@ shortcut_find_position (GtkFileChooserDe
if (exists)
return i;
}
@@ -1651,7 +1653,7 @@
{
GtkFilePath *model_path;
-@@ -2425,7 +2563,7 @@
+@@ -2425,7 +2563,7 @@ shortcuts_get_selected (GtkFileChooserDe
if (!gtk_tree_selection_get_selected (selection, NULL, &parent_iter))
return FALSE;
@@ -1660,7 +1662,7 @@
iter,
&parent_iter);
return TRUE;
-@@ -2448,11 +2586,12 @@
+@@ -2448,11 +2586,12 @@ remove_selected_bookmarks (GtkFileChoose
SHORTCUTS_COL_DATA, &col_data,
SHORTCUTS_COL_REMOVABLE, &removable,
-1);
@@ -1674,7 +1676,7 @@
path = col_data;
error = NULL;
-@@ -2609,6 +2748,16 @@
+@@ -2609,6 +2748,16 @@ bookmarks_check_add_sensitivity (GtkFile
gboolean active;
gchar *tip;
@@ -1691,7 +1693,7 @@
selection_check (impl, &num_selected, NULL, &all_folders);
if (num_selected == 0)
-@@ -3122,7 +3271,7 @@
+@@ -3122,7 +3271,7 @@ shortcuts_reorder (GtkFileChooserDefault
{
GtkTreeIter iter;
gpointer col_data;
@@ -1700,7 +1702,7 @@
GtkTreePath *path;
int old_position;
int bookmarks_index;
-@@ -3147,10 +3296,10 @@
+@@ -3147,10 +3296,10 @@ shortcuts_reorder (GtkFileChooserDefault
gtk_tree_model_get (GTK_TREE_MODEL (impl->shortcuts_model), &iter,
SHORTCUTS_COL_NAME, &name,
SHORTCUTS_COL_DATA, &col_data,
@@ -1713,7 +1715,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 */
-@@ -3234,17 +3383,11 @@
+@@ -3234,17 +3383,11 @@ shortcuts_row_separator_func (GtkTreeMod
GtkTreeIter *iter,
gpointer data)
{
@@ -1734,7 +1736,7 @@
}
/* Since GtkTreeView has a keybinding attached to '/', we need to catch
-@@ -3489,7 +3632,7 @@
+@@ -3489,7 +3632,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"));
@@ -1743,7 +1745,7 @@
gtk_tree_view_enable_model_drag_source (GTK_TREE_VIEW (impl->browse_shortcuts_tree_view),
GDK_BUTTON1_MASK,
-@@ -3562,8 +3705,7 @@
+@@ -3562,8 +3705,7 @@ shortcuts_list_create (GtkFileChooserDef
gtk_tree_view_set_row_separator_func (GTK_TREE_VIEW (impl->browse_shortcuts_tree_view),
shortcuts_row_separator_func,
@@ -1753,7 +1755,7 @@
gtk_tree_view_append_column (GTK_TREE_VIEW (impl->browse_shortcuts_tree_view), column);
-@@ -3934,6 +4076,8 @@
+@@ -3934,6 +4076,8 @@ file_list_update_popup_menu (GtkFileChoo
{
file_list_build_popup_menu (impl);
@@ -1762,7 +1764,7 @@
/* The sensitivity of the Add to Bookmarks item is set in
* bookmarks_check_add_sensitivity()
*/
-@@ -4033,6 +4177,28 @@
+@@ -4033,6 +4177,28 @@ list_button_press_event_cb (GtkWidget
return TRUE;
}
@@ -1791,7 +1793,7 @@
/* Creates the widgets for the file list */
static GtkWidget *
create_file_list (GtkFileChooserDefault *impl)
-@@ -4046,7 +4212,7 @@
+@@ -4046,7 +4212,7 @@ create_file_list (GtkFileChooserDefault
swin = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (swin),
@@ -1800,7 +1802,7 @@
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (swin),
GTK_SHADOW_IN);
-@@ -4136,6 +4302,7 @@
+@@ -4136,6 +4302,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
@@ -1808,7 +1810,7 @@
/* Modification time column */
column = gtk_tree_view_column_new ();
-@@ -4146,8 +4313,11 @@
+@@ -4146,8 +4313,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);
@@ -1821,7 +1823,7 @@
gtk_widget_show_all (swin);
return swin;
-@@ -4255,9 +4425,59 @@
+@@ -4255,9 +4425,59 @@ save_folder_combo_changed_cb (GtkComboBo
return;
if (gtk_combo_box_get_active_iter (combo, &iter))
@@ -1882,7 +1884,7 @@
/* Creates the combo box with the save folders */
static GtkWidget *
save_folder_combo_create (GtkFileChooserDefault *impl)
-@@ -4265,8 +4485,14 @@
+@@ -4265,8 +4485,14 @@ save_folder_combo_create (GtkFileChooser
GtkWidget *combo;
GtkCellRenderer *cell;
@@ -1898,7 +1900,7 @@
"focus-on-click", FALSE,
NULL);
gtk_widget_show (combo);
-@@ -4288,8 +4514,7 @@
+@@ -4288,8 +4514,7 @@ save_folder_combo_create (GtkFileChooser
gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (combo),
shortcuts_row_separator_func,
@@ -1908,7 +1910,7 @@
g_signal_connect (combo, "changed",
G_CALLBACK (save_folder_combo_changed_cb), impl);
-@@ -4622,6 +4847,7 @@
+@@ -4622,6 +4847,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);
@@ -1916,7 +1918,7 @@
location_button_create (impl);
gtk_box_pack_start (GTK_BOX (hbox), impl->location_button, FALSE, FALSE, 0);
-@@ -5206,6 +5432,9 @@
+@@ -5206,6 +5432,9 @@ gtk_file_chooser_default_dispose (GObjec
impl->shortcuts_activate_iter_handle = NULL;
}
@@ -1926,7 +1928,7 @@
remove_settings_signal (impl, gtk_widget_get_screen (GTK_WIDGET (impl)));
G_OBJECT_CLASS (_gtk_file_chooser_default_parent_class)->dispose (object);
-@@ -5483,31 +5712,32 @@
+@@ -5483,31 +5712,32 @@ gtk_file_chooser_default_map (GtkWidget
GTK_WIDGET_CLASS (_gtk_file_chooser_default_parent_class)->map (widget);
@@ -1984,7 +1986,7 @@
bookmarks_changed_cb (impl->file_system, impl);
-@@ -5978,12 +6208,6 @@
+@@ -5978,12 +6208,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.
@@ -1997,7 +1999,7 @@
*/
if (GTK_WIDGET_MAPPED (impl) && impl->action == GTK_FILE_CHOOSER_ACTION_OPEN)
browse_files_select_first_row (impl);
-@@ -6030,17 +6254,11 @@
+@@ -6030,17 +6254,11 @@ browse_files_model_finished_loading_cb (
profile_end ("end", NULL);
}
@@ -2018,7 +2020,7 @@
if (impl->browse_files_model)
{
g_object_unref (impl->browse_files_model);
-@@ -6052,6 +6270,20 @@
+@@ -6052,6 +6270,20 @@ set_list_model (GtkFileChooserDefault *i
g_object_unref (impl->sort_model);
impl->sort_model = NULL;
}
@@ -2039,7 +2041,7 @@
set_busy_cursor (impl, TRUE);
gtk_tree_view_set_model (GTK_TREE_VIEW (impl->browse_files_tree_view), NULL);
-@@ -6126,6 +6358,9 @@
+@@ -6126,6 +6358,9 @@ update_chooser_entry (GtkFileChooserDefa
struct update_chooser_entry_selected_foreach_closure closure;
const char *file_part;
@@ -2049,7 +2051,7 @@
if (!(impl->action == GTK_FILE_CHOOSER_ACTION_SAVE
|| impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER
|| ((impl->action == GTK_FILE_CHOOSER_ACTION_OPEN
-@@ -6147,35 +6382,40 @@
+@@ -6147,35 +6382,40 @@ update_chooser_entry (GtkFileChooserDefa
}
else if (closure.num_selected == 1)
{
@@ -2118,7 +2120,7 @@
}
else
{
-@@ -6382,6 +6622,8 @@
+@@ -6382,6 +6622,8 @@ gtk_file_chooser_default_update_current_
profile_start ("start", (char *) path);
@@ -2127,7 +2129,7 @@
g_assert (path != NULL);
if (impl->local_only &&
-@@ -6423,6 +6665,9 @@
+@@ -6423,6 +6665,9 @@ gtk_file_chooser_default_get_current_fol
{
GtkFileChooserDefault *impl = GTK_FILE_CHOOSER_DEFAULT (chooser);
@@ -2137,7 +2139,7 @@
if (impl->reload_state == RELOAD_EMPTY)
{
char *current_working_dir;
-@@ -6483,9 +6728,9 @@
+@@ -6483,9 +6728,9 @@ gtk_file_chooser_default_select_path (Gt
return FALSE;
if (!parent_path)
@@ -2149,7 +2151,7 @@
same_path = FALSE;
else
{
-@@ -6581,6 +6826,16 @@
+@@ -6581,6 +6826,16 @@ static void
gtk_file_chooser_default_select_all (GtkFileChooser *chooser)
{
GtkFileChooserDefault *impl = GTK_FILE_CHOOSER_DEFAULT (chooser);
@@ -2166,7 +2168,7 @@
if (impl->select_multiple)
gtk_tree_model_foreach (GTK_TREE_MODEL (impl->sort_model),
maybe_select, impl);
-@@ -6720,6 +6975,10 @@
+@@ -6720,6 +6975,10 @@ gtk_file_chooser_default_get_paths (GtkF
struct get_paths_closure info;
GtkWindow *toplevel;
GtkWidget *current_focus;
@@ -2177,7 +2179,7 @@
info.impl = impl;
info.result = NULL;
-@@ -6731,12 +6990,14 @@
+@@ -6731,12 +6990,14 @@ gtk_file_chooser_default_get_paths (GtkF
else
current_focus = NULL;
@@ -2192,7 +2194,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);
-@@ -6771,8 +7032,12 @@
+@@ -6771,8 +7032,12 @@ gtk_file_chooser_default_get_paths (GtkF
return NULL;
}
@@ -2207,7 +2209,7 @@
}
else if (impl->toplevel_last_focus_widget == impl->browse_files_tree_view)
goto file_list;
-@@ -6941,7 +7206,7 @@
+@@ -6941,7 +7206,7 @@ add_shortcut_get_info_cb (GtkFileSystemH
pos = shortcuts_get_pos_for_shortcut_folder (data->impl, data->impl->num_shortcuts);
@@ -2216,7 +2218,7 @@
out:
g_object_unref (data->impl);
-@@ -7055,15 +7320,15 @@
+@@ -7055,15 +7320,15 @@ gtk_file_chooser_default_remove_shortcut
for (i = 0; i < impl->num_shortcuts; i++)
{
gpointer col_data;
@@ -2235,7 +2237,7 @@
shortcut = col_data;
if (gtk_file_path_compare (shortcut, path) == 0)
-@@ -7112,15 +7377,15 @@
+@@ -7112,15 +7377,15 @@ gtk_file_chooser_default_list_shortcut_f
for (i = 0; i < impl->num_shortcuts; i++)
{
gpointer col_data;
@@ -2254,7 +2256,7 @@
shortcut = col_data;
list = g_slist_prepend (list, gtk_file_path_copy (shortcut));
-@@ -7455,6 +7720,23 @@
+@@ -7455,6 +7720,23 @@ should_respond_after_confirm_overwrite (
}
}
@@ -2278,7 +2280,7 @@
static void
action_create_folder_cb (GtkFileSystemHandle *handle,
const GtkFilePath *path,
-@@ -7720,6 +8002,9 @@
+@@ -7720,6 +8002,9 @@ gtk_file_chooser_default_should_respond
g_assert (impl->action >= GTK_FILE_CHOOSER_ACTION_OPEN && impl->action <= GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER);
@@ -2288,7 +2290,7 @@
selection_check (impl, &num_selected, &all_files, &all_folders);
if (num_selected > 2)
-@@ -7856,7 +8141,7 @@
+@@ -7856,7 +8141,7 @@ gtk_file_chooser_default_should_respond
{
shortcuts_activate_iter (impl, &iter);
@@ -2297,7 +2299,7 @@
}
else
goto file_list;
-@@ -7870,6 +8155,11 @@
+@@ -7870,6 +8155,11 @@ gtk_file_chooser_default_should_respond
*/
goto file_list;
}
@@ -2309,7 +2311,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
-@@ -7919,15 +8209,453 @@
+@@ -7919,15 +8209,453 @@ gtk_file_chooser_default_initial_focus (
gtk_widget_grab_focus (widget);
}
@@ -2769,7 +2771,7 @@
*/
filter_index = g_slist_index (impl->filters, filter);
if (impl->filters && filter && filter_index < 0)
-@@ -7967,28 +8695,44 @@
+@@ -7967,28 +8695,44 @@ check_preview_change (GtkFileChooserDefa
{
GtkTreePath *cursor_path;
const GtkFilePath *new_path;
@@ -2831,7 +2833,7 @@
}
if (new_path != impl->preview_path &&
-@@ -8004,7 +8748,7 @@
+@@ -8004,7 +8748,7 @@ check_preview_change (GtkFileChooserDefa
if (new_path)
{
impl->preview_path = gtk_file_path_copy (new_path);
@@ -2840,7 +2842,7 @@
}
else
{
-@@ -8073,6 +8817,8 @@
+@@ -8073,6 +8817,8 @@ shortcuts_activate_volume (GtkFileChoose
{
GtkFilePath *path;
@@ -2849,7 +2851,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.
*/
-@@ -8093,6 +8839,8 @@
+@@ -8093,6 +8839,8 @@ shortcuts_activate_volume (GtkFileChoose
if (path != NULL)
{
change_folder_and_display_error (impl, path);
@@ -2858,7 +2860,7 @@
gtk_file_path_free (path);
}
}
-@@ -8125,7 +8873,10 @@
+@@ -8125,7 +8873,10 @@ shortcuts_activate_get_info_cb (GtkFileS
goto out;
if (!error && gtk_file_info_get_is_folder (info))
@@ -2870,7 +2872,7 @@
else
gtk_file_chooser_default_select_path (GTK_FILE_CHOOSER (data->impl), data->path, NULL);
-@@ -8142,26 +8893,25 @@
+@@ -8142,26 +8893,25 @@ shortcuts_activate_iter (GtkFileChooserD
GtkTreeIter *iter)
{
gpointer col_data;
@@ -2902,7 +2904,7 @@
{
GtkFileSystemVolume *volume;
-@@ -8169,7 +8919,7 @@
+@@ -8169,7 +8919,7 @@ shortcuts_activate_iter (GtkFileChooserD
shortcuts_activate_volume (impl, volume);
}
@@ -2911,7 +2913,7 @@
{
struct ShortcutsActivateData *data;
-@@ -8182,6 +8932,10 @@
+@@ -8182,6 +8932,10 @@ shortcuts_activate_iter (GtkFileChooserD
GTK_FILE_INFO_IS_FOLDER,
shortcuts_activate_get_info_cb, data);
}
@@ -2922,7 +2924,7 @@
}
/* Callback used when a row in the shortcuts list is activated */
-@@ -8194,15 +8948,13 @@
+@@ -8194,15 +8948,13 @@ shortcuts_row_activated_cb (GtkTreeView
GtkTreeIter iter;
GtkTreeIter child_iter;
@@ -2940,7 +2942,7 @@
}
/* Handler for GtkWidget::key-press-event on the shortcuts list */
-@@ -8242,8 +8994,15 @@
+@@ -8242,8 +8994,15 @@ shortcuts_select_func (GtkTreeSelection
gpointer data)
{
GtkFileChooserDefault *impl = data;
@@ -2957,7 +2959,7 @@
}
static gboolean
-@@ -8255,6 +9014,9 @@
+@@ -8255,6 +9014,9 @@ list_select_func (GtkTreeSelection *se
{
GtkFileChooserDefault *impl = data;
@@ -2967,7 +2969,7 @@
if (impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER ||
impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER)
{
-@@ -8280,7 +9042,7 @@
+@@ -8280,7 +9042,7 @@ list_selection_changed (GtkTreeSelection
GtkFileChooserDefault *impl)
{
/* See if we are in the new folder editable row for Save mode */
@@ -2976,7 +2978,7 @@
{
const GtkFileInfo *info;
gboolean had_selection;
-@@ -8295,6 +9057,8 @@
+@@ -8295,6 +9057,8 @@ list_selection_changed (GtkTreeSelection
out:
@@ -2985,7 +2987,7 @@
update_chooser_entry (impl);
check_preview_change (impl);
bookmarks_check_add_sensitivity (impl);
-@@ -8312,6 +9076,12 @@
+@@ -8312,6 +9076,12 @@ list_row_activated (GtkTreeView
GtkTreeIter iter, child_iter;
const GtkFileInfo *info;
@@ -2998,7 +3000,7 @@
if (!gtk_tree_model_get_iter (GTK_TREE_MODEL (impl->sort_model), &iter, path))
return;
-@@ -8382,6 +9152,15 @@
+@@ -8382,6 +9152,15 @@ list_icon_data_func (GtkTreeViewColumn *
const GtkFileInfo *info;
gboolean sensitive = TRUE;
@@ -3014,7 +3016,7 @@
profile_start ("start", NULL);
info = get_list_file_info (impl, iter);
-@@ -8431,13 +9210,33 @@
+@@ -8431,13 +9210,33 @@ list_name_data_func (GtkTreeViewColumn *
gpointer data)
{
GtkFileChooserDefault *impl = data;
@@ -3050,7 +3052,7 @@
NULL);
return;
-@@ -8453,6 +9252,7 @@
+@@ -8453,6 +9252,7 @@ list_name_data_func (GtkTreeViewColumn *
g_object_set (cell,
"text", gtk_file_info_get_display_name (info),
"sensitive", sensitive,
@@ -3058,7 +3060,7 @@
NULL);
}
-@@ -8514,7 +9314,6 @@
+@@ -8514,7 +9314,6 @@ list_mtime_data_func (GtkTreeViewColumn
gpointer data)
{
GtkFileChooserDefault *impl;
@@ -3066,7 +3068,7 @@
GtkFileTime time_mtime;
GDate mtime, now;
int days_diff;
-@@ -8523,17 +9322,35 @@
+@@ -8523,17 +9322,35 @@ list_mtime_data_func (GtkTreeViewColumn
impl = data;
@@ -3110,7 +3112,7 @@
if (time_mtime == 0)
strcpy (buf, _("Unknown"));
-@@ -8564,10 +9381,6 @@
+@@ -8564,10 +9381,6 @@ list_mtime_data_func (GtkTreeViewColumn
}
}
@@ -3121,7 +3123,7 @@
g_object_set (cell,
"text", buf,
"sensitive", sensitive,
-@@ -8593,7 +9406,23 @@
+@@ -8593,7 +9406,23 @@ location_set_user_text (GtkFileChooserDe
static void
location_popup_handler (GtkFileChooserDefault *impl,
const gchar *path)
@@ -3146,7 +3148,7 @@
if (impl->action == GTK_FILE_CHOOSER_ACTION_OPEN
|| impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER)
{
-@@ -8662,6 +9491,7 @@
+@@ -8662,6 +9491,7 @@ switch_to_shortcut (GtkFileChooserDefaul
g_assert_not_reached ();
shortcuts_activate_iter (impl, &iter);
@@ -3154,7 +3156,7 @@
}
/* Handler for the "home-folder" keybinding signal */
-@@ -8706,26 +9536,26 @@
+@@ -8706,26 +9536,26 @@ quick_bookmark_handler (GtkFileChooserDe
/* Drag and drop interfaces */
static void
@@ -3187,7 +3189,7 @@
pos = *gtk_tree_path_get_indices (path);
bookmarks_pos = shortcuts_get_index (model->impl, SHORTCUTS_BOOKMARKS);
-@@ -8735,13 +9565,13 @@
+@@ -8735,13 +9565,13 @@ shortcuts_model_filter_row_draggable (Gt
/* GtkTreeDragSource::drag_data_get implementation for the shortcuts filter model */
static gboolean
@@ -3206,7 +3208,7 @@
/* FIXME */
-@@ -8750,30 +9580,30 @@
+@@ -8750,30 +9580,30 @@ shortcuts_model_filter_drag_data_get (Gt
/* Fill the GtkTreeDragSourceIface vtable */
static void
@@ -3248,8 +3250,8 @@
"child-model", child_model,
"virtual-root", root,
NULL);
---- gtk+-2.10.11/gtk/gtkfilechooserprivate.h.search 2007-03-14 05:07:03.000000000 +0100
-+++ gtk+-2.10.11/gtk/gtkfilechooserprivate.h 2007-04-09 22:42:19.000000000 +0200
+--- gtk+-2.10.11/gtk/gtkfilechooserprivate.h.search 2007-03-14 00:07:03.000000000 -0400
++++ gtk+-2.10.11/gtk/gtkfilechooserprivate.h 2007-05-15 01:04:07.000000000 -0400
@@ -25,6 +25,8 @@
#include "gtkfilesystem.h"
#include "gtkfilesystemmodel.h"
@@ -3259,7 +3261,7 @@
#include "gtktooltips.h"
#include "gtktreemodelsort.h"
#include "gtktreestore.h"
-@@ -147,6 +149,11 @@
+@@ -147,6 +149,11 @@ typedef enum {
LOCATION_MODE_FILENAME_ENTRY
} LocationMode;
@@ -3271,7 +3273,7 @@
struct _GtkFileChooserDefault
{
GtkVBox parent_instance;
-@@ -175,11 +182,19 @@
+@@ -175,11 +182,19 @@ struct _GtkFileChooserDefault
GtkWidget *browse_files_popup_menu_add_shortcut_item;
GtkWidget *browse_files_popup_menu_hidden_files_item;
GtkWidget *browse_new_folder_button;
@@ -3291,7 +3293,7 @@
GtkWidget *filter_combo_hbox;
GtkWidget *filter_combo;
GtkWidget *preview_box;
-@@ -195,7 +210,16 @@
+@@ -195,7 +210,16 @@ struct _GtkFileChooserDefault
LocationMode location_mode;
GtkListStore *shortcuts_model;
@@ -3309,7 +3311,7 @@
GtkTreeModelSort *sort_model;
-@@ -215,6 +239,8 @@
+@@ -215,6 +239,8 @@ struct _GtkFileChooserDefault
ReloadState reload_state;
guint load_timeout_id;
@@ -3318,7 +3320,7 @@
GSList *pending_select_paths;
GtkFileFilter *current_filter;
-@@ -222,9 +248,6 @@
+@@ -222,9 +248,6 @@ struct _GtkFileChooserDefault
GtkTooltips *tooltips;
@@ -3328,7 +3330,7 @@
int num_volumes;
int num_shortcuts;
int num_bookmarks;
-@@ -239,6 +262,7 @@
+@@ -239,6 +262,7 @@ struct _GtkFileChooserDefault
GtkTreeViewColumn *list_name_column;
GtkCellRenderer *list_name_renderer;
@@ -3336,7 +3338,7 @@
GSource *edited_idle;
char *edited_new_text;
-@@ -265,6 +289,9 @@
+@@ -265,6 +289,9 @@ struct _GtkFileChooserDefault
guint list_sort_ascending : 1;
guint changing_folder : 1;
guint shortcuts_current_folder_active : 1;
@@ -3346,8 +3348,8 @@
guint expand_folders : 1;
#if 0
---- /dev/null 2007-04-09 09:59:25.840251204 +0200
-+++ gtk+-2.10.11/gtk/gtksearchenginesimple.h 2007-04-09 22:42:19.000000000 +0200
+--- /dev/null 2007-05-14 19:53:51.012713345 -0400
++++ gtk+-2.10.11/gtk/gtksearchenginesimple.h 2007-05-15 01:04:07.000000000 -0400
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2005 Red Hat, Inc
@@ -3408,9 +3410,9 @@
+G_END_DECLS
+
+#endif /* __GTK_SEARCH_ENGINE_SIMPLE_H__ */
---- /dev/null 2007-04-09 09:59:25.840251204 +0200
-+++ gtk+-2.10.11/gtk/gtksearchenginesimple.c 2007-04-09 22:42:19.000000000 +0200
-@@ -0,0 +1,376 @@
+--- /dev/null 2007-05-14 19:53:51.012713345 -0400
++++ gtk+-2.10.11/gtk/gtksearchenginesimple.c 2007-05-15 01:04:50.000000000 -0400
+@@ -0,0 +1,374 @@
+/*
+ * Copyright (C) 2005 Red Hat, Inc
+ *
@@ -3606,7 +3608,7 @@
+ SearchThreadData *data;
+ gint i;
+ const gchar *name;
-+ gchar *lower_name, *path, *mime_type;
++ gchar *lower_name, *mime_type;
+ gchar *uri;
+ gboolean hit;
+ GList *l;
@@ -3623,8 +3625,6 @@
+ else
+ name = fpath;
+
-+ path = g_build_filename (data->path, fpath, NULL);
-+
+ is_hidden = *name == '.';
+
+ hit = FALSE;
@@ -3648,7 +3648,7 @@
+ if (hit && data->mime_types != NULL)
+ {
+ hit = FALSE;
-+ mime_type = xdg_mime_get_mime_type_for_file (path, (struct stat *)sb);
++ mime_type = xdg_mime_get_mime_type_for_file (fpath, (struct stat *)sb);
+ for (l = data->mime_types; l != NULL; l = l->next)
+ {
+ if (strcmp (mime_type, l->data) == 0)
@@ -3663,7 +3663,7 @@
+
+ if (hit)
+ {
-+ uri = g_filename_to_uri (path, NULL, NULL);
++ uri = g_filename_to_uri (fpath, NULL, NULL);
+ data->uri_hits = g_list_prepend (data->uri_hits, uri);
+ }
+
@@ -3787,8 +3787,8 @@
+
+ return engine;
+}
---- /dev/null 2007-04-09 09:59:25.840251204 +0200
-+++ gtk+-2.10.11/gtk/gtksearchenginebeagle.c 2007-04-09 22:42:19.000000000 +0200
+--- /dev/null 2007-05-14 19:53:51.012713345 -0400
++++ gtk+-2.10.11/gtk/gtksearchenginebeagle.c 2007-05-15 01:04:07.000000000 -0400
@@ -0,0 +1,420 @@
+/*
+ * Copyright (C) 2005 Novell, Inc.
@@ -4210,8 +4210,8 @@
+
+ return GTK_SEARCH_ENGINE (engine);
+}
---- /dev/null 2007-04-09 09:59:25.840251204 +0200
-+++ gtk+-2.10.11/gtk/gtkquery.c 2007-04-09 22:42:19.000000000 +0200
+--- /dev/null 2007-05-14 19:53:51.012713345 -0400
++++ gtk+-2.10.11/gtk/gtkquery.c 2007-05-15 01:04:07.000000000 -0400
@@ -0,0 +1,142 @@
+/*
+ * Copyright (C) 2005 Novell, Inc.
@@ -4355,8 +4355,8 @@
+ g_strdup (mime_type));
+}
+
---- /dev/null 2007-04-09 09:59:25.840251204 +0200
-+++ gtk+-2.10.11/gtk/gtkquery.h 2007-04-09 22:42:19.000000000 +0200
+--- /dev/null 2007-05-14 19:53:51.012713345 -0400
++++ gtk+-2.10.11/gtk/gtkquery.h 2007-05-15 01:04:07.000000000 -0400
@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2005 Novell, Inc.
Index: gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -r1.222 -r1.223
--- gtk2.spec 10 Apr 2007 19:48:52 -0000 1.222
+++ gtk2.spec 15 May 2007 05:11:03 -0000 1.223
@@ -16,7 +16,7 @@
Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
Name: gtk2
Version: %{base_version}
-Release: 5%{?dist}
+Release: 6%{?dist}
License: LGPL
Group: System Environment/Libraries
Source: http://ftp.gnome.org/pub/gnome/sources/gtk+/2.10/gtk+-%{version}.tar.bz2
@@ -291,6 +291,9 @@
%doc tmpdocs/examples
%changelog
+* Tue May 15 2007 Matthias Clasen <mclasen at redhat.com> - 1.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
- Use DESKTOP xdg-user-dir in the file chooser
More information about the fedora-extras-commits
mailing list