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

[tbzatek svn gnome org]

Author: tbzatek
Date: Mon Dec 15 16:05:37 2008
New Revision: 21905
URL: http://svn.gnome.org/viewvc/gtk+?rev=21905&view=rev

Log:
2008-12-15  Tomas Bzatek  <tbzatek redhat com> 

        * gtk/gtkfilechooserdefault.c: (list_row_activated):
        * gtk/gtkfilesystem.c: (_gtk_file_info_consider_as_directory):
        Mask G_FILE_TYPE_SHORTCUT as a directory (#561494)



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

Modified: branches/gtk-2-14/gtk/gtkfilechooserdefault.c
==============================================================================
--- branches/gtk-2-14/gtk/gtkfilechooserdefault.c	(original)
+++ branches/gtk-2-14/gtk/gtkfilechooserdefault.c	Mon Dec 15 16:05:37 2008
@@ -10649,7 +10649,8 @@
 	    const gchar *target_uri;
 
             file = _gtk_file_system_model_get_file (impl->browse_files_model, &child_iter);
-            if (g_file_info_get_file_type (info) == G_FILE_TYPE_MOUNTABLE) 
+            if (g_file_info_get_file_type (info) == G_FILE_TYPE_MOUNTABLE ||
+                g_file_info_get_file_type (info) == G_FILE_TYPE_SHORTCUT) 
               {
                 target_uri = g_file_info_get_attribute_string (info, G_FILE_ATTRIBUTE_STANDARD_TARGET_URI);
                 if (target_uri)

Modified: branches/gtk-2-14/gtk/gtkfilesystem.c
==============================================================================
--- branches/gtk-2-14/gtk/gtkfilesystem.c	(original)
+++ branches/gtk-2-14/gtk/gtkfilesystem.c	Mon Dec 15 16:05:37 2008
@@ -1803,6 +1803,7 @@
   GFileType type = g_file_info_get_file_type (info);
   
   return (type == G_FILE_TYPE_DIRECTORY ||
-          type == G_FILE_TYPE_MOUNTABLE);
+          type == G_FILE_TYPE_MOUNTABLE ||
+          type == G_FILE_TYPE_SHORTCUT);
 }