[gtk+] filechooserentry: Remove file_system argument
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] filechooserentry: Remove file_system argument
- Date: Fri, 16 Dec 2011 19:12:44 +0000 (UTC)
commit 9ee577d5eeadf07734f67f4a755ff7c6c3bd943c
Author: Benjamin Otte <otte redhat com>
Date: Fri Nov 4 17:02:23 2011 +0100
filechooserentry: Remove file_system argument
It's not needed anymore.
gtk/gtkfilechooserdefault.c | 2 +-
gtk/gtkfilechooserentry.c | 14 +-------------
gtk/gtkfilechooserentry.h | 3 +--
3 files changed, 3 insertions(+), 16 deletions(-)
---
diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index fb3bf66..53a3b38 100644
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -4562,7 +4562,7 @@ static void
location_entry_create (GtkFileChooserDefault *impl)
{
if (!impl->location_entry)
- impl->location_entry = _gtk_file_chooser_entry_new (impl->file_system, TRUE);
+ impl->location_entry = _gtk_file_chooser_entry_new (TRUE);
_gtk_file_chooser_entry_set_local_only (GTK_FILE_CHOOSER_ENTRY (impl->location_entry), impl->local_only);
_gtk_file_chooser_entry_set_action (GTK_FILE_CHOOSER_ENTRY (impl->location_entry), impl->action);
diff --git a/gtk/gtkfilechooserentry.c b/gtk/gtkfilechooserentry.c
index 69f5af8..7ca35c1 100644
--- a/gtk/gtkfilechooserentry.c
+++ b/gtk/gtkfilechooserentry.c
@@ -67,7 +67,6 @@ struct _GtkFileChooserEntry
GtkFileChooserAction action;
- GtkFileSystem *file_system;
GFile *base_folder;
GFile *current_folder_file;
gchar *file_part;
@@ -280,12 +279,6 @@ gtk_file_chooser_entry_dispose (GObject *object)
chooser_entry->completion_store = NULL;
}
- if (chooser_entry->file_system)
- {
- g_object_unref (chooser_entry->file_system);
- chooser_entry->file_system = NULL;
- }
-
G_OBJECT_CLASS (_gtk_file_chooser_entry_parent_class)->dispose (object);
}
@@ -1702,7 +1695,6 @@ delete_text_callback (GtkFileChooserEntry *chooser_entry,
/**
* _gtk_file_chooser_entry_new:
- * @filesystem: The #GtkFileSystem to use
* @eat_tabs: If %FALSE, allow focus navigation with the tab key.
*
* Creates a new #GtkFileChooserEntry object. #GtkFileChooserEntry
@@ -1713,15 +1705,11 @@ delete_text_callback (GtkFileChooserEntry *chooser_entry,
* Return value: the newly created #GtkFileChooserEntry
**/
GtkWidget *
-_gtk_file_chooser_entry_new (GtkFileSystem *file_system,
- gboolean eat_tabs)
+_gtk_file_chooser_entry_new (gboolean eat_tabs)
{
GtkFileChooserEntry *chooser_entry;
- g_return_val_if_fail (GTK_IS_FILE_SYSTEM (file_system), NULL);
-
chooser_entry = g_object_new (GTK_TYPE_FILE_CHOOSER_ENTRY, NULL);
- chooser_entry->file_system = g_object_ref (file_system);
chooser_entry->eat_tabs = (eat_tabs != FALSE);
return GTK_WIDGET (chooser_entry);
diff --git a/gtk/gtkfilechooserentry.h b/gtk/gtkfilechooserentry.h
index 0c812d3..f01e47b 100644
--- a/gtk/gtkfilechooserentry.h
+++ b/gtk/gtkfilechooserentry.h
@@ -33,8 +33,7 @@ G_BEGIN_DECLS
typedef struct _GtkFileChooserEntry GtkFileChooserEntry;
GType _gtk_file_chooser_entry_get_type (void) G_GNUC_CONST;
-GtkWidget * _gtk_file_chooser_entry_new (GtkFileSystem *file_system,
- gboolean eat_tab);
+GtkWidget * _gtk_file_chooser_entry_new (gboolean eat_tab);
void _gtk_file_chooser_entry_set_action (GtkFileChooserEntry *chooser_entry,
GtkFileChooserAction action);
GtkFileChooserAction _gtk_file_chooser_entry_get_action (GtkFileChooserEntry *chooser_entry);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]