Bug 556233 – local-only causes G_IS_FILE warning

2008-12-13  Matthias Clasen  <mclasen@redhat.com>

        Bug 556233 – local-only causes G_IS_FILE warning

        * gtk/gktfilechooserdefault.c (set_local_only): Avoid a warning
        in tests. Patch by Christian Dywan


svn path=/branches/gtk-2-14/; revision=21893
This commit is contained in:
Matthias Clasen
2008-12-14 00:34:08 +00:00
committed by Matthias Clasen
parent 3313fffcbb
commit 05b4d62854
2 changed files with 11 additions and 1 deletions

View File

@@ -1,3 +1,12 @@
2008-12-13 Matthias Clasen <mclasen@redhat.com>
Merged from trunk:
Bug 556233 local-only causes G_IS_FILE warning
* gtk/gktfilechooserdefault.c (set_local_only): Avoid a warning
in tests. Patch by Christian Dywan
2008-12-13 Matthias Clasen <mclasen@redhat.com>
Merged from trunk:

View File

@@ -5309,7 +5309,8 @@ set_local_only (GtkFileChooserDefault *impl,
shortcuts_add_bookmarks (impl);
}
if (local_only && !g_file_is_native (impl->current_folder))
if (local_only && impl->current_folder &&
!g_file_is_native (impl->current_folder))
{
/* If we are pointing to a non-local folder, make an effort to change
* back to a local folder, but it's really up to the app to not cause