rpms/gtk2/devel gtk+-2.10.3-search.patch, 1.1, 1.2 gtk2.spec, 1.182, 1.183
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Sep 13 19:03:43 UTC 2006
- Previous message (by thread): rpms/pirut/devel .cvsignore, 1.34, 1.35 pirut.spec, 1.35, 1.36 sources, 1.35, 1.36
- Next message (by thread): rpms/cman/devel cman-2.0.14-defaultrun.patch, NONE, 1.1 cman.spec, 1.75, 1.76
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mclasen
Update of /cvs/dist/rpms/gtk2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9373
Modified Files:
gtk+-2.10.3-search.patch gtk2.spec
Log Message:
silence warnings
gtk+-2.10.3-search.patch:
gtkfilechooserdefault.c | 1443 +++++++++++++++++++++++++++++++++++++++---------
gtkfilechooserprivate.h | 42 +
2 files changed, 1236 insertions(+), 249 deletions(-)
Index: gtk+-2.10.3-search.patch
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/gtk+-2.10.3-search.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gtk+-2.10.3-search.patch 5 Sep 2006 13:49:46 -0000 1.1
+++ gtk+-2.10.3-search.patch 13 Sep 2006 19:03:41 -0000 1.2
@@ -1,5 +1,5 @@
--- gtk+-2.10.3/gtk/gtkfilechooserprivate.h.search 2006-09-04 16:54:38.000000000 -0400
-+++ gtk+-2.10.3/gtk/gtkfilechooserprivate.h 2006-09-05 09:04:44.000000000 -0400
++++ gtk+-2.10.3/gtk/gtkfilechooserprivate.h 2006-09-13 14:55:39.000000000 -0400
@@ -147,6 +147,20 @@
LOCATION_MODE_FILENAME_ENTRY
} LocationMode;
@@ -97,7 +97,7 @@
#if 0
guint shortcuts_drag_outside : 1;
--- gtk+-2.10.3/gtk/gtkfilechooserdefault.c.search 2006-09-04 17:02:44.000000000 -0400
-+++ gtk+-2.10.3/gtk/gtkfilechooserdefault.c 2006-09-05 09:17:26.000000000 -0400
++++ gtk+-2.10.3/gtk/gtkfilechooserdefault.c 2006-09-13 15:01:56.000000000 -0400
@@ -78,6 +78,8 @@
#include <errno.h>
#include <string.h>
@@ -146,7 +146,7 @@
/* Identifiers for target types */
enum {
GTK_TREE_MODEL_ROW,
-@@ -225,9 +244,140 @@
+@@ -225,9 +244,137 @@
static const int num_file_list_dest_targets = (sizeof (file_list_dest_targets)
/ sizeof (file_list_dest_targets[0]));
@@ -235,10 +235,7 @@
+
+ beagle = g_module_open ("libbeagle.so.0", G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL);
+ if (!beagle)
-+ {
-+ g_warning ("Can't open libbeagle '%s'\n", g_module_error ());
-+ return;
-+ }
++ return;
+
+ for (i = 0; i < G_N_ELEMENTS (beagle_dl_mapping); i++)
+ {
@@ -287,7 +284,7 @@
SHORTCUTS_HOME,
SHORTCUTS_DESKTOP,
SHORTCUTS_VOLUMES,
-@@ -419,6 +569,14 @@
+@@ -419,6 +566,14 @@
GtkFileChooserDefault *impl);
static void location_switch_to_path_bar (GtkFileChooserDefault *impl);
@@ -302,7 +299,7 @@
-@@ -428,26 +586,26 @@
+@@ -428,26 +583,26 @@
GtkTreeModelFilter parent;
GtkFileChooserDefault *impl;
@@ -340,7 +337,7 @@
-@@ -663,6 +821,7 @@
+@@ -663,6 +818,7 @@
impl->reload_state = RELOAD_EMPTY;
impl->pending_select_paths = NULL;
impl->location_mode = LOCATION_MODE_PATH_BAR;
@@ -348,7 +345,7 @@
gtk_box_set_spacing (GTK_BOX (impl), 12);
-@@ -678,22 +837,24 @@
+@@ -678,22 +834,24 @@
GtkTreeIter *iter)
{
gpointer col_data;
@@ -377,7 +374,7 @@
{
GtkFileSystemVolume *volume;
-@@ -704,6 +865,8 @@
+@@ -704,6 +862,8 @@
{
GtkFilePath *path;
@@ -386,7 +383,7 @@
path = col_data;
gtk_file_path_free (path);
}
-@@ -790,8 +953,11 @@
+@@ -790,8 +950,11 @@
GtkFileChooserDefault *impl = GTK_FILE_CHOOSER_DEFAULT (object);
GSList *l;
@@ -400,7 +397,7 @@
shortcuts_free (impl);
-@@ -829,6 +995,8 @@
+@@ -829,6 +992,8 @@
if (impl->sort_model)
g_object_unref (impl->sort_model);
@@ -409,7 +406,7 @@
g_free (impl->preview_display_name);
g_free (impl->edited_new_text);
-@@ -1080,6 +1248,14 @@
+@@ -1080,6 +1245,14 @@
update_preview_widget_visibility (impl);
}
@@ -424,7 +421,7 @@
/* Re-reads all the icons for the shortcuts, used when the theme changes */
struct ReloadIconsData
{
-@@ -1150,19 +1326,20 @@
+@@ -1150,19 +1323,20 @@
do
{
gpointer data;
@@ -449,7 +446,7 @@
{
GtkFileSystemVolume *volume;
-@@ -1177,7 +1354,7 @@
+@@ -1177,7 +1351,7 @@
if (pixbuf)
g_object_unref (pixbuf);
}
@@ -458,7 +455,7 @@
{
const GtkFilePath *path;
struct ReloadIconsData *info;
-@@ -1198,6 +1375,10 @@
+@@ -1198,6 +1372,10 @@
info);
impl->reload_icon_handles = g_slist_append (impl->reload_icon_handles, handle);
}
@@ -469,7 +466,7 @@
}
}
while (gtk_tree_model_iter_next (GTK_TREE_MODEL (impl->shortcuts_model),&iter));
-@@ -1328,7 +1509,6 @@
+@@ -1328,7 +1506,6 @@
{
gint pos = -1;
gboolean cancelled = handle->cancelled;
@@ -477,7 +474,7 @@
GdkPixbuf *pixbuf;
GtkTreePath *path;
GtkTreeIter iter;
-@@ -1393,12 +1573,15 @@
+@@ -1393,12 +1570,15 @@
SHORTCUTS_COL_PIXBUF, pixbuf,
SHORTCUTS_COL_PIXBUF_VISIBLE, TRUE,
SHORTCUTS_COL_NAME, request->label_copy,
@@ -496,7 +493,7 @@
if (request->type == SHORTCUTS_CURRENT_FOLDER
&& request->impl->save_folder_combo != NULL)
-@@ -1410,7 +1593,7 @@
+@@ -1410,7 +1590,7 @@
g_signal_handlers_block_by_func (request->impl->save_folder_combo,
G_CALLBACK (save_folder_combo_changed_cb),
request->impl);
@@ -505,7 +502,7 @@
g_signal_handlers_unblock_by_func (request->impl->save_folder_combo,
G_CALLBACK (save_folder_combo_changed_cb),
request->impl);
-@@ -1436,7 +1619,7 @@
+@@ -1436,7 +1616,7 @@
static void
shortcuts_insert_path (GtkFileChooserDefault *impl,
int pos,
@@ -514,7 +511,7 @@
GtkFileSystemVolume *volume,
const GtkFilePath *path,
const char *label,
-@@ -1448,16 +1631,17 @@
+@@ -1448,16 +1628,17 @@
gpointer data = NULL;
GtkTreeIter iter;
@@ -535,7 +532,7 @@
{
struct ShortcutsInsertRequest *request;
GtkFileSystemHandle *handle;
-@@ -1488,7 +1672,7 @@
+@@ -1488,7 +1669,7 @@
gtk_list_store_set (impl->shortcuts_model, &iter,
SHORTCUTS_COL_DATA, gtk_file_path_copy (path),
@@ -544,7 +541,7 @@
SHORTCUTS_COL_HANDLE, handle,
-1);
-@@ -1496,6 +1680,12 @@
+@@ -1496,6 +1677,12 @@
return;
}
@@ -557,7 +554,7 @@
if (!data)
data = gtk_file_path_copy (path);
-@@ -1512,13 +1702,16 @@
+@@ -1512,13 +1699,16 @@
SHORTCUTS_COL_PIXBUF_VISIBLE, TRUE,
SHORTCUTS_COL_NAME, label_copy,
SHORTCUTS_COL_DATA, data,
@@ -577,7 +574,7 @@
if (type == SHORTCUTS_CURRENT_FOLDER && impl->save_folder_combo != NULL)
{
-@@ -1530,7 +1723,8 @@
+@@ -1530,7 +1720,8 @@
g_signal_handlers_block_by_func (impl->save_folder_combo,
G_CALLBACK (save_folder_combo_changed_cb),
impl);
@@ -587,7 +584,7 @@
g_signal_handlers_unblock_by_func (impl->save_folder_combo,
G_CALLBACK (save_folder_combo_changed_cb),
impl);
-@@ -1544,6 +1738,30 @@
+@@ -1544,6 +1735,30 @@
profile_end ("end", NULL);
}
@@ -618,7 +615,7 @@
/* Appends an item for the user's home directory to the shortcuts model */
static void
shortcuts_append_home (GtkFileChooserDefault *impl)
-@@ -1562,7 +1780,8 @@
+@@ -1562,7 +1777,8 @@
home_path = gtk_file_system_filename_to_path (impl->file_system, home);
@@ -628,7 +625,7 @@
gtk_file_path_free (home_path);
-@@ -1595,7 +1814,9 @@
+@@ -1595,7 +1811,9 @@
path = gtk_file_system_filename_to_path (impl->file_system, name);
g_free (name);
@@ -639,7 +636,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.
*/
-@@ -1634,7 +1855,7 @@
+@@ -1634,7 +1852,7 @@
label = gtk_file_system_get_bookmark_label (impl->file_system, path);
/* NULL GError, but we don't really want to show error boxes here */
@@ -648,7 +645,7 @@
num_inserted++;
g_free (label);
-@@ -1653,6 +1874,16 @@
+@@ -1653,6 +1871,16 @@
int n;
n = 0;
@@ -665,7 +662,7 @@
if (where == SHORTCUTS_HOME)
goto out;
-@@ -1749,15 +1980,18 @@
+@@ -1749,15 +1977,18 @@
}
}
@@ -687,7 +684,7 @@
impl->changing_folder = old_changing_folders;
-@@ -1767,11 +2001,13 @@
+@@ -1767,11 +1998,13 @@
/* Inserts a separator node in the shortcuts list */
static void
shortcuts_insert_separator (GtkFileChooserDefault *impl,
@@ -703,7 +700,7 @@
gtk_list_store_insert (impl->shortcuts_model, &iter,
shortcuts_get_index (impl, where));
-@@ -1780,6 +2016,7 @@
+@@ -1780,6 +2013,7 @@
SHORTCUTS_COL_PIXBUF_VISIBLE, FALSE,
SHORTCUTS_COL_NAME, NULL,
SHORTCUTS_COL_DATA, NULL,
@@ -711,7 +708,7 @@
-1);
}
-@@ -1792,7 +2029,7 @@
+@@ -1792,7 +2026,7 @@
GtkTreeIter iter;
GtkFilePath *list_selected = NULL;
GtkFilePath *combo_selected = NULL;
@@ -720,7 +717,7 @@
gpointer col_data;
profile_start ("start", NULL);
-@@ -1806,10 +2043,10 @@
+@@ -1806,10 +2040,10 @@
gtk_tree_model_get (GTK_TREE_MODEL (impl->shortcuts_model),
&iter,
SHORTCUTS_COL_DATA, &col_data,
@@ -733,7 +730,7 @@
list_selected = gtk_file_path_copy (col_data);
}
-@@ -1817,13 +2054,18 @@
+@@ -1817,13 +2051,18 @@
gtk_combo_box_get_active_iter (GTK_COMBO_BOX (impl->save_folder_combo),
&iter))
{
@@ -755,7 +752,7 @@
combo_selected = gtk_file_path_copy (col_data);
}
-@@ -1841,8 +2083,11 @@
+@@ -1841,8 +2080,11 @@
if (impl->num_bookmarks > 0)
shortcuts_insert_separator (impl, SHORTCUTS_BOOKMARKS_SEPARATOR);
@@ -769,7 +766,7 @@
if (list_selected)
{
-@@ -1856,8 +2101,8 @@
+@@ -1856,8 +2098,8 @@
pos = shortcut_find_position (impl, combo_selected);
if (pos != -1)
@@ -780,7 +777,7 @@
gtk_file_path_free (combo_selected);
}
-@@ -1902,11 +2147,11 @@
+@@ -1902,11 +2144,11 @@
if (base_path &&
strcmp (gtk_file_path_get_string (base_path), gtk_file_path_get_string (impl->current_folder)) == 0)
{
@@ -794,7 +791,7 @@
if (volume)
gtk_file_system_volume_free (impl->file_system, volume);
}
-@@ -1915,7 +2160,8 @@
+@@ -1915,7 +2157,8 @@
gtk_file_path_free (base_path);
}
else if (impl->save_folder_combo != NULL)
@@ -804,7 +801,7 @@
}
/* Updates the current folder row in the shortcuts model */
-@@ -1937,9 +2183,9 @@
+@@ -1937,9 +2180,9 @@
/* Filter function used for the shortcuts filter model */
static gboolean
@@ -817,7 +814,7 @@
{
GtkFileChooserDefault *impl;
GtkTreePath *path;
-@@ -1966,11 +2212,17 @@
+@@ -1966,11 +2209,17 @@
GDK_TYPE_PIXBUF, /* pixbuf */
G_TYPE_STRING, /* name */
G_TYPE_POINTER, /* path or volume */
@@ -836,7 +833,7 @@
if (impl->file_system)
{
shortcuts_append_home (impl);
-@@ -1978,12 +2230,12 @@
+@@ -1978,12 +2227,12 @@
shortcuts_add_volumes (impl);
}
@@ -854,7 +851,7 @@
impl,
NULL);
}
-@@ -2201,16 +2453,16 @@
+@@ -2201,16 +2450,16 @@
for (i = 0; i < current_folder_separator_idx; i++)
{
gpointer col_data;
@@ -874,7 +871,7 @@
{
GtkFileSystemVolume *volume;
GtkFilePath *base_path;
-@@ -2226,7 +2478,7 @@
+@@ -2226,7 +2475,7 @@
if (exists)
return i;
}
@@ -883,7 +880,7 @@
{
GtkFilePath *model_path;
-@@ -2332,7 +2584,7 @@
+@@ -2332,7 +2581,7 @@
if (!gtk_tree_selection_get_selected (selection, NULL, &parent_iter))
return FALSE;
@@ -892,7 +889,7 @@
iter,
&parent_iter);
return TRUE;
-@@ -2355,11 +2607,12 @@
+@@ -2355,11 +2604,12 @@
SHORTCUTS_COL_DATA, &col_data,
SHORTCUTS_COL_REMOVABLE, &removable,
-1);
@@ -906,7 +903,7 @@
path = col_data;
error = NULL;
-@@ -2516,6 +2769,16 @@
+@@ -2516,6 +2766,16 @@
gboolean active;
gchar *tip;
@@ -923,7 +920,7 @@
selection_check (impl, &num_selected, NULL, &all_folders);
if (num_selected == 0)
-@@ -3029,7 +3292,7 @@
+@@ -3029,7 +3289,7 @@
{
GtkTreeIter iter;
gpointer col_data;
@@ -932,7 +929,7 @@
GtkTreePath *path;
int old_position;
int bookmarks_index;
-@@ -3054,10 +3317,10 @@
+@@ -3054,10 +3314,10 @@
gtk_tree_model_get (GTK_TREE_MODEL (impl->shortcuts_model), &iter,
SHORTCUTS_COL_NAME, &name,
SHORTCUTS_COL_DATA, &col_data,
@@ -945,7 +942,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 */
-@@ -3141,17 +3404,11 @@
+@@ -3141,17 +3401,11 @@
GtkTreeIter *iter,
gpointer data)
{
@@ -966,7 +963,7 @@
}
/* Since GtkTreeView has a keybinding attached to '/', we need to catch
-@@ -3396,7 +3653,7 @@
+@@ -3396,7 +3650,7 @@
/* Accessible object name for the file chooser's shortcuts pane */
atk_object_set_name (gtk_widget_get_accessible (impl->browse_shortcuts_tree_view), _("Places"));
@@ -975,7 +972,7 @@
gtk_tree_view_enable_model_drag_source (GTK_TREE_VIEW (impl->browse_shortcuts_tree_view),
GDK_BUTTON1_MASK,
-@@ -3469,8 +3726,7 @@
+@@ -3469,8 +3723,7 @@
gtk_tree_view_set_row_separator_func (GTK_TREE_VIEW (impl->browse_shortcuts_tree_view),
shortcuts_row_separator_func,
@@ -985,7 +982,7 @@
gtk_tree_view_append_column (GTK_TREE_VIEW (impl->browse_shortcuts_tree_view), column);
-@@ -3841,6 +4097,8 @@
+@@ -3841,6 +4094,8 @@
{
file_list_build_popup_menu (impl);
@@ -994,7 +991,7 @@
/* The sensitivity of the Add to Bookmarks item is set in
* bookmarks_check_add_sensitivity()
*/
-@@ -3940,6 +4198,28 @@
+@@ -3940,6 +4195,28 @@
return TRUE;
}
@@ -1023,7 +1020,7 @@
/* Creates the widgets for the file list */
static GtkWidget *
create_file_list (GtkFileChooserDefault *impl)
-@@ -3953,7 +4233,7 @@
+@@ -3953,7 +4230,7 @@
swin = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (swin),
@@ -1032,7 +1029,7 @@
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (swin),
GTK_SHADOW_IN);
-@@ -4043,6 +4323,7 @@
+@@ -4043,6 +4320,7 @@
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
@@ -1040,7 +1037,7 @@
/* Modification time column */
column = gtk_tree_view_column_new ();
-@@ -4053,8 +4334,11 @@
+@@ -4053,8 +4331,11 @@
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);
@@ -1053,7 +1050,7 @@
gtk_widget_show_all (swin);
return swin;
-@@ -4161,9 +4445,59 @@
+@@ -4161,9 +4442,59 @@
return;
if (gtk_combo_box_get_active_iter (combo, &iter))
@@ -1114,7 +1111,7 @@
/* Creates the combo box with the save folders */
static GtkWidget *
save_folder_combo_create (GtkFileChooserDefault *impl)
-@@ -4171,8 +4505,14 @@
+@@ -4171,8 +4502,14 @@
GtkWidget *combo;
GtkCellRenderer *cell;
@@ -1130,7 +1127,7 @@
"focus-on-click", FALSE,
NULL);
gtk_widget_show (combo);
-@@ -4194,8 +4534,7 @@
+@@ -4194,8 +4531,7 @@
gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (combo),
shortcuts_row_separator_func,
@@ -1140,7 +1137,7 @@
g_signal_connect (combo, "changed",
G_CALLBACK (save_folder_combo_changed_cb), impl);
-@@ -4529,6 +4868,7 @@
+@@ -4529,6 +4865,7 @@
hbox = gtk_hbox_new (FALSE, 12);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
gtk_widget_show (hbox);
@@ -1148,7 +1145,7 @@
location_button_create (impl);
gtk_box_pack_start (GTK_BOX (hbox), impl->location_button, FALSE, FALSE, 0);
-@@ -5117,6 +5457,9 @@
+@@ -5117,6 +5454,9 @@
impl->shortcuts_activate_iter_handle = NULL;
}
@@ -1158,7 +1155,7 @@
remove_settings_signal (impl, gtk_widget_get_screen (GTK_WIDGET (impl)));
G_OBJECT_CLASS (_gtk_file_chooser_default_parent_class)->dispose (object);
-@@ -5388,31 +5731,32 @@
+@@ -5388,31 +5728,32 @@
GTK_WIDGET_CLASS (_gtk_file_chooser_default_parent_class)->map (widget);
@@ -1216,7 +1213,7 @@
bookmarks_changed_cb (impl->file_system, impl);
-@@ -5883,12 +6227,6 @@
+@@ -5883,12 +6224,6 @@
* 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.
@@ -1229,7 +1226,7 @@
*/
if (GTK_WIDGET_MAPPED (impl) && impl->action == GTK_FILE_CHOOSER_ACTION_OPEN)
browse_files_select_first_row (impl);
-@@ -5935,17 +6273,11 @@
+@@ -5935,17 +6270,11 @@
profile_end ("end", NULL);
}
@@ -1250,7 +1247,7 @@
if (impl->browse_files_model)
{
g_object_unref (impl->browse_files_model);
-@@ -5957,6 +6289,20 @@
+@@ -5957,6 +6286,20 @@
g_object_unref (impl->sort_model);
impl->sort_model = NULL;
}
@@ -1271,7 +1268,7 @@
set_busy_cursor (impl, TRUE);
gtk_tree_view_set_model (GTK_TREE_VIEW (impl->browse_files_tree_view), NULL);
-@@ -6031,6 +6377,9 @@
+@@ -6031,6 +6374,9 @@
struct update_chooser_entry_selected_foreach_closure closure;
const char *file_part;
@@ -1281,7 +1278,7 @@
if (!(impl->action == GTK_FILE_CHOOSER_ACTION_SAVE
|| impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER
|| ((impl->action == GTK_FILE_CHOOSER_ACTION_OPEN
-@@ -6052,29 +6401,34 @@
+@@ -6052,29 +6398,34 @@
}
else if (closure.num_selected == 1)
{
@@ -1339,7 +1336,7 @@
}
else
{
-@@ -6280,6 +6634,8 @@
+@@ -6280,6 +6631,8 @@
profile_start ("start", (char *) path);
@@ -1348,7 +1345,7 @@
g_assert (path != NULL);
if (impl->local_only &&
-@@ -6321,6 +6677,9 @@
+@@ -6321,6 +6674,9 @@
{
GtkFileChooserDefault *impl = GTK_FILE_CHOOSER_DEFAULT (chooser);
@@ -1358,7 +1355,7 @@
if (impl->reload_state == RELOAD_EMPTY)
{
char *current_working_dir;
-@@ -6381,9 +6740,9 @@
+@@ -6381,9 +6737,9 @@
return FALSE;
if (!parent_path)
@@ -1370,7 +1367,7 @@
same_path = FALSE;
else
{
-@@ -6479,6 +6838,16 @@
+@@ -6479,6 +6835,16 @@
gtk_file_chooser_default_select_all (GtkFileChooser *chooser)
{
GtkFileChooserDefault *impl = GTK_FILE_CHOOSER_DEFAULT (chooser);
@@ -1387,7 +1384,7 @@
if (impl->select_multiple)
gtk_tree_model_foreach (GTK_TREE_MODEL (impl->sort_model),
maybe_select, impl);
-@@ -6608,6 +6977,10 @@
+@@ -6608,6 +6974,10 @@
struct get_paths_closure info;
GtkWindow *toplevel;
GtkWidget *current_focus;
@@ -1398,7 +1395,7 @@
info.impl = impl;
info.result = NULL;
-@@ -6619,12 +6992,14 @@
+@@ -6619,12 +6989,14 @@
else
current_focus = NULL;
@@ -1413,7 +1410,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);
-@@ -6659,8 +7034,12 @@
+@@ -6659,8 +7031,12 @@
return NULL;
}
@@ -1428,7 +1425,7 @@
}
else if (impl->toplevel_last_focus_widget == impl->browse_files_tree_view)
goto file_list;
-@@ -6829,7 +7208,7 @@
+@@ -6829,7 +7205,7 @@
pos = shortcuts_get_pos_for_shortcut_folder (data->impl, data->impl->num_shortcuts);
@@ -1437,7 +1434,7 @@
out:
g_object_unref (data->impl);
-@@ -6943,15 +7322,15 @@
+@@ -6943,15 +7319,15 @@
for (i = 0; i < impl->num_shortcuts; i++)
{
gpointer col_data;
@@ -1456,7 +1453,7 @@
shortcut = col_data;
if (gtk_file_path_compare (shortcut, path) == 0)
-@@ -7000,15 +7379,15 @@
+@@ -7000,15 +7376,15 @@
for (i = 0; i < impl->num_shortcuts; i++)
{
gpointer col_data;
@@ -1475,7 +1472,7 @@
shortcut = col_data;
list = g_slist_prepend (list, gtk_file_path_copy (shortcut));
-@@ -7343,6 +7722,23 @@
+@@ -7343,6 +7719,23 @@
}
}
@@ -1499,7 +1496,7 @@
static void
action_create_folder_cb (GtkFileSystemHandle *handle,
const GtkFilePath *path,
-@@ -7608,6 +8004,9 @@
+@@ -7608,6 +8001,9 @@
g_assert (impl->action >= GTK_FILE_CHOOSER_ACTION_OPEN && impl->action <= GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER);
@@ -1509,7 +1506,7 @@
selection_check (impl, &num_selected, &all_files, &all_folders);
if (num_selected > 2)
-@@ -7744,7 +8143,7 @@
+@@ -7744,7 +8140,7 @@
{
shortcuts_activate_iter (impl, &iter);
@@ -1518,7 +1515,7 @@
}
else
goto file_list;
-@@ -7758,6 +8157,11 @@
+@@ -7758,6 +8154,11 @@
*/
goto file_list;
}
@@ -1530,7 +1527,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
-@@ -7807,12 +8211,462 @@
+@@ -7807,14 +8208,464 @@
gtk_widget_grab_focus (widget);
}
@@ -1545,6 +1542,8 @@
{
- if (impl->current_filter != filter)
- {
+- int filter_index;
+-
+ GSList **list;
+ const GtkFilePath *file_path;
+ GtkFilePath *file_path_copy;
@@ -1994,10 +1993,12 @@
+{
+ if (impl->current_filter != filter)
+ {
- int filter_index;
-
++ int filter_index;
++
/* NULL filters are allowed to reset to non-filtered status
-@@ -7855,28 +8709,44 @@
+ */
+ filter_index = g_slist_index (impl->filters, filter);
+@@ -7855,28 +8706,44 @@
{
GtkTreePath *cursor_path;
const GtkFilePath *new_path;
@@ -2059,7 +2060,7 @@
}
if (new_path != impl->preview_path &&
-@@ -7892,7 +8762,7 @@
+@@ -7892,7 +8759,7 @@
if (new_path)
{
impl->preview_path = gtk_file_path_copy (new_path);
@@ -2068,7 +2069,7 @@
}
else
{
-@@ -7961,6 +8831,8 @@
+@@ -7961,6 +8828,8 @@
{
GtkFilePath *path;
@@ -2077,7 +2078,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.
*/
-@@ -7981,6 +8853,8 @@
+@@ -7981,6 +8850,8 @@
if (path != NULL)
{
change_folder_and_display_error (impl, path);
@@ -2086,7 +2087,7 @@
gtk_file_path_free (path);
}
}
-@@ -8013,7 +8887,10 @@
+@@ -8013,7 +8884,10 @@
goto out;
if (!error && gtk_file_info_get_is_folder (info))
@@ -2098,7 +2099,7 @@
else
gtk_file_chooser_default_select_path (GTK_FILE_CHOOSER (data->impl), data->path, NULL);
-@@ -8030,26 +8907,25 @@
+@@ -8030,26 +8904,25 @@
GtkTreeIter *iter)
{
gpointer col_data;
@@ -2130,7 +2131,7 @@
{
GtkFileSystemVolume *volume;
-@@ -8057,7 +8933,7 @@
+@@ -8057,7 +8930,7 @@
shortcuts_activate_volume (impl, volume);
}
@@ -2139,7 +2140,7 @@
{
struct ShortcutsActivateData *data;
-@@ -8070,6 +8946,10 @@
+@@ -8070,6 +8943,10 @@
GTK_FILE_INFO_IS_FOLDER,
shortcuts_activate_get_info_cb, data);
}
@@ -2150,7 +2151,7 @@
}
/* Callback used when a row in the shortcuts list is activated */
-@@ -8082,15 +8962,13 @@
+@@ -8082,15 +8959,13 @@
GtkTreeIter iter;
GtkTreeIter child_iter;
@@ -2168,7 +2169,7 @@
}
/* Handler for GtkWidget::key-press-event on the shortcuts list */
-@@ -8130,8 +9008,15 @@
+@@ -8130,8 +9005,15 @@
gpointer data)
{
GtkFileChooserDefault *impl = data;
@@ -2185,7 +2186,7 @@
}
static gboolean
-@@ -8143,6 +9028,9 @@
+@@ -8143,6 +9025,9 @@
{
GtkFileChooserDefault *impl = data;
@@ -2195,7 +2196,7 @@
if (impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER ||
impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER)
{
-@@ -8168,7 +9056,7 @@
+@@ -8168,7 +9053,7 @@
GtkFileChooserDefault *impl)
{
/* See if we are in the new folder editable row for Save mode */
@@ -2204,7 +2205,7 @@
{
const GtkFileInfo *info;
gboolean had_selection;
-@@ -8183,6 +9071,8 @@
+@@ -8183,6 +9068,8 @@
out:
@@ -2213,7 +2214,7 @@
update_chooser_entry (impl);
check_preview_change (impl);
bookmarks_check_add_sensitivity (impl);
-@@ -8200,6 +9090,12 @@
+@@ -8200,6 +9087,12 @@
GtkTreeIter iter, child_iter;
const GtkFileInfo *info;
@@ -2226,7 +2227,7 @@
if (!gtk_tree_model_get_iter (GTK_TREE_MODEL (impl->sort_model), &iter, path))
return;
-@@ -8270,6 +9166,15 @@
+@@ -8270,6 +9163,15 @@
const GtkFileInfo *info;
gboolean sensitive = TRUE;
@@ -2242,7 +2243,7 @@
profile_start ("start", NULL);
info = get_list_file_info (impl, iter);
-@@ -8319,13 +9224,33 @@
+@@ -8319,13 +9221,33 @@
gpointer data)
{
GtkFileChooserDefault *impl = data;
@@ -2278,7 +2279,7 @@
NULL);
return;
-@@ -8341,6 +9266,7 @@
+@@ -8341,6 +9263,7 @@
g_object_set (cell,
"text", gtk_file_info_get_display_name (info),
"sensitive", sensitive,
@@ -2286,7 +2287,7 @@
NULL);
}
-@@ -8402,7 +9328,6 @@
+@@ -8402,7 +9325,6 @@
gpointer data)
{
GtkFileChooserDefault *impl;
@@ -2294,7 +2295,7 @@
GtkFileTime time_mtime;
GDate mtime, now;
int days_diff;
-@@ -8411,17 +9336,35 @@
+@@ -8411,17 +9333,35 @@
impl = data;
@@ -2338,7 +2339,7 @@
if (time_mtime == 0)
strcpy (buf, _("Unknown"));
-@@ -8452,10 +9395,6 @@
+@@ -8452,10 +9392,6 @@
}
}
@@ -2349,7 +2350,7 @@
g_object_set (cell,
"text", buf,
"sensitive", sensitive,
-@@ -8481,7 +9420,23 @@
+@@ -8481,7 +9417,23 @@
static void
location_popup_handler (GtkFileChooserDefault *impl,
const gchar *path)
@@ -2374,7 +2375,7 @@
if (impl->action == GTK_FILE_CHOOSER_ACTION_OPEN
|| impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER)
{
-@@ -8550,6 +9505,7 @@
+@@ -8550,6 +9502,7 @@
g_assert_not_reached ();
shortcuts_activate_iter (impl, &iter);
@@ -2382,7 +2383,7 @@
}
/* Handler for the "home-folder" keybinding signal */
-@@ -8594,26 +9550,26 @@
+@@ -8594,26 +9547,26 @@
/* Drag and drop interfaces */
static void
@@ -2415,7 +2416,7 @@
pos = *gtk_tree_path_get_indices (path);
bookmarks_pos = shortcuts_get_index (model->impl, SHORTCUTS_BOOKMARKS);
-@@ -8623,13 +9579,13 @@
+@@ -8623,13 +9576,13 @@
/* GtkTreeDragSource::drag_data_get implementation for the shortcuts filter model */
static gboolean
@@ -2434,7 +2435,7 @@
/* FIXME */
-@@ -8638,30 +9594,30 @@
+@@ -8638,30 +9591,30 @@
/* Fill the GtkTreeDragSourceIface vtable */
static void
Index: gtk2.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -r1.182 -r1.183
--- gtk2.spec 13 Sep 2006 16:32:57 -0000 1.182
+++ gtk2.spec 13 Sep 2006 19:03:41 -0000 1.183
@@ -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: gtk+-%{version}.tar.bz2
@@ -301,6 +301,9 @@
%doc tmpdocs/examples
%changelog
+* Wed Sep 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.10.3-6
+- Don't spew a warning if libbeagle is not installed
+
* Wed Sep 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.10.3-5
- Make color picker work with window groups
- Previous message (by thread): rpms/pirut/devel .cvsignore, 1.34, 1.35 pirut.spec, 1.35, 1.36 sources, 1.35, 1.36
- Next message (by thread): rpms/cman/devel cman-2.0.14-defaultrun.patch, NONE, 1.1 cman.spec, 1.75, 1.76
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list