diff options
author | Benjamin Otte <otte@redhat.com> | 2011-11-05 03:53:32 +0100 |
---|---|---|
committer | Benjamin Otte <otte@redhat.com> | 2011-12-16 20:09:12 +0100 |
commit | e2105c2befc3c0a10ccb5223714f1a68ee1b4c0b (patch) | |
tree | 64df6256a8087e1618b4a61693d3dfc64e1fb7d6 /gtk/gtkfilechooserdefault.c | |
parent | 5c42972735d4819f32ee78141fed249e8366f154 (diff) | |
download | gtk+-e2105c2befc3c0a10ccb5223714f1a68ee1b4c0b.tar.gz |
filechooserentry: Modify _gtk_file_chooser_entry_get_current_folder()
The new version does not need to muck with the entry, it just extracts
the required information. It returns a reference to the folder though,
as we extract the information now instead of returning something stored.
Diffstat (limited to 'gtk/gtkfilechooserdefault.c')
-rw-r--r-- | gtk/gtkfilechooserdefault.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c index 53a3b38bfd..8616b76ce4 100644 --- a/gtk/gtkfilechooserdefault.c +++ b/gtk/gtkfilechooserdefault.c @@ -7640,7 +7640,7 @@ check_save_entry (GtkFileChooserDefault *impl, if (!file_part || file_part[0] == '\0') { - *file_ret = g_object_ref (current_folder); + *file_ret = current_folder; *is_well_formed_ret = TRUE; *is_file_part_empty_ret = TRUE; *is_folder = TRUE; @@ -7652,6 +7652,7 @@ check_save_entry (GtkFileChooserDefault *impl, error = NULL; file = g_file_get_child_for_display_name (current_folder, file_part, &error); + g_object_unref (current_folder); if (!file) { @@ -8953,7 +8954,7 @@ gtk_file_chooser_default_should_respond (GtkFileChooserEmbed *chooser_embed) data = g_new0 (struct FileExistsData, 1); data->impl = g_object_ref (impl); data->file = g_object_ref (file); - data->parent_file = g_object_ref (_gtk_file_chooser_entry_get_current_folder (entry)); + data->parent_file = _gtk_file_chooser_entry_get_current_folder (entry); if (impl->file_exists_get_info_cancellable) g_cancellable_cancel (impl->file_exists_get_info_cancellable); |