--- thunar/thunar-file.c.orig	2015-05-22 13:25:36 UTC

+++ thunar/thunar-file.c

@@ -3225,17 +3225,11 @@ thunar_file_is_chmodable (const ThunarFile *file)

    *   b) the super-user id

    * and the file is not in the trash.

    */

-  if (file->info == NULL)

-    {

-      return (effective_user_id == 0 && !thunar_file_is_trashed (file));

-    }

-  else

-    {

-      return ((effective_user_id == 0 

-               || effective_user_id == g_file_info_get_attribute_uint32 (file->info,

-                                                                         G_FILE_ATTRIBUTE_UNIX_UID))

-              && !thunar_file_is_trashed (file));

-    }

+  if (thunar_file_is_trashed (file))

+      return (FALSE);

+  if (effective_user_id == 0)

+      return (TRUE);

+  return (thunar_file_is_writable (file));

 }

--- thunar/thunar-sendto-model.c

+++ thunar/thunar-sendto-model.c

@@ -121,7 +121,9 @@ g_app_info_compare (gpointer a,

 static void

 thunar_sendto_model_load (ThunarSendtoModel *sendto_model)

 {

+#ifdef HAVE_GIO_UNIX

   GDesktopAppInfo *app_info = NULL;

+#endif

   gchar          **specs;

   gchar           *path;

   guint            n;

@@ -146,9 +148,6 @@ thunar_sendto_model_load (ThunarSendtoModel *sendto_model)

 #ifdef HAVE_GIO_UNIX

           app_info = g_desktop_app_info_new_from_keyfile (key_file);

-#else

-          /* FIXME try to create the app info ourselves in a platform independent way */

-#endif

           if (G_LIKELY (app_info != NULL))

             {

@@ -165,6 +164,9 @@ thunar_sendto_model_load (ThunarSendtoModel *sendto_model)

               if (mime_types != NULL)

                 g_object_set_data_full (G_OBJECT (app_info), "mime-types", mime_types, (GDestroyNotify) g_strfreev);

             }

+#else

+          /* FIXME try to create the app info ourselves in a platform independent way */

+#endif

           g_key_file_free (key_file);

         }