summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFederico Mena Quintero <federico@gnome.org>2011-11-29 15:07:01 -0600
committerFederico Mena Quintero <federico@gnome.org>2011-11-29 15:11:54 -0600
commit463c98a9d7fccc257cd55e60ef67cad0e27895e1 (patch)
tree9ca5a81787e0ebfedfaea6f5e193022878853559
parent58d247d7ae71bd2c830f02491fa163d795e23c0a (diff)
downloadgtk+-463c98a9d7fccc257cd55e60ef67cad0e27895e1.tar.gz
[GtkPathBar] Remove unused error argument
It used to be that _gtk_path_bar_set_file() would return an error if it wasn't able to switch to the specified file, but that hasn't been the case for a long while now, since the file chooser became async. Signed-off-by: Federico Mena Quintero <federico@gnome.org>
-rw-r--r--gtk/gtkfilechooserdefault.c5
-rw-r--r--gtk/gtkpathbar.c13
-rw-r--r--gtk/gtkpathbar.h5
3 files changed, 9 insertions, 14 deletions
diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index 0f65fc93cf..e83411479a 100644
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -5293,7 +5293,7 @@ put_recent_folder_in_pathbar (GtkFileChooserDefault *impl, GtkTreeIter *iter)
gtk_tree_model_get (GTK_TREE_MODEL (impl->recent_model), iter,
MODEL_COL_FILE, &file,
-1);
- _gtk_path_bar_set_file (GTK_PATH_BAR (impl->browse_path_bar), file, FALSE, NULL); /* NULL-GError */
+ _gtk_path_bar_set_file (GTK_PATH_BAR (impl->browse_path_bar), file, FALSE);
g_object_unref (file);
}
@@ -7307,8 +7307,7 @@ update_current_folder_get_info_cb (GCancellable *cancellable,
if (! _gtk_file_info_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))
- goto out;
+ _gtk_path_bar_set_file (GTK_PATH_BAR (impl->browse_path_bar), data->file, data->keep_trail);
if (impl->current_folder != data->file)
{
diff --git a/gtk/gtkpathbar.c b/gtk/gtkpathbar.c
index d1afca68f3..8e165cb7fa 100644
--- a/gtk/gtkpathbar.c
+++ b/gtk/gtkpathbar.c
@@ -1849,22 +1849,21 @@ gtk_path_bar_get_info_callback (GCancellable *cancellable,
file_info);
}
-gboolean
+void
_gtk_path_bar_set_file (GtkPathBar *path_bar,
GFile *file,
- const gboolean keep_trail,
- GError **error)
+ const gboolean keep_trail)
{
struct SetFileInfo *info;
- g_return_val_if_fail (GTK_IS_PATH_BAR (path_bar), FALSE);
- g_return_val_if_fail (G_IS_FILE (file), FALSE);
+ g_return_if_fail (GTK_IS_PATH_BAR (path_bar));
+ g_return_if_fail (G_IS_FILE (file));
/* Check whether the new path is already present in the pathbar as buttons.
* This could be a parent directory or a previous selected subdirectory.
*/
if (keep_trail && gtk_path_bar_check_parent_path (path_bar, file))
- return TRUE;
+ return;
info = g_new0 (struct SetFileInfo, 1);
info->file = g_object_ref (file);
@@ -1881,8 +1880,6 @@ _gtk_path_bar_set_file (GtkPathBar *path_bar,
"standard::display-name,standard::is-hidden,standard::is-backup",
gtk_path_bar_get_info_callback,
info);
-
- return TRUE;
}
/* FIXME: This should be a construct-only property */
diff --git a/gtk/gtkpathbar.h b/gtk/gtkpathbar.h
index 2006411a0a..49312f2c3b 100644
--- a/gtk/gtkpathbar.h
+++ b/gtk/gtkpathbar.h
@@ -84,10 +84,9 @@ struct _GtkPathBarClass
GType gtk_path_bar_get_type (void) G_GNUC_CONST;
void _gtk_path_bar_set_file_system (GtkPathBar *path_bar,
GtkFileSystem *file_system);
-gboolean _gtk_path_bar_set_file (GtkPathBar *path_bar,
+void _gtk_path_bar_set_file (GtkPathBar *path_bar,
GFile *file,
- gboolean keep_trail,
- GError **error);
+ gboolean keep_trail);
void _gtk_path_bar_up (GtkPathBar *path_bar);
void _gtk_path_bar_down (GtkPathBar *path_bar);