callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

filechooserentry: Remove file_system argument

Browse Source 
It's not needed anymore.
This commit is contained in:
Benjamin Otte
2011-11-04 17:02:23 +01:00
parent c3da748cb2
commit 9ee577d5ee
3 changed files with 3 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gtk/gtkfilechooserdefault.c
View File

@ -4562,7 +4562,7 @@ static void
location_entry_create (GtkFileChooserDefault *impl) location_entry_create (GtkFileChooserDefault *impl)
{ {
if (!impl->location_entry) 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_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); _gtk_file_chooser_entry_set_action (GTK_FILE_CHOOSER_ENTRY (impl->location_entry), impl->action);

14
gtk/gtkfilechooserentry.c
View File

@ -67,7 +67,6 @@ struct _GtkFileChooserEntry
GtkFileChooserAction action; GtkFileChooserAction action;
GtkFileSystem *file_system;
GFile *base_folder; GFile *base_folder;
GFile *current_folder_file; GFile *current_folder_file;
gchar *file_part; gchar *file_part;
@ -280,12 +279,6 @@ gtk_file_chooser_entry_dispose (GObject *object)
chooser_entry->completion_store = NULL; 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); 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: * _gtk_file_chooser_entry_new:
* @filesystem: The #GtkFileSystem to use
* @eat_tabs: If %FALSE, allow focus navigation with the tab key. * @eat_tabs: If %FALSE, allow focus navigation with the tab key.
* *
* Creates a new #GtkFileChooserEntry object. #GtkFileChooserEntry * Creates a new #GtkFileChooserEntry object. #GtkFileChooserEntry
@ -1713,15 +1705,11 @@ delete_text_callback (GtkFileChooserEntry *chooser_entry,
* Return value: the newly created #GtkFileChooserEntry * Return value: the newly created #GtkFileChooserEntry
**/ **/
GtkWidget * GtkWidget *
_gtk_file_chooser_entry_new (GtkFileSystem *file_system, _gtk_file_chooser_entry_new (gboolean eat_tabs)
gboolean eat_tabs)
{ {
GtkFileChooserEntry *chooser_entry; 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 = 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); chooser_entry->eat_tabs = (eat_tabs != FALSE);
return GTK_WIDGET (chooser_entry); return GTK_WIDGET (chooser_entry);

3
gtk/gtkfilechooserentry.h
View File

@ -33,8 +33,7 @@ G_BEGIN_DECLS
typedef struct _GtkFileChooserEntry GtkFileChooserEntry; typedef struct _GtkFileChooserEntry GtkFileChooserEntry;
GType _gtk_file_chooser_entry_get_type (void) G_GNUC_CONST; GType _gtk_file_chooser_entry_get_type (void) G_GNUC_CONST;
GtkWidget * _gtk_file_chooser_entry_new (GtkFileSystem *file_system, GtkWidget * _gtk_file_chooser_entry_new (gboolean eat_tab);
gboolean eat_tab);
void _gtk_file_chooser_entry_set_action (GtkFileChooserEntry *chooser_entry, void _gtk_file_chooser_entry_set_action (GtkFileChooserEntry *chooser_entry,
GtkFileChooserAction action); GtkFileChooserAction action);
GtkFileChooserAction _gtk_file_chooser_entry_get_action (GtkFileChooserEntry *chooser_entry); GtkFileChooserAction _gtk_file_chooser_entry_get_action (GtkFileChooserEntry *chooser_entry);