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

[Albert]

- Mounting network drives now works! Bug #998555.
- Added a "Connect to server" banner to fix bug #995762.
- Added a "Connect to Server" right click option for "Entire network".
- Removed "Connect to Server" from appmenu.

- Added a button "Connect to server" at the "network" folder (like the Empty trash at Trash)
- Added a right click option for "Entire network" with "Connect to Server"
- Removed "Connect to server" from Menu

[Cody Garver (codygarver)]

"Connecto to Server..." to "Connect to Server..."

review: Needs Fixing

[lp:~optimisme/pantheon-files/fix-995762]

1193. By Albert on 2013-05-25

changed connecto to connect

[Victor Martinez (victored)]

Superb work!

A couple of suggestions:

* Instead of the new marlin.vapi file, "extern void marlin_connect_server_dialog (Gtk.Widget widget);" could be added to plugin.vala
* Coding style for vala code: http://master.elementaryos.org/docs/code/code-style
* Coding style for C code: follow style of source file.
* Remove the related code from pantheon-files-ui.xml instead of commenting it out. Having dead code is not desired.

Everything else seems nicely done.

review: Needs Fixing

[lp:~optimisme/pantheon-files/fix-995762]

1194. By Albert on 2013-05-26

small style fixes

[Albert (optimisme)]

Hi Victor:

- I don't know how to use "extern void" if you have an example of it I will be pleased to learn from it and change my source.
- I fixed the "vala" line jump styles, I copied my source from the other plugins and I assumed their source was properly styled.
- I do not see important style differences with my source and the rest of the c files, in fact I copied/pasted most of the source from the "trash" functions.
- I removed the non used source from "pantheon-files-ui.xml"

[Victor Martinez (victored)]

Albert, thank you very much for adding the corrections. Here's how to use extern: lp:~elementary-apps/pantheon-files/network-places

[lp:~optimisme/pantheon-files/fix-995762]

1195. By Albert on 2013-05-27

replaced cserver by network-places

1196. By Albert on 2013-05-27

merged with victor suggestions and fixed bug 998555

1197. By Albert on 2013-05-27

merged with victor suggestions and fixed bug 998555

[Albert (optimisme)]

Hi Victor,

- I added your code suggestions and I am using the new "gof_file_is_network_uri_scheme" and "gof_file_is_smb_uri_scheme" functions

- The plugin is also using "network-places" instead of "marlin-cserver"

- I fixed the bug number "998555" in this code and removed the other branch because I don't want to fix merge problems with small changes.

[Victor Martinez (victored)]

Albert,

fantastic work!

I don't mind the fact that you've merged the fixes into a single branch, since they are closely related.

I have no objections code-wise. Just some coding-style suggestions (diff line numbers):

- 156: indentation misalignment.
- 258: add spaces before opening parenthesis.
- 355: align "item" and "sidebar" vertically.
- 369: Use the respective Unicode character instead of three dots "..." => "…", as in network-places/plugin.vala.

I also preferred your single call to gof_file_is_root_network_folder from the other merge request instead of calling the two methods I suggested (diff line 258). Feel free to re-add your method to gof-file.c and marlincore-C.vapi, even if it's just a wrapper for gof_file_is_smb_uri_scheme and gof_file_is_network_uri_scheme.

I'm approving now since these issues are not critical, but it'd be great if you could land these changes before merging.

review: Approve

[lp:~optimisme/pantheon-files/fix-995762]

1198. By Albert on 2013-05-27

final fixes

[Albert (optimisme)]

Hi Victor,

Fixes commited, let's see if Luna can have local network connections soon!

[Cody Garver (codygarver)]

This is great!

review: Approve

=== modified file 'libcore/gof-file.c'
--- libcore/gof-file.c	2013-05-19 05:37:59 +0000
+++ libcore/gof-file.c	2013-05-27 22:35:30 +0000
@@ -174,27 +174,54 @@
     file->can_unmount = FALSE;
 }
 
-gboolean
-gof_file_is_remote_uri_scheme (GOFFile *file)
+static gboolean
+gof_file_compare_uri_schemes (GOFFile *file, const char **schemes)
 {
-    /* try to determinate what appear to be remote. This is quite hazardous but gio doesn't offer any better option */
+    int iterator;
     char *scheme = g_file_get_uri_scheme (file->location);
 
-    /* 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;
+    for (iterator = 0; iterator < G_N_ELEMENTS (schemes); iterator++) {
+        if (!strcmp (scheme, schemes[iterator])) {
+            g_free (scheme);
+            return TRUE;
+        }
     }
 
     g_free (scheme);
     return FALSE;
 }
 
+gboolean
+gof_file_is_remote_uri_scheme (GOFFile *file)
+{
+    if (gof_file_is_root_network_folder (file))
+        return TRUE;
+
+    const char* SCHEMES[] = { "afp", "dav", "davs", "ftp", "sftp" };
+    return gof_file_compare_uri_schemes (file, SCHEMES);
+}
+
+gboolean
+gof_file_is_root_network_folder (GOFFile *file)
+{
+    if (gof_file_is_network_uri_scheme (file) || gof_file_is_smb_uri_scheme (file))
+        return TRUE;
+}
+
+gboolean
+gof_file_is_network_uri_scheme (GOFFile *file)
+{
+    const char* SCHEMES[] = { "network" };
+    return gof_file_compare_uri_schemes (file, SCHEMES);
+}
+
+gboolean
+gof_file_is_smb_uri_scheme (GOFFile *file)
+{
+    const char* SCHEMES[] = { "smb" };
+    return gof_file_compare_uri_schemes (file, SCHEMES);
+}
+
 void    gof_file_get_folder_icon_from_uri_or_path (GOFFile *file) 
 {
     if (!file->is_hidden && file->uri != NULL && file->icon == NULL) {
@@ -413,7 +440,7 @@
     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");
+        file->icon = g_themed_icon_new_with_default_fallbacks ("folder-remote");
     } else {
         const gchar *ftype = gof_file_get_ftype (file);
         if (ftype != NULL && file->icon == NULL)

=== modified file 'libcore/gof-file.h'
--- libcore/gof-file.h	2012-05-30 18:07:43 +0000
+++ libcore/gof-file.h	2013-05-27 22:35:30 +0000
@@ -153,7 +153,7 @@
 	GOFFileOperationCallback callback;
 	gpointer callback_data;
 	gboolean is_rename;
-	
+
 	gpointer data;
 	GDestroyNotify free_data;
 } GOFFileOperation;
@@ -253,6 +253,9 @@
 gboolean        gof_file_can_unmount (GOFFile *file);
 
 gboolean        gof_file_is_remote_uri_scheme (GOFFile *file);
+gboolean        gof_file_is_root_network_folder (GOFFile *file);
+gboolean        gof_file_is_network_uri_scheme (GOFFile *file);
+gboolean        gof_file_is_smb_uri_scheme (GOFFile *file);
 gboolean        gof_file_thumb_can_frame (GOFFile *file);
 
 G_END_DECLS

=== modified file 'libcore/marlincore-C.vapi'
--- libcore/marlincore-C.vapi	2012-06-02 10:39:14 +0000
+++ libcore/marlincore-C.vapi	2013-05-27 22:35:30 +0000
@@ -118,7 +118,7 @@
 namespace GOF {
 
     [CCode (cheader_filename = "gof-file.h")]
-    public class File : GLib.Object { 
+    public class File : GLib.Object {
         [CCode (cheader_filename = "gof-file.h")]
         enum ThumbState {
             READY
@@ -159,7 +159,7 @@
         public bool is_trashed();
         public bool link_known_target;
         public uint flags;
-        
+
         public unowned string get_display_name ();
         public unowned GLib.File get_target_location ();
         public unowned string get_ftype ();
@@ -196,6 +196,8 @@
         public static int compare_by_display_name (File file1, File file2);
 
         public bool is_remote_uri_scheme ();
+        public bool is_network_uri_scheme ();
+        public bool is_smb_uri_scheme ();
     }
 
     [CCode (cheader_filename = "gof-file.h")]
@@ -204,7 +206,7 @@
         NONE,
         USE_THUMBNAILS
     }
-    
+
     [CCode (cheader_filename = "gof-abstract-slot.h")]
     public class AbstractSlot : GLib.Object {
         public void add_extra_widget(Gtk.Widget widget);

=== modified file 'plugins/CMakeLists.txt'
--- plugins/CMakeLists.txt	2013-04-22 10:28:47 +0000
+++ plugins/CMakeLists.txt	2013-05-27 22:35:30 +0000
@@ -1,3 +1,4 @@
 add_subdirectory(contractor)
 add_subdirectory(marlin-trash)
 add_subdirectory(marlin-ctags)
+add_subdirectory(network-places)

=== added directory 'plugins/network-places'
=== added file 'plugins/network-places/CMakeLists.txt'
--- plugins/network-places/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ plugins/network-places/CMakeLists.txt	2013-05-27 22:35:30 +0000
@@ -0,0 +1,37 @@
+# Check http://elementaryos.org/docs/developer-guide/cmake for documentation
+
+set(PLUGIN_LIB_NAME "network-places")
+
+find_package(PkgConfig)
+pkg_check_modules(DEPS REQUIRED
+    gtk+-3.0
+    gee-1.0
+)
+
+set(CFLAGS ${DEPS_CFLAGS} ${DEPS_CFLAGS_OTHER})
+
+include_directories(${CMAKE_SOURCE_DIR}/libcore/)
+include_directories(${CMAKE_BINARY_DIR}/libcore/)
+
+vala_precompile(VALA_C marlincserver
+    plugin.vala
+PACKAGES
+    gtk+-3.0
+    gee-1.0
+    marlincore-C
+    marlincore
+OPTIONS
+    --thread
+    --vapidir=${CMAKE_SOURCE_DIR}/libcore/
+    --vapidir=${CMAKE_SOURCE_DIR}/plugins/marlin-cserver/
+    --vapidir=${CMAKE_BINARY_DIR}/libcore/
+)
+add_definitions(${CFLAGS} "-DGETTEXT_PACKAGE=\"pantheon-files\"")
+
+link_directories(${LIB_PATHS})
+
+add_library(${PLUGIN_LIB_NAME} SHARED ${VALA_C})
+target_link_libraries(${PLUGIN_LIB_NAME} ${DEPS_LIBRARIES} marlincore)
+install(TARGETS ${PLUGIN_LIB_NAME} DESTINATION lib/pantheon-files/plugins/core/)
+install(FILES ${PLUGIN_LIB_NAME}.plug DESTINATION lib/pantheon-files/plugins/core/)
+include_directories(${CMAKE_BINARY_DIR}/plugins/)

=== added file 'plugins/network-places/network-places.plug'
--- plugins/network-places/network-places.plug	1970-01-01 00:00:00 +0000
+++ plugins/network-places/network-places.plug	2013-05-27 22:35:30 +0000
@@ -0,0 +1,3 @@
+[Plugin]
+Name=Connect to server!
+File=libnetwork-places.so

=== added file 'plugins/network-places/plugin.vala'
--- plugins/network-places/plugin.vala	1970-01-01 00:00:00 +0000
+++ plugins/network-places/plugin.vala	2013-05-27 22:35:30 +0000
@@ -0,0 +1,49 @@
+/*
+ *
+ * Marlin is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Marlin is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+// See src/marlin-connect-server-dialog.c
+extern void marlin_connect_server_dialog_show (Gtk.Widget widget);
+
+public class Files.Plugins.NetworkInfobar : Gtk.InfoBar {
+    public NetworkInfobar () {
+        message_type = Gtk.MessageType.INFO;
+        add_button (_("Connect to Server…"), 0);
+    }
+
+    public override void response (int response_id) {
+        marlin_connect_server_dialog_show (this);
+    }
+}
+
+public class Files.Plugins.NetworkPlaces : Marlin.Plugins.Base {
+    public override void directory_loaded (void* user_data) {
+        var file = ((Object[]) user_data)[2] as GOF.File;
+        return_if_fail (file != null);
+
+        if (file.is_network_uri_scheme ()) {
+            var slot = ((Object[]) user_data)[1] as GOF.AbstractSlot;
+            return_if_fail (slot != null);
+
+            var infobar = new NetworkInfobar ();
+            slot.add_extra_widget (infobar);
+            infobar.show_all ();
+        }
+    }
+}
+
+public Marlin.Plugins.Base module_init () {
+    return new Files.Plugins.NetworkPlaces ();
+}

=== modified file 'src/fm-directory-view.c'
--- src/fm-directory-view.c	2013-02-27 21:42:16 +0000
+++ src/fm-directory-view.c	2013-05-27 22:35:30 +0000
@@ -693,7 +693,11 @@
             break;
         }
     } else {
-        gof_file_open_single (file, screen, view->details->default_app);
+        if (gof_file_is_root_network_folder (file)) {
+            fm_directory_view_load_location (view, file->target_location);
+        } else {
+            gof_file_open_single (file, screen, view->details->default_app);
+        }
     }
 }
 

=== modified file 'src/marlin-connect-server-dialog.c'
--- src/marlin-connect-server-dialog.c	2013-05-18 09:24:36 +0000
+++ src/marlin-connect-server-dialog.c	2013-05-27 22:35:30 +0000
@@ -441,6 +441,19 @@
 static GSimpleAsyncResult *display_location_res = NULL;
 
 void
+marlin_connect_server_dialog_show (GtkWidget *widget)
+{
+    GtkWidget *toplevel = gtk_widget_get_toplevel (widget);
+    if (gtk_widget_is_toplevel (toplevel)) {
+        GtkWindow *window = GTK_WINDOW (toplevel);
+        g_return_if_fail (window != NULL);
+
+        MarlinConnectServerDialog *dialog = marlin_connect_server_dialog_new (window);
+        gtk_widget_show (GTK_WIDGET (dialog));
+    }
+}
+
+void
 marlin_connect_server_dialog_display_location_async (MarlinConnectServerDialog *self,
                                                      GFile *location,
                                                      GAsyncReadyCallback callback,

=== modified file 'src/marlin-connect-server-dialog.h'
--- src/marlin-connect-server-dialog.h	2012-02-05 16:29:37 +0000
+++ src/marlin-connect-server-dialog.h	2013-05-27 22:35:30 +0000
@@ -54,6 +54,7 @@
 
 MarlinConnectServerDialog *marlin_connect_server_dialog_new (GtkWindow *window);
 
+void marlin_connect_server_dialog_show (GtkWidget *widget);
 void marlin_connect_server_dialog_display_location_async (MarlinConnectServerDialog *self,
                                                           GFile *location,
                                                           GAsyncReadyCallback callback,

=== modified file 'src/marlin-places-sidebar.c'
--- src/marlin-places-sidebar.c	2013-04-21 19:25:05 +0000
+++ src/marlin-places-sidebar.c	2013-05-27 22:35:30 +0000
@@ -40,6 +40,7 @@
 #include "marlin-trash-monitor.h"
 #include "marlin-dnd.h"
 #include "marlincore.h"
+#include "marlin-connect-server-dialog.h"
 
 #define ROOT_INDENTATION_XPAD 2
 #define EJECT_BUTTON_XPAD 4
@@ -1450,6 +1451,7 @@
     sidebar->popup_menu_start_item = NULL;
     sidebar->popup_menu_stop_item = NULL;
     sidebar->popup_menu_empty_trash_item = NULL;
+    sidebar->popup_menu_connect_server_item = NULL;
 }
 
 static void
@@ -1530,6 +1532,7 @@
     gboolean show_start;
     gboolean show_stop;
     gboolean show_empty_trash;
+    gboolean show_connect_server;
     char *uri = NULL;
 
     type = PLACES_BUILT_IN;
@@ -1567,9 +1570,10 @@
      */
 
     show_empty_trash = (uri != NULL) && (!strcmp (uri, MARLIN_TRASH_URI));
+    show_connect_server = (uri != NULL) && (!strcmp (uri, MARLIN_NETWORK_URI));
 
     eel_gtk_widget_set_shown (sidebar->popup_menu_separator_item2,
-            show_eject || show_unmount || show_mount || show_empty_trash);
+            show_eject || show_unmount || show_mount || show_empty_trash || show_connect_server);
     eel_gtk_widget_set_shown (sidebar->popup_menu_mount_item, show_mount);
     eel_gtk_widget_set_shown (sidebar->popup_menu_unmount_item, show_unmount);
     eel_gtk_widget_set_shown (sidebar->popup_menu_eject_item, show_eject);
@@ -1578,6 +1582,7 @@
           eel_gtk_widget_set_shown (sidebar->popup_menu_start_item, show_start);
           eel_gtk_widget_set_shown (sidebar->popup_menu_stop_item, show_stop);*/
     eel_gtk_widget_set_shown (sidebar->popup_menu_empty_trash_item, show_empty_trash);
+    eel_gtk_widget_set_shown (sidebar->popup_menu_connect_server_item, show_connect_server);
 
     //TODO check this
 #if 0
@@ -2319,11 +2324,17 @@
 #endif
 
 static void
-empty_trash_cb (GtkMenuItem           *item,
-                MarlinPlacesSidebar *sidebar)
+empty_trash_cb (GtkMenuItem             *item,
+                MarlinPlacesSidebar     *sidebar)
 {
     marlin_file_operations_empty_trash (GTK_WIDGET (sidebar->window));
 }
+static void
+connect_server_cb (GtkMenuItem          *item,
+                   MarlinPlacesSidebar  *sidebar)
+{
+    marlin_connect_server_dialog_show(GTK_WIDGET (sidebar->window));
+}
 
 /* Handler for GtkWidget::key-press-event on the shortcuts list */
 static gboolean
@@ -2447,6 +2458,16 @@
     gtk_menu_shell_append (GTK_MENU_SHELL (sidebar->popup_menu), item);
 
     bookmarks_check_popup_sensitivity (sidebar);
+
+    /* Connect to server menu item */
+    item = gtk_menu_item_new_with_mnemonic (_("Connect to Server…"));
+    sidebar->popup_menu_connect_server_item = item;
+    g_signal_connect (item, "activate",
+                      G_CALLBACK (connect_server_cb), sidebar);
+    gtk_widget_show (item);
+    gtk_menu_shell_append (GTK_MENU_SHELL (sidebar->popup_menu), item);
+
+    bookmarks_check_popup_sensitivity (sidebar);
 }
 
 static void

=== modified file 'src/marlin-places-sidebar.h'
--- src/marlin-places-sidebar.h	2012-11-06 17:21:39 +0000
+++ src/marlin-places-sidebar.h	2013-05-27 22:35:30 +0000
@@ -79,6 +79,7 @@
     GtkWidget *popup_menu_rescan_item;
     GtkWidget *popup_menu_format_item;
     GtkWidget *popup_menu_empty_trash_item;
+    GtkWidget *popup_menu_connect_server_item;
     GtkWidget *popup_menu_start_item;
     GtkWidget *popup_menu_stop_item;
 

=== modified file 'src/pantheon-files-ui.xml'
--- src/pantheon-files-ui.xml	2013-05-13 19:43:25 +0000
+++ src/pantheon-files-ui.xml	2013-05-27 22:35:30 +0000
@@ -74,8 +74,6 @@
 	<menuitem name="New Tab" action="New Tab"/>
 	<menuitem name="New Window" action="New Window"/>
 	<separator/>
-	<menuitem name="Connect to Server" action="Connect to Server"/>
-	<separator/>
     <menuitem name="About" action="About"/>
 </popup>
 </ui>