This commit is contained in:
parent
393d7bfaf8
commit
4ae7646806
75
gtk2-filechooser-mount-parent.patch
Normal file
75
gtk2-filechooser-mount-parent.patch
Normal file
@ -0,0 +1,75 @@
|
||||
Index: gtk/gtkfilechooserdefault.c
|
||||
===================================================================
|
||||
--- gtk/gtkfilechooserdefault.c (revision 21792)
|
||||
+++ gtk/gtkfilechooserdefault.c (working copy)
|
||||
@@ -6870,6 +6869,43 @@
|
||||
};
|
||||
|
||||
static void
|
||||
+update_current_folder_mount_enclosing_volume_cb (GCancellable *cancellable,
|
||||
+ GtkFileSystemVolume *volume,
|
||||
+ const GError *error,
|
||||
+ gpointer user_data)
|
||||
+{
|
||||
+ gboolean cancelled = g_cancellable_is_cancelled (cancellable);
|
||||
+ struct UpdateCurrentFolderData *data = user_data;
|
||||
+ GtkFileChooserDefault *impl = data->impl;
|
||||
+
|
||||
+
|
||||
+ if (cancellable != impl->update_current_folder_cancellable)
|
||||
+ goto out;
|
||||
+
|
||||
+ impl->update_current_folder_cancellable = NULL;
|
||||
+
|
||||
+ if (cancelled)
|
||||
+ goto out;
|
||||
+
|
||||
+ if (error)
|
||||
+ {
|
||||
+ error_changing_folder_dialog (data->impl, data->file, g_error_copy (error));
|
||||
+ impl->update_current_folder_cancellable = NULL;
|
||||
+ impl->reload_state = RELOAD_EMPTY;
|
||||
+ set_busy_cursor (impl, FALSE);
|
||||
+ goto out;
|
||||
+ }
|
||||
+
|
||||
+ change_folder_and_display_error (impl, data->file, data->clear_entry);
|
||||
+
|
||||
+out:
|
||||
+ g_object_unref (data->file);
|
||||
+ g_free (data);
|
||||
+
|
||||
+ g_object_unref (cancellable);
|
||||
+}
|
||||
+
|
||||
+static void
|
||||
update_current_folder_get_info_cb (GCancellable *cancellable,
|
||||
GFileInfo *info,
|
||||
const GError *error,
|
||||
@@ -6894,6 +6930,26 @@
|
||||
{
|
||||
GFile *parent_file;
|
||||
|
||||
+ if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_NOT_MOUNTED))
|
||||
+ {
|
||||
+ GMountOperation *mount_operation;
|
||||
+ GtkWidget *toplevel;
|
||||
+
|
||||
+ g_object_unref (cancellable);
|
||||
+ toplevel = gtk_widget_get_toplevel (GTK_WIDGET (impl));
|
||||
+
|
||||
+ mount_operation = gtk_mount_operation_new (GTK_WINDOW (toplevel));
|
||||
+
|
||||
+ impl->update_current_folder_cancellable =
|
||||
+ _gtk_file_system_mount_enclosing_volume (impl->file_system, data->file,
|
||||
+ mount_operation,
|
||||
+ update_current_folder_mount_enclosing_volume_cb,
|
||||
+ data);
|
||||
+ set_busy_cursor (impl, TRUE);
|
||||
+
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
if (!data->original_file)
|
||||
{
|
||||
data->original_file = g_object_ref (data->file);
|
330
gtk2-filechooser-network-browsing.patch
Normal file
330
gtk2-filechooser-network-browsing.patch
Normal file
@ -0,0 +1,330 @@
|
||||
diff -upr gtk+-2.14.4-pre/gtk/gtkfilechooserbutton.c gtk+-2.14.4-post/gtk/gtkfilechooserbutton.c
|
||||
--- gtk+-2.14.4-pre/gtk/gtkfilechooserbutton.c 2008-10-16 23:06:19.000000000 -0500
|
||||
+++ gtk+-2.14.4-post/gtk/gtkfilechooserbutton.c 2008-12-04 20:16:04.000000000 -0600
|
||||
@@ -998,7 +998,7 @@ dnd_select_folder_get_info_cb (GCancella
|
||||
{
|
||||
gboolean is_folder;
|
||||
|
||||
- is_folder = (g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY);
|
||||
+ is_folder = _gtk_file_system_consider_as_directory (info);
|
||||
|
||||
data->selected =
|
||||
(((data->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER && is_folder) ||
|
||||
@@ -1455,7 +1455,7 @@ set_info_get_info_cb (GCancellable *canc
|
||||
if (!data->label)
|
||||
data->label = g_strdup (g_file_info_get_display_name (info));
|
||||
|
||||
- is_folder = (g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY);
|
||||
+ is_folder = _gtk_file_system_consider_as_directory (info);
|
||||
|
||||
gtk_list_store_set (GTK_LIST_STORE (data->button->priv->model), &iter,
|
||||
ICON_COLUMN, pixbuf,
|
||||
diff -upr gtk+-2.14.4-pre/gtk/gtkfilechooserdefault.c gtk+-2.14.4-post/gtk/gtkfilechooserdefault.c
|
||||
--- gtk+-2.14.4-pre/gtk/gtkfilechooserdefault.c 2008-10-16 23:06:19.000000000 -0500
|
||||
+++ gtk+-2.14.4-post/gtk/gtkfilechooserdefault.c 2008-12-04 20:18:19.000000000 -0600
|
||||
@@ -2771,7 +2771,7 @@ selection_check_foreach_cb (GtkTreeModel
|
||||
case OPERATION_MODE_BROWSE:
|
||||
gtk_tree_model_sort_convert_iter_to_child_iter (closure->impl->sort_model, &child_iter, iter);
|
||||
info = _gtk_file_system_model_get_info (closure->impl->browse_files_model, &child_iter);
|
||||
- is_folder = info ? (g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY) : FALSE;
|
||||
+ is_folder = info ? (_gtk_file_system_consider_as_directory (info)) : FALSE;
|
||||
break;
|
||||
|
||||
case OPERATION_MODE_SEARCH:
|
||||
@@ -4165,8 +4165,7 @@ file_list_drag_data_received_get_info_cb
|
||||
|
||||
if ((data->impl->action == GTK_FILE_CHOOSER_ACTION_OPEN ||
|
||||
data->impl->action == GTK_FILE_CHOOSER_ACTION_SAVE) &&
|
||||
- data->uris[1] == 0 && !error &&
|
||||
- g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY)
|
||||
+ data->uris[1] == 0 && !error && _gtk_file_system_consider_as_directory (info))
|
||||
change_folder_and_display_error (data->impl, data->file, FALSE);
|
||||
else
|
||||
{
|
||||
@@ -6086,7 +6085,7 @@ list_model_filter_func (GtkFileSystemMod
|
||||
if (!impl->current_filter)
|
||||
return TRUE;
|
||||
|
||||
- if (g_file_info_get_file_type (file_info) == G_FILE_TYPE_DIRECTORY)
|
||||
+ if (_gtk_file_system_consider_as_directory (file_info))
|
||||
return TRUE;
|
||||
|
||||
return !get_is_file_filtered (impl, file, file_info);
|
||||
@@ -6123,12 +6122,12 @@ install_list_model_filter (GtkFileChoose
|
||||
gboolean dir_a, dir_b; \
|
||||
\
|
||||
if (info_a) \
|
||||
- dir_a = (g_file_info_get_file_type (info_a) == G_FILE_TYPE_DIRECTORY); \
|
||||
+ dir_a = _gtk_file_system_consider_as_directory (info_a); \
|
||||
else \
|
||||
return impl->list_sort_ascending ? -1 : 1; \
|
||||
\
|
||||
if (info_b) \
|
||||
- dir_b = (g_file_info_get_file_type (info_b) == G_FILE_TYPE_DIRECTORY); \
|
||||
+ dir_b = _gtk_file_system_consider_as_directory (info_b); \
|
||||
else \
|
||||
return impl->list_sort_ascending ? 1 : -1; \
|
||||
\
|
||||
@@ -6410,9 +6409,9 @@ show_and_select_files_finished_loading (
|
||||
have_hidden = g_file_info_get_is_hidden (info);
|
||||
|
||||
if (!have_filtered)
|
||||
- have_filtered = (g_file_info_get_file_type (info) != G_FILE_TYPE_DIRECTORY) &&
|
||||
+ have_filtered = (! _gtk_file_system_consider_as_directory (info)) &&
|
||||
get_is_file_filtered (data->impl, file, info);
|
||||
-
|
||||
+
|
||||
g_object_unref (info);
|
||||
|
||||
if (have_hidden && have_filtered)
|
||||
@@ -6745,7 +6744,7 @@ update_chooser_entry (GtkFileChooserDefa
|
||||
impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER)
|
||||
{
|
||||
/* We don't want the name to change when clicking on a folder... */
|
||||
- change_entry = (g_file_info_get_file_type (info) != G_FILE_TYPE_DIRECTORY);
|
||||
+ change_entry = (! _gtk_file_system_consider_as_directory (info));
|
||||
}
|
||||
else
|
||||
change_entry = TRUE; /* ... unless we are in SELECT_FOLDER mode */
|
||||
@@ -6900,7 +6899,7 @@ update_current_folder_get_info_cb (GCanc
|
||||
g_object_unref (data->original_file);
|
||||
}
|
||||
|
||||
- if (g_file_info_get_file_type (info) != G_FILE_TYPE_DIRECTORY)
|
||||
+ if (! _gtk_file_system_consider_as_directory (info))
|
||||
goto out;
|
||||
|
||||
if (!_gtk_path_bar_set_file (GTK_PATH_BAR (impl->browse_path_bar), data->file, data->keep_trail, NULL))
|
||||
@@ -7183,7 +7182,7 @@ maybe_select (GtkTreeModel *model,
|
||||
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (impl->browse_files_tree_view));
|
||||
|
||||
info = get_list_file_info (impl, iter);
|
||||
- is_folder = (g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY);
|
||||
+ is_folder = _gtk_file_system_consider_as_directory (info);
|
||||
|
||||
if ((is_folder && impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER) ||
|
||||
(!is_folder && impl->action == GTK_FILE_CHOOSER_ACTION_OPEN))
|
||||
@@ -7581,7 +7580,7 @@ add_shortcut_get_info_cb (GCancellable *
|
||||
|
||||
data->impl->loading_shortcuts = g_slist_remove (data->impl->loading_shortcuts, cancellable);
|
||||
|
||||
- if (cancelled || error || g_file_info_get_file_type (info) != G_FILE_TYPE_DIRECTORY)
|
||||
+ if (cancelled || error || (! _gtk_file_system_consider_as_directory (info)))
|
||||
goto out;
|
||||
|
||||
pos = shortcuts_get_pos_for_shortcut_folder (data->impl, data->impl->num_shortcuts);
|
||||
@@ -8129,7 +8128,7 @@ save_entry_get_info_cb (GCancellable *ca
|
||||
if (!info)
|
||||
parent_is_folder = FALSE;
|
||||
else
|
||||
- parent_is_folder = (g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY);
|
||||
+ parent_is_folder = _gtk_file_system_consider_as_directory (info);
|
||||
|
||||
if (parent_is_folder)
|
||||
{
|
||||
@@ -8199,7 +8198,7 @@ file_exists_get_info_cb (GCancellable *c
|
||||
if (cancelled)
|
||||
goto out;
|
||||
|
||||
- file_exists_and_is_not_folder = info && (g_file_info_get_file_type (info) != G_FILE_TYPE_DIRECTORY);
|
||||
+ file_exists_and_is_not_folder = info && (! _gtk_file_system_consider_as_directory (info));
|
||||
|
||||
if (data->impl->action == GTK_FILE_CHOOSER_ACTION_OPEN)
|
||||
/* user typed a filename; we are done */
|
||||
@@ -8613,7 +8612,7 @@ search_hit_get_info_cb (GCancellable *ca
|
||||
|
||||
display_name = g_strdup (g_file_info_get_display_name (info));
|
||||
mime_type = g_content_type_get_mime_type (g_file_info_get_content_type (info));
|
||||
- is_folder = (g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY);
|
||||
+ is_folder = _gtk_file_system_consider_as_directory (info);
|
||||
pixbuf = _gtk_file_info_render_icon (info, GTK_WIDGET (request->impl),
|
||||
request->impl->icon_size);
|
||||
|
||||
@@ -9684,7 +9683,7 @@ recent_item_get_info_cb (GCancellable *c
|
||||
goto out;
|
||||
}
|
||||
|
||||
- is_folder = (g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY);
|
||||
+ is_folder = _gtk_file_system_consider_as_directory (info);
|
||||
|
||||
gtk_list_store_set (request->impl->recent_model, &iter,
|
||||
RECENT_MODEL_COL_IS_FOLDER, is_folder,
|
||||
@@ -10248,7 +10247,7 @@ shortcuts_activate_get_info_cb (GCancell
|
||||
if (cancelled)
|
||||
goto out;
|
||||
|
||||
- if (!error && g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY)
|
||||
+ if (!error && _gtk_file_system_consider_as_directory (info))
|
||||
change_folder_and_display_error (data->impl, data->file, FALSE);
|
||||
else
|
||||
gtk_file_chooser_default_select_file (GTK_FILE_CHOOSER (data->impl),
|
||||
@@ -10470,7 +10469,7 @@ list_select_func (GtkTreeSelection *se
|
||||
|
||||
gtk_tree_model_sort_convert_iter_to_child_iter (impl->sort_model, &child_iter, &iter);
|
||||
info = _gtk_file_system_model_get_info (impl->browse_files_model, &child_iter);
|
||||
- if (info && g_file_info_get_file_type (info) != G_FILE_TYPE_DIRECTORY)
|
||||
+ if (info && (! _gtk_file_system_consider_as_directory (info)))
|
||||
return FALSE;
|
||||
}
|
||||
break;
|
||||
@@ -10582,11 +10581,28 @@ list_row_activated (GtkTreeView
|
||||
info = _gtk_file_system_model_get_info (impl->browse_files_model,
|
||||
&child_iter);
|
||||
|
||||
- if (g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY)
|
||||
+ if (_gtk_file_system_consider_as_directory (info))
|
||||
{
|
||||
- GFile *file;
|
||||
+ GFile *file, *target_file;
|
||||
+ const gchar *target_uri;
|
||||
|
||||
file = _gtk_file_system_model_get_file (impl->browse_files_model, &child_iter);
|
||||
+ if (g_file_info_get_file_type (info) == G_FILE_TYPE_SHORTCUT ||
|
||||
+ g_file_info_get_file_type (info) == G_FILE_TYPE_MOUNTABLE)
|
||||
+ {
|
||||
+ target_uri = g_file_info_get_attribute_string (info, G_FILE_ATTRIBUTE_STANDARD_TARGET_URI);
|
||||
+ if (target_uri)
|
||||
+ {
|
||||
+ target_file = g_file_new_for_uri (target_uri);
|
||||
+ if (target_file)
|
||||
+ {
|
||||
+ g_object_unref (file);
|
||||
+ file = target_file;
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+
|
||||
change_folder_and_display_error (impl, file, FALSE);
|
||||
return;
|
||||
}
|
||||
@@ -10714,7 +10730,7 @@ list_icon_data_func (GtkTreeViewColumn *
|
||||
if (info &&
|
||||
(impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER ||
|
||||
impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER))
|
||||
- sensitive = (g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY);
|
||||
+ sensitive = _gtk_file_system_consider_as_directory (info);
|
||||
}
|
||||
break;
|
||||
}
|
||||
@@ -10818,7 +10834,7 @@ list_name_data_func (GtkTreeViewColumn *
|
||||
if (impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER ||
|
||||
impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER)
|
||||
{
|
||||
- sensitive = (g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY);
|
||||
+ sensitive = _gtk_file_system_consider_as_directory (info);
|
||||
}
|
||||
|
||||
g_object_set (cell,
|
||||
@@ -10842,7 +10858,7 @@ list_size_data_func (GtkTreeViewColumn *
|
||||
gchar *str;
|
||||
gboolean sensitive = TRUE;
|
||||
|
||||
- if (!info || g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY)
|
||||
+ if (!info || _gtk_file_system_consider_as_directory (info))
|
||||
{
|
||||
g_object_set (cell,
|
||||
"text", NULL,
|
||||
@@ -10959,7 +10975,7 @@ list_mtime_data_func (GtkTreeViewColumn
|
||||
|
||||
if (impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER ||
|
||||
impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER)
|
||||
- sensitive = (g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY);
|
||||
+ sensitive = _gtk_file_system_consider_as_directory (info);
|
||||
}
|
||||
|
||||
if (G_UNLIKELY (time_mtime == 0))
|
||||
Only in gtk+-2.14.4-post/gtk: gtkfilechooserdefault.c~
|
||||
diff -upr gtk+-2.14.4-pre/gtk/gtkfilechooserentry.c gtk+-2.14.4-post/gtk/gtkfilechooserentry.c
|
||||
--- gtk+-2.14.4-pre/gtk/gtkfilechooserentry.c 2008-10-16 23:06:19.000000000 -0500
|
||||
+++ gtk+-2.14.4-post/gtk/gtkfilechooserentry.c 2008-12-04 20:16:04.000000000 -0600
|
||||
@@ -439,7 +439,7 @@ maybe_append_separator_to_file (GtkFileC
|
||||
|
||||
if (info)
|
||||
{
|
||||
- if (g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY)
|
||||
+ if (_gtk_file_system_consider_as_directory (info))
|
||||
{
|
||||
gchar *tmp = display_name;
|
||||
display_name = g_strconcat (tmp, G_DIR_SEPARATOR_S, NULL);
|
||||
@@ -1812,7 +1812,7 @@ _gtk_file_chooser_entry_get_is_folder (G
|
||||
|
||||
if (file_info)
|
||||
{
|
||||
- retval = (g_file_info_get_file_type (file_info) == G_FILE_TYPE_DIRECTORY);
|
||||
+ retval = _gtk_file_system_consider_as_directory (file_info);
|
||||
g_object_unref (file_info);
|
||||
}
|
||||
}
|
||||
diff -upr gtk+-2.14.4-pre/gtk/gtkfilesystem.c gtk+-2.14.4-post/gtk/gtkfilesystem.c
|
||||
--- gtk+-2.14.4-pre/gtk/gtkfilesystem.c 2008-10-16 23:06:19.000000000 -0500
|
||||
+++ gtk+-2.14.4-post/gtk/gtkfilesystem.c 2008-12-04 20:16:04.000000000 -0600
|
||||
@@ -918,6 +918,11 @@ enclosing_volume_mount_cb (GObject
|
||||
g_file_mount_enclosing_volume_finish (G_FILE (source_object), result, &error);
|
||||
volume = _gtk_file_system_get_volume_for_file (async_data->file_system, G_FILE (source_object));
|
||||
|
||||
+ /* Silently drop G_IO_ERROR_ALREADY_MOUNTED error for gvfs backends without visible mounts. */
|
||||
+ /* Better than doing query_info with additional I/O every time. */
|
||||
+ if (error && g_error_matches (error, G_IO_ERROR, G_IO_ERROR_ALREADY_MOUNTED))
|
||||
+ g_clear_error (&error);
|
||||
+
|
||||
gdk_threads_enter ();
|
||||
((GtkFileSystemVolumeMountCallback) async_data->callback) (async_data->cancellable, volume,
|
||||
error, async_data->data);
|
||||
@@ -1742,3 +1747,14 @@ _gtk_file_info_render_icon (GFileInfo *i
|
||||
|
||||
return pixbuf;
|
||||
}
|
||||
+
|
||||
+gboolean
|
||||
+_gtk_file_system_consider_as_directory (GFileInfo *info)
|
||||
+{
|
||||
+ GFileType type = g_file_info_get_file_type (info);
|
||||
+
|
||||
+ return (type == G_FILE_TYPE_DIRECTORY ||
|
||||
+ type == G_FILE_TYPE_SHORTCUT ||
|
||||
+ type == G_FILE_TYPE_MOUNTABLE);
|
||||
+}
|
||||
+
|
||||
diff -upr gtk+-2.14.4-pre/gtk/gtkfilesystem.h gtk+-2.14.4-post/gtk/gtkfilesystem.h
|
||||
--- gtk+-2.14.4-pre/gtk/gtkfilesystem.h 2008-10-16 23:06:19.000000000 -0500
|
||||
+++ gtk+-2.14.4-post/gtk/gtkfilesystem.h 2008-12-04 20:16:04.000000000 -0600
|
||||
@@ -172,6 +172,8 @@ GdkPixbuf * _gtk_file_info_render_ic
|
||||
GtkWidget *widget,
|
||||
gint icon_size);
|
||||
|
||||
+gboolean _gtk_file_system_consider_as_directory (GFileInfo *info);
|
||||
+
|
||||
G_END_DECLS
|
||||
|
||||
#endif /* __GTK_FILE_SYSTEM_H__ */
|
||||
diff -upr gtk+-2.14.4-pre/gtk/gtkfilesystemmodel.c gtk+-2.14.4-post/gtk/gtkfilesystemmodel.c
|
||||
--- gtk+-2.14.4-pre/gtk/gtkfilesystemmodel.c 2008-10-16 23:06:19.000000000 -0500
|
||||
+++ gtk+-2.14.4-post/gtk/gtkfilesystemmodel.c 2008-12-04 20:16:04.000000000 -0600
|
||||
@@ -444,7 +444,7 @@ gtk_file_system_model_iter_has_child (Gt
|
||||
else
|
||||
{
|
||||
GFileInfo *info = file_model_node_get_info (model, node);
|
||||
- return (g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY);
|
||||
+ return _gtk_file_system_consider_as_directory (info);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1330,7 +1330,7 @@ file_model_node_is_visible (GtkFileSyste
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
- is_folder = (g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY);
|
||||
+ is_folder = _gtk_file_system_consider_as_directory (info);
|
||||
|
||||
if (model->show_folders != model->show_files &&
|
||||
model->show_folders != is_folder)
|
||||
@@ -1553,7 +1553,7 @@ file_model_node_get_children (GtkFileSys
|
||||
{
|
||||
GFileInfo *info = file_model_node_get_info (model, node);
|
||||
gboolean has_children = FALSE;
|
||||
- gboolean is_folder = (g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY);
|
||||
+ gboolean is_folder = _gtk_file_system_consider_as_directory (info);
|
||||
|
||||
file_model_node_idle_clear_cancel (node);
|
||||
|
11
gtk2.changes
11
gtk2.changes
@ -1,3 +1,14 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Dec 4 22:28:40 CST 2008 - hpj@novell.com
|
||||
|
||||
- Added gtk2-filechooser-mount-parent.patch (bgo#561494
|
||||
bnc#445362).
|
||||
- Added gtk2-filechooser-network-browsing.patch (bgo561494
|
||||
bgo545980 bnc445362).
|
||||
- These patches from upstream fix a constellation of bugs meaning
|
||||
you could not browse to a network place like network://,
|
||||
smb:// or smb://server/ in a GTK file chooser.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Nov 24 12:34:56 CET 2008 - olh@suse.de
|
||||
|
||||
|
72
gtk2.spec
72
gtk2.spec
@ -52,7 +52,7 @@ Obsoletes: gtk2-32bit
|
||||
#
|
||||
PreReq: /usr/bin/touch /bin/rm /bin/rmdir
|
||||
Version: 2.14.4
|
||||
Release: 6
|
||||
Release: 7
|
||||
Summary: Library for Creation of Graphical User Interfaces (version 2)
|
||||
Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{_name}/2.12/%{_name}-%{version}.tar.bz2
|
||||
Source1: SuSEconfig.gtk2
|
||||
@ -80,6 +80,10 @@ Patch32: gtk2-set-invisible-char-to-circle.patch
|
||||
Patch35: gtk2-flash-player-busyloop.patch
|
||||
# PATCH-FIX-UPSTREAM gtk2-libtool.patch schwab@suse.de -- apparently configure.in is invoking libtool in a bad way
|
||||
Patch36: gtk2-libtool.patch
|
||||
# PATCH-FIX-UPSTREAM gtk2-filechooser-mount-parent.patch bgo524485 bgo545980 bnc437780 hpj@novell.com -- Support network browsing correctly.
|
||||
Patch37: gtk2-filechooser-mount-parent.patch
|
||||
# PATCH-FIX-UPSTREAM gtk2-filechooser-network-browsing.patch bgo524485 bgo561494 bnc437780 hpj@novell.com -- Support network browsing correctly.
|
||||
Patch38: gtk2-filechooser-network-browsing.patch
|
||||
# Patches taken from upstream or slated to go upstream. We can expect these to become obsolete
|
||||
# in future releases.
|
||||
# Please don't delete this comment even if this section is empty -- "# empty" should
|
||||
@ -318,6 +322,8 @@ cp -a %{S:2} .
|
||||
%patch32 -p1
|
||||
%patch35
|
||||
%patch36
|
||||
%patch37 -p0
|
||||
%patch38 -p1
|
||||
# %patch51 -p1
|
||||
%patch53
|
||||
%patch54 -p1
|
||||
@ -457,9 +463,17 @@ fi
|
||||
%{_datadir}/gtk-doc/html/*
|
||||
|
||||
%changelog
|
||||
* Thu Dec 04 2008 hpj@novell.com
|
||||
- Added gtk2-filechooser-mount-parent.patch (bgo#561494
|
||||
bnc#445362).
|
||||
- Added gtk2-filechooser-network-browsing.patch (bgo561494
|
||||
bgo545980 bnc445362).
|
||||
- These patches from upstream fix a constellation of bugs meaning
|
||||
you could not browse to a network place like network://,
|
||||
smb:// or smb://server/ in a GTK file chooser.
|
||||
* Mon Nov 24 2008 olh@suse.de
|
||||
- obsolete old -XXbit packages (bnc#437293)
|
||||
* Wed Nov 19 2008 pwu@suse.de
|
||||
* Tue Nov 18 2008 pwu@suse.de
|
||||
- Change gtk_selection_data_get_targets to java X Selection type.
|
||||
The java X Selection "TARGETS"'s type is "TARGETS" not "ATOM".
|
||||
Fixes https://bugzilla.novell.com/show_bug.cgi?id=191223.
|
||||
@ -472,7 +486,7 @@ fi
|
||||
https://bugzilla.novell.com/show_bug.cgi?id=355503 - The file
|
||||
chooser now remembers its window size across invocations, so it does
|
||||
not have to be resized every time.
|
||||
* Mon Nov 03 2008 vuntz@novell.com
|
||||
* Sun Nov 02 2008 vuntz@novell.com
|
||||
- Remove gtk-warn.patch: already fixed upstream.
|
||||
* Tue Oct 21 2008 maw@suse.de
|
||||
- Update to version 2.14.4:
|
||||
@ -500,7 +514,7 @@ fi
|
||||
- add gcc-c++ to buildrequires to work around libtool problem
|
||||
* Sun Sep 28 2008 ro@suse.de
|
||||
- add gcc-c++ to buildrequires to work around libtool problem
|
||||
* Tue Sep 09 2008 maw@suse.de
|
||||
* Mon Sep 08 2008 maw@suse.de
|
||||
- Update to version 2.14.1:
|
||||
+ Fix a deadlock in pixbuf loader initialization
|
||||
+ Updated translations.
|
||||
@ -547,7 +561,7 @@ fi
|
||||
bgo#540834, bgo#515596, bgo#534979, bgo#382291, bgo#545982,
|
||||
and bgo#544858
|
||||
+ Updated translations.
|
||||
* Fri Aug 01 2008 maw@suse.de
|
||||
* Thu Jul 31 2008 maw@suse.de
|
||||
- Update to version 2.13.5:
|
||||
+ Merge the GSEAL branch (see http://live.gnome.org/GTK+/3.0/Tasks);
|
||||
as a result, members of structures can be conditionally be
|
||||
@ -581,7 +595,7 @@ fi
|
||||
+ Updated translations
|
||||
- Respin gtk+-strict-aliasing.patch
|
||||
- Drop gtk2-remove-empty-cache.patch and update SuSEconfig.gtk2.
|
||||
* Wed Jul 23 2008 coolo@suse.de
|
||||
* Tue Jul 22 2008 coolo@suse.de
|
||||
- obsolete gail-<targettype>
|
||||
* Mon Jul 21 2008 federico@novell.com
|
||||
- Tagged all the patches that didn't have tags.
|
||||
@ -658,7 +672,7 @@ fi
|
||||
completion.
|
||||
* Tue May 06 2008 schwab@suse.de
|
||||
- Don't use libtool before it is created.
|
||||
* Tue May 06 2008 federico@novell.com
|
||||
* Mon May 05 2008 federico@novell.com
|
||||
- Added gtk2-bnc310710-bgo524166-underallocated-gtklabel-position.diff
|
||||
to fix https://bugzilla.novell.com/show_bug.cgi?id=310710 - Labels
|
||||
with too-small allocations should still pay attention to their
|
||||
@ -870,7 +884,7 @@ fi
|
||||
- adding hicolor-icon-theme to Requires [#249043]
|
||||
* Thu Apr 19 2007 sbrabec@suse.cz
|
||||
- Correctly initialize XDG_DATA_DIRS in SuSEconfig (#240603).
|
||||
* Thu Apr 12 2007 maw@suse.de
|
||||
* Wed Apr 11 2007 maw@suse.de
|
||||
- Remove some extraneous comments that were inadvertently left
|
||||
in the .spec.
|
||||
* Tue Apr 10 2007 sbrabec@suse.cz
|
||||
@ -899,7 +913,7 @@ fi
|
||||
https://bugzilla.novell.com/show_bug.cgi?id=216883. The "Home" and
|
||||
"Desktop" items in the shortcuts pane of the file chooser would not
|
||||
show sometimes in SAVE mode.
|
||||
* Thu Jan 18 2007 maw@suse.de
|
||||
* Wed Jan 17 2007 maw@suse.de
|
||||
- Add gtk2-235661-pixbuf-loader-error-checking.diff (#235661).
|
||||
* Tue Jan 16 2007 sbrabec@suse.cz
|
||||
- Build with correct CFLAGS.
|
||||
@ -912,9 +926,9 @@ fi
|
||||
* Mon Dec 11 2006 sbrabec@suse.cz
|
||||
- Prefix changed to /usr.
|
||||
- Spec file cleanup.
|
||||
* Sat Nov 11 2006 danw@suse.de
|
||||
* Fri Nov 10 2006 danw@suse.de
|
||||
- Update gtk64.patch to fix stock icon cache on x86_64 (213922)
|
||||
* Wed Nov 08 2006 jhargadon@suse.de
|
||||
* Tue Nov 07 2006 jhargadon@suse.de
|
||||
- removed the execute bit from /etc/opt/gnome/gtk-2.0/gtkrc
|
||||
* Tue Oct 17 2006 jhargadon@suse.de
|
||||
- update to version 2.10.6
|
||||
@ -980,13 +994,13 @@ fi
|
||||
- lots of updates in the printing area
|
||||
- various fixes in many other places
|
||||
- countless bugfixes
|
||||
* Wed Jun 21 2006 federico@novell.com
|
||||
* Tue Jun 20 2006 federico@novell.com
|
||||
- Added gtk2-184875-filechooser-location-entry-set-path.diff to fix
|
||||
https://bugzilla.novell.com/show_bug.cgi?id=184875. This makes the
|
||||
location entry in the file chooser preserve the filename from
|
||||
gtk_file_chooser_set_filename() and set_uri(). It was incorrectly
|
||||
using just the directory name instead of the file name.
|
||||
* Wed Jun 07 2006 federico@novell.com
|
||||
* Tue Jun 06 2006 federico@novell.com
|
||||
- Added gtk2-179040-file-chooser-location-entry-folder.diff to fix
|
||||
https://bugzilla.novell.com/show_bug.cgi?id=179040. This makes the
|
||||
location entry in GtkFileChooser update correctly when you switch
|
||||
@ -997,11 +1011,11 @@ fi
|
||||
months or years.
|
||||
* Thu Jun 01 2006 sbrabec@suse.cz
|
||||
- Fixed I18N of file selector navigation buttons (#180696).
|
||||
* Sun May 28 2006 joeshaw@suse.de
|
||||
* Sat May 27 2006 joeshaw@suse.de
|
||||
- Add gtk2-filechooserbutton-signal-disconnect-fix.patch to fix
|
||||
a crash when a GtkFileChooserButton is destroyed but not
|
||||
finalized and bookmarks or volumes change. (bnc #178122)
|
||||
* Wed May 24 2006 federico@novell.com
|
||||
* Tue May 23 2006 federico@novell.com
|
||||
- Updated gtk+-2.8.6-fontsel-fix.patch to fix bug
|
||||
https://bugzilla.novell.com/show_bug.cgi?id=177997. The previous
|
||||
patch caused crashes in all font selectors.
|
||||
@ -1019,7 +1033,7 @@ fi
|
||||
just switched folders.
|
||||
* Mon Apr 03 2006 sbrabec@suse.cz
|
||||
- Fixed context translation bugs (GNOME#336645).
|
||||
* Thu Mar 30 2006 federico@novell.com
|
||||
* Wed Mar 29 2006 federico@novell.com
|
||||
- Removed gtk2-151580-filechooser-beagle.diff.
|
||||
- Added gtk2-filechooser-new-features.diff. This fixes bug #160605,
|
||||
so the file chooser now has an optional text entry for the file
|
||||
@ -1027,13 +1041,13 @@ fi
|
||||
into the same patch.
|
||||
* Fri Mar 24 2006 rml@suse.de
|
||||
- Set default invisible char to something stetic (bug #160688)
|
||||
* Fri Mar 24 2006 federico@novell.com
|
||||
* Thu Mar 23 2006 federico@novell.com
|
||||
- Updated gtk2-151580-filechooser-beagle.diff to fix bug #156843.
|
||||
With this, the file chooser will no longer show a "Search" item in
|
||||
the "Save in folder" combo box.
|
||||
* Mon Mar 13 2006 sbrabec@suse.cz
|
||||
- Do not believe glibc first weekday (#130787, #104417).
|
||||
* Tue Mar 07 2006 zsu@suse.de
|
||||
* Mon Mar 06 2006 zsu@suse.de
|
||||
- Fixed gtkvts crash bug introduced by gtk+-2.8.6-fontsel.patch [#153099].
|
||||
* Thu Feb 23 2006 federico@novell.com
|
||||
- Updated gtk2-151580-filechooser-beagle.diff; now we hide the search
|
||||
@ -1056,7 +1070,7 @@ fi
|
||||
to translation compendium gnome-patch-translation.
|
||||
* Wed Jan 25 2006 mls@suse.de
|
||||
- converted neededforbuild to BuildRequires
|
||||
* Wed Jan 18 2006 gekker@suse.de
|
||||
* Tue Jan 17 2006 gekker@suse.de
|
||||
- Add patch to improve scrolling speed in font selection (#130159)
|
||||
* Mon Jan 16 2006 meissner@suse.de
|
||||
- use -fstack-protector.
|
||||
@ -1095,7 +1109,7 @@ fi
|
||||
* Tue Oct 11 2005 gekker@suse.de
|
||||
- Update to version 2.8.6
|
||||
- Fix return of random data
|
||||
* Wed Oct 05 2005 federico@novell.com
|
||||
* Tue Oct 04 2005 federico@novell.com
|
||||
- Added gtk2-file-chooser-consistent-home-folder-name.diff so that
|
||||
$HOME will not appear as "Home", but rather as its actual name.
|
||||
This avoids having [/][home][Home] on the path bar.
|
||||
@ -1104,7 +1118,7 @@ fi
|
||||
* Mon Oct 03 2005 gekker@suse.de
|
||||
- Update to version 2.8.4
|
||||
- Remove upstream patches
|
||||
* Fri Sep 30 2005 federico@novell.com
|
||||
* Thu Sep 29 2005 federico@novell.com
|
||||
- Added gtk2-file-chooser-create-save-widgets-only-if-needed.diff and
|
||||
gtk2-file-chooser-no-reload.diff as optimizations for the file
|
||||
chooser's startup time.
|
||||
@ -1125,11 +1139,11 @@ fi
|
||||
* Wed Aug 24 2005 rodrigo@suse.de
|
||||
- Update to version 2.8.1
|
||||
- Updated gtk+-strict-aliasing.patch.
|
||||
* Thu Aug 18 2005 gekker@suse.de
|
||||
* Wed Aug 17 2005 gekker@suse.de
|
||||
- Update version to 2.8.0 (GNOME2.12)
|
||||
* Fri Aug 12 2005 gekker@suse.de
|
||||
- Fix crash in file chooser b.g.o (310270).
|
||||
* Thu Aug 11 2005 gekker@suse.de
|
||||
* Wed Aug 10 2005 gekker@suse.de
|
||||
- Update to version 2.7.5
|
||||
- Remove upstreamed patch
|
||||
* Wed Aug 10 2005 clahey@suse.de
|
||||
@ -1152,7 +1166,7 @@ fi
|
||||
- Fixed uninitialized variable warnings.
|
||||
* Mon Jun 20 2005 sbrabec@suse.cz
|
||||
- Create icon-cache files by SuSEconfig (#88599).
|
||||
* Fri Jun 17 2005 gekker@suse.de
|
||||
* Thu Jun 16 2005 gekker@suse.de
|
||||
- Fix gtk64.patch and build on x86_64.
|
||||
* Thu Jun 16 2005 gekker@suse.de
|
||||
- Update to version 2.6.8.
|
||||
@ -1161,7 +1175,7 @@ fi
|
||||
- Use current name for XFree86-devel in Requires (#54136).
|
||||
* Mon May 02 2005 gekker@suse.de
|
||||
- Fix crasher in gtktextview (380).
|
||||
* Mon Apr 04 2005 aj@suse.de
|
||||
* Sun Apr 03 2005 aj@suse.de
|
||||
- Disable visibility to build with GCC4. This should be
|
||||
enabled again once gtk is fixed.
|
||||
* Fri Mar 18 2005 gekker@suse.de
|
||||
@ -1258,7 +1272,7 @@ fi
|
||||
- Updated to version 2.2.4.
|
||||
* Thu Aug 28 2003 sbrabec@suse.cz
|
||||
- Updated to version 2.2.3.
|
||||
* Thu Jul 24 2003 hhetter@suse.de
|
||||
* Wed Jul 23 2003 hhetter@suse.de
|
||||
- fix SuSEconfig.gtk2 query paths
|
||||
* Wed Jul 16 2003 sbrabec@suse.cz
|
||||
- SuSEconfig.gtk2: Fixed paths to query binaries.
|
||||
@ -1274,7 +1288,7 @@ fi
|
||||
- Fixed directory packaging.
|
||||
* Wed May 28 2003 sbrabec@suse.cz
|
||||
- Include manpage to devel package.
|
||||
* Wed May 28 2003 ro@suse.de
|
||||
* Tue May 27 2003 ro@suse.de
|
||||
- remove unpackaged files from buildroot
|
||||
* Thu May 22 2003 sbrabec@suse.cz
|
||||
- Fixed typo in Requires for -devel package (#27025).
|
||||
@ -1287,7 +1301,7 @@ fi
|
||||
theme problems for all session types).
|
||||
* Wed Mar 12 2003 sbrabec@suse.cz
|
||||
- Fixed prefix clash for keyboard themes (fixes bug 25086).
|
||||
* Mon Feb 10 2003 ro@suse.de
|
||||
* Sun Feb 09 2003 ro@suse.de
|
||||
- create /etc/gtk-2.0 in SuSEconfig.gtk2 if needed
|
||||
* Thu Feb 06 2003 sbrabec@suse.cz
|
||||
- Updated to version 2.2.1.
|
||||
@ -1389,7 +1403,7 @@ fi
|
||||
* Memory leak and UMR fixes
|
||||
* Misc bug fixes
|
||||
* Updated translations
|
||||
* Thu Jun 13 2002 ro@suse.de
|
||||
* Wed Jun 12 2002 ro@suse.de
|
||||
- use libpng-devel-packages in nededforbuild
|
||||
* Mon Jun 10 2002 meissner@suse.de
|
||||
- Need to use -mminimal-toc for ppc64.
|
||||
|
Loading…
Reference in New Issue
Block a user