Merge lp:~optimisme/pantheon-files/1067061 into lp:~elementary-apps/pantheon-files/trunk

[Albert]

Check if a file is remote before asking for a thumbnail, and improved/modified remote scheme test

[lp:~optimisme/pantheon-files/1067061]

1173. By Albert on 2013-05-18

added smb scheme to the list of remote schemes

[Victor Martinez (victored)]

Looks good Albert!

Generally, we prefer:

> if (condition_a
> || condition_b
> || condition_c)
> {
> // do something
> }

Over:

> if (condition_a) {
> // do something
> }
>
> if (condition_b) {
> // do something
> }
>
> if (condition_c) {
> // do something
> }

so that the code in "do something" is not repeated

We also encourage:

> if (condition_a && condition_b)
> // do something

instead of:

> if (condition_a)
> if (condition_b)
> // do something

[lp:~optimisme/pantheon-files/1067061]

1174. By Albert on 2013-05-18

fixed source style

[Cody Garver (codygarver)]

Great!

review: Approve

=== modified file 'libcore/gof-file.c'
--- libcore/gof-file.c	2013-03-07 04:19:41 +0000
+++ libcore/gof-file.c	2013-05-18 08:59:28 +0000
@@ -180,18 +180,19 @@
     /* try to determinate what appear to be remote. This is quite hazardous but gio doesn't offer any better option */
     char *scheme = g_file_get_uri_scheme (file->location);
 
-    //g_message ("%s %s", G_STRFUNC, scheme);
-    if (!strcmp (scheme, "trash")) {
-        g_free (scheme);
-        return FALSE;
-    }
-    if (!strcmp (scheme, "archive")) {
-        g_free (scheme);
-        return FALSE;
+    /* g_vfs does not have a function to know if a supported protocol is remote */
+    if (!strcmp (scheme, "afp")
+     || !strcmp (scheme, "dav")
+     || !strcmp (scheme, "davs")
+     || !strcmp (scheme, "ftp")
+     || !strcmp (scheme, "sftp")
+     || !strcmp (scheme, "smb")) { 
+        g_free (scheme);
+        return TRUE;
     }
 
     g_free (scheme);
-    return TRUE;
+    return FALSE;
 }
 
 void    gof_file_get_folder_icon_from_uri_or_path (GOFFile *file) 
 
=== modified file 'src/marlin-thumbnailer.c'
--- src/marlin-thumbnailer.c	2012-05-30 18:28:41 +0000
+++ src/marlin-thumbnailer.c	2013-05-18 08:59:28 +0000
@@ -846,8 +846,9 @@
      * processed (and awaiting to be refreshed) */
     for (lp = g_list_last (files); lp != NULL; lp = lp->prev)
     {
-        if (marlin_thumbnailer_file_is_supported (thumbnailer, lp->data))
-            supported_files = g_list_prepend (supported_files, lp->data);
+        /* 1067061 - Do not thumbnail network files */
+        if (!gof_file_is_remote_uri_scheme(lp->data) && marlin_thumbnailer_file_is_supported (thumbnailer, lp->data))
+                supported_files = g_list_prepend (supported_files, lp->data);
     }
 
     /* determine how many URIs are in the wait queue */