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

[Albert]

Added AFP protocol to server connection list.

Only "src/marlin-connect-server-dialog.c" modified.

[Cody Garver (codygarver)]

I need to boot up my Mac soon and test this out.

[Albert (optimisme)]

> I need to boot up my Mac soon and test this out.

Hi Cody,

It works but it shows the "folders" as "unknown files", I will add a new bug as soon as this source is merged. Then,, I will try to fix it ...

Also, I don't know how to add text to the translations list, is as easy as adding the _("AFP") entry?

Thanks,

Albert

[Albert (optimisme)]

Hi Cody, can you test this source? When merged I will continue improving this functionality ...

[Cody Garver (codygarver)]

That's the right way to add translations.

Fix the Unknown Files bug and it can probably be merged. We can't have more in-progress code in trunk.

I suspect the Uknown Files bug is why this was not already present.

review: Needs Fixing

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

1173. By Albert on 2013-05-17

Fixed network and remote folder icons for AFP protocol

1174. By Albert on 2013-05-18

fixed source style

1175. By Albert on 2013-05-18

fixed source style

=== modified file 'icons/thumbnail_frame.png'
 Binary files icons/thumbnail_frame.png	2010-11-13 23:10:54 +0000 and icons/thumbnail_frame.png	2013-05-18 09:26:24 +0000 differ
=== modified file 'libcore/gof-file.c'
--- libcore/gof-file.c	2013-05-18 08:57:15 +0000
+++ libcore/gof-file.c	2013-05-18 09:26:24 +0000
@@ -410,8 +410,10 @@
     file->formated_modified = gof_file_get_formated_time (file, G_FILE_ATTRIBUTE_TIME_MODIFIED);
 
     /* icon */
-    if (file->is_directory && g_file_is_native (file->location)) {
+    if (file->is_directory) { 
         gof_file_get_folder_icon_from_uri_or_path (file);
+    } else if (g_file_info_get_file_type(file->info) == G_FILE_TYPE_MOUNTABLE) { 
+        file->icon = g_themed_icon_new_with_default_fallbacks ("folder-remote-symbolic");
     } else {
         const gchar *ftype = gof_file_get_ftype (file);
         if (ftype != NULL && file->icon == NULL)
@@ -2322,7 +2324,6 @@
     g_return_val_if_fail (file->info != NULL, NULL);
 
     const char *ftype = NULL;
-    
     if (g_file_info_has_attribute (file->info, G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE))
         return g_file_info_get_attribute_string (file->info, G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE);
     if (g_file_info_has_attribute (file->info, G_FILE_ATTRIBUTE_STANDARD_FAST_CONTENT_TYPE))
 
=== modified file 'src/marlin-connect-server-dialog.c'
--- src/marlin-connect-server-dialog.c	2012-02-05 16:29:37 +0000
+++ src/marlin-connect-server-dialog.c	2013-05-18 09:26:24 +0000
@@ -110,6 +110,7 @@
     { "sftp",  SHOW_PORT | SHOW_USER, 22 },
     { "ftp",  SHOW_PORT | SHOW_USER, 21 },
     { "ftp",  DEFAULT_METHOD | IS_ANONYMOUS | SHOW_PORT, 21 },
+    { "afp",  SHOW_PORT | SHOW_USER, 548 },
     { "smb",  SHOW_SHARE | SHOW_USER | SHOW_DOMAIN, 0 },
     { "dav",  SHOW_PORT | SHOW_USER, 80 },
     /* FIXME: hrm, shouldn't it work? */
@@ -128,6 +129,8 @@
         } else {
             return _("FTP (with login)");
         }
+    } else if (strcmp (meth->scheme, "afp") == 0) { 
+        return _("AFP (Apple Filing Protocol)");
     } else if (strcmp (meth->scheme, "smb") == 0) {
         return _("Windows share");
     } else if (strcmp (meth->scheme, "dav") == 0) {