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

Proposed by Albert
Status: Merged
Merged at revision: 1180
Proposed branch: lp:~optimisme/pantheon-files/fix-1177087
Merge into: lp:~elementary-apps/pantheon-files/trunk
Diff against target: 46 lines (+6/-2)
2 files modified
libcore/gof-file.c (+3/-2)
src/marlin-connect-server-dialog.c (+3/-0)
To merge this branch: bzr merge lp:~optimisme/pantheon-files/fix-1177087
Reviewer Review Type Date Requested Status
Victor Martinez (community) Approve
Cody Garver (community) Needs Information
Review via email: mp+164546@code.launchpad.net

Description of the change

Added AFP protocol to network connection list
Fixed "icons" for AFP protocol when user is connecting

To post a comment you must log in.
Revision history for this message
Albert (optimisme) wrote :

I only have access to SFTP and AFP servers. Both are working fine after the fixes ...

I have tested AFP with OSX Server, Time Capsule and Linux' NetaTalk it is working fine with all of them.

Revision history for this message
Cody Garver (codygarver) wrote :

What am I doing wrong here? It just loads infinitely.

http://img801.imageshack.us/img801/5271/screenshotfrom201305180.png

review: Needs Information
Revision history for this message
Victor Martinez (victored) wrote :

Looks good. Please correct any issues with coding style and remove the code that is commented out. I'll approve since api-wise this should work with GIO, given that you're providing a supported and valid URI scheme.

Cody will handle testing.

BTW Albert, what about port 427?

review: Approve
Revision history for this message
Victor Martinez (victored) wrote :

Oh nevermind, we can only provide a single default port for obvious reasons

1174. By Albert

fixed source style

1175. By Albert

fixed source style

Revision history for this message
Albert (optimisme) wrote :

> What am I doing wrong here? It just loads infinitely.
>
> http://img801.imageshack.us/img801/5271/screenshotfrom201305180.png

Hi Cody,

I don't know, if you execute 'pantheon-files' from the command line it will show "log lines". It can be anything, from slow connection to unaccepted remote connections from OSX.

Albert

Revision history for this message
Albert (optimisme) wrote :

Hi Cody,

I checked my OSX server configuration, it is just:

"File Sharing" with "AFP" activated for "Users", "Public Folders" and an specific list of users...

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'icons/thumbnail_frame.png'
2Binary files icons/thumbnail_frame.png 2010-11-13 23:10:54 +0000 and icons/thumbnail_frame.png 2013-05-18 10:24:25 +0000 differ
3=== modified file 'libcore/gof-file.c'
4--- libcore/gof-file.c 2013-05-18 08:57:15 +0000
5+++ libcore/gof-file.c 2013-05-18 10:24:25 +0000
6@@ -410,8 +410,10 @@
7 file->formated_modified = gof_file_get_formated_time (file, G_FILE_ATTRIBUTE_TIME_MODIFIED);
8
9 /* icon */
10- if (file->is_directory && g_file_is_native (file->location)) {
11+ if (file->is_directory) {
12 gof_file_get_folder_icon_from_uri_or_path (file);
13+ } else if (g_file_info_get_file_type(file->info) == G_FILE_TYPE_MOUNTABLE) {
14+ file->icon = g_themed_icon_new_with_default_fallbacks ("folder-remote-symbolic");
15 } else {
16 const gchar *ftype = gof_file_get_ftype (file);
17 if (ftype != NULL && file->icon == NULL)
18@@ -2322,7 +2324,6 @@
19 g_return_val_if_fail (file->info != NULL, NULL);
20
21 const char *ftype = NULL;
22-
23 if (g_file_info_has_attribute (file->info, G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE))
24 return g_file_info_get_attribute_string (file->info, G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE);
25 if (g_file_info_has_attribute (file->info, G_FILE_ATTRIBUTE_STANDARD_FAST_CONTENT_TYPE))
26
27=== modified file 'src/marlin-connect-server-dialog.c'
28--- src/marlin-connect-server-dialog.c 2012-02-05 16:29:37 +0000
29+++ src/marlin-connect-server-dialog.c 2013-05-18 10:24:25 +0000
30@@ -110,6 +110,7 @@
31 { "sftp", SHOW_PORT | SHOW_USER, 22 },
32 { "ftp", SHOW_PORT | SHOW_USER, 21 },
33 { "ftp", DEFAULT_METHOD | IS_ANONYMOUS | SHOW_PORT, 21 },
34+ { "afp", SHOW_PORT | SHOW_USER, 548 },
35 { "smb", SHOW_SHARE | SHOW_USER | SHOW_DOMAIN, 0 },
36 { "dav", SHOW_PORT | SHOW_USER, 80 },
37 /* FIXME: hrm, shouldn't it work? */
38@@ -128,6 +129,8 @@
39 } else {
40 return _("FTP (with login)");
41 }
42+ } else if (strcmp (meth->scheme, "afp") == 0) {
43+ return _("AFP (Apple Filing Protocol)");
44 } else if (strcmp (meth->scheme, "smb") == 0) {
45 return _("Windows share");
46 } else if (strcmp (meth->scheme, "dav") == 0) {

Subscribers

People subscribed via source and target branches

to all changes: