gtk+ r21893 - in branches/gtk-2-14: . gtk

[matthiasc svn gnome org]

Author: matthiasc
Date: Sun Dec 14 00:34:08 2008
New Revision: 21893
URL: http://svn.gnome.org/viewvc/gtk+?rev=21893&view=rev

Log:
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



Modified:
   branches/gtk-2-14/ChangeLog
   branches/gtk-2-14/gtk/gtkfilechooserdefault.c

Modified: branches/gtk-2-14/gtk/gtkfilechooserdefault.c
==============================================================================
--- branches/gtk-2-14/gtk/gtkfilechooserdefault.c	(original)
+++ branches/gtk-2-14/gtk/gtkfilechooserdefault.c	Sun Dec 14 00:34:08 2008
@@ -5309,7 +5309,8 @@
 	  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