GNOME.org
 

[nautilus/wip/gbsneto/other-locations] project: deprecate nautilus-connect-server legacy app

commit 00eff8a7105faa46961dae64645cb3a64aaf4d94
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date:   Thu Jul 16 10:44:29 2015 -0300

    project: deprecate nautilus-connect-server legacy app
    
    Back to GNOME 2.X era, the top panel menus used to have
    an "Connect to Server" option, similar in behavior to
    the current "Connect to Server" sidebar item.
    
    It is no more like that, GNOME has no top bar anymore,
    but the small application is still lying around in the
    codebase.
    
    Deprecate the nautilus-connect-server application and
    remove the Connect to Server dialog.

 configure.ac                               |    1 -
 data/Makefile.am                           |    3 +-
 data/nautilus-connect-server.desktop.in.in |   13 -
 docs/Makefile.am                           |    1 -
 docs/nautilus-connect-server.1             |   50 --
 po/POTFILES.in                             |    3 -
 po/POTFILES.skip                           |    2 -
 src/Makefile.am                            |    9 -
 src/nautilus-application-actions.c         |   12 -
 src/nautilus-application.c                 |   68 ---
 src/nautilus-application.h                 |    3 -
 src/nautilus-connect-server-dialog.c       |  729 ----------------------------
 src/nautilus-connect-server-dialog.h       |   64 ---
 src/nautilus-connect-server.c              |  182 -------
 src/nautilus-window.c                      |   16 -
 src/nautilus-window.ui                     |    1 +
 16 files changed, 2 insertions(+), 1155 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 8efaf87..f089946 100644
--- a/configure.ac
+++ b/configure.ac
@@ -303,7 +303,6 @@ data/Makefile
 data/org.gnome.Nautilus.desktop.in
 data/nautilus-autorun-software.desktop.in
 data/nautilus-classic.desktop
-data/nautilus-connect-server.desktop.in
 docs/Makefile
 docs/reference/Makefile
 docs/reference/libnautilus-extension/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index 2d93553..41f8bd0 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -6,8 +6,7 @@ desktop_DATA     =                                      \
        nautilus-classic.desktop
 desktop_in_files =                                     \
        org.gnome.Nautilus.desktop.in                   \
-       nautilus-autorun-software.desktop.in            \
-       nautilus-connect-server.desktop.in
+       nautilus-autorun-software.desktop.in
 
 autostartdir     = $(sysconfdir)/xdg/autostart
 autostart_in_files = nautilus-autostart.desktop.in
diff --git a/docs/Makefile.am b/docs/Makefile.am
index a5abe79..994f20d 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -4,7 +4,6 @@ SUBDIRS = reference
 
 man_MANS = \
        nautilus.1 \
-       nautilus-connect-server.1 \
        $(NULL)
 
 EXTRA_DIST = \
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 1e7a425..0735a27 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -3,7 +3,6 @@
 [encoding: UTF-8]
 data/org.gnome.Nautilus.appdata.xml.in
 data/nautilus-autorun-software.desktop.in.in
-data/nautilus-connect-server.desktop.in.in
 data/org.gnome.Nautilus.desktop.in.in
 eel/eel-canvas.c
 eel/eel-glib-extensions.c
@@ -52,8 +51,6 @@ src/nautilus-bookmarks-window.c
 [type: gettext/glade]src/nautilus-bookmarks-window.ui
 src/nautilus-canvas-view.c
 src/nautilus-canvas-view-container.c
-src/nautilus-connect-server.c
-src/nautilus-connect-server-dialog.c
 src/nautilus-desktop-canvas-view.c
 src/nautilus-desktop-item-properties.c
 src/nautilus-desktop-window.c
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 5a3b91b..e15facf 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -2,9 +2,7 @@
 # Please keep this file sorted alphabetically.
 data/nautilus-autorun-software.desktop.in
 data/nautilus-computer.desktop.in
-data/nautilus-connect-server.desktop.in
 data/org.gnome.Nautilus.desktop.in
 sub/data/nautilus-autorun-software.desktop.in
 sub/data/nautilus-computer.desktop.in
-sub/data/nautilus-connect-server.desktop.in
 sub/data/org.gnome.Nautilus.desktop.in
diff --git a/src/Makefile.am b/src/Makefile.am
index 72a07c3..e27dc1b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,7 +3,6 @@ include $(top_srcdir)/Makefile.shared
 bin_PROGRAMS=                                  \
        nautilus                                \
        nautilus-autorun-software               \
-       nautilus-connect-server                 \
        $(NULL)
 
 libexec_PROGRAMS=                              \
@@ -151,8 +150,6 @@ nautilus_SOURCES = \
        nautilus-canvas-view.h                  \
        nautilus-canvas-view-container.c        \
        nautilus-canvas-view-container.h        \
-       nautilus-connect-server-dialog.c        \
-       nautilus-connect-server-dialog.h        \
        nautilus-dbus-manager.c                 \
        nautilus-dbus-manager.h                 \
        nautilus-desktop-canvas-view.c          \
@@ -235,12 +232,6 @@ nautilus_autorun_software_SOURCES=                         \
        nautilus-autorun-software.c                     \
        $(NULL)
 
-nautilus_connect_server_SOURCES= \
-       nautilus-connect-server-dialog.c        \
-       nautilus-connect-server-dialog.h        \
-       nautilus-connect-server.c               \
-       $(NULL)
-
 nautilus_convert_metadata_SOURCES= \
        nautilus-convert-metadata.c     \
        $(NULL)
diff --git a/src/nautilus-application-actions.c b/src/nautilus-application-actions.c
index 3caa09e..204ba08 100644
--- a/src/nautilus-application-actions.c
+++ b/src/nautilus-application-actions.c
@@ -50,17 +50,6 @@ action_new_window (GSimpleAction *action,
 }
 
 static void
-action_connect_to_server (GSimpleAction *action,
-                         GVariant *parameter,
-                         gpointer user_data)
-{
-       GtkApplication *application = user_data;
-
-       nautilus_application_connect_server (NAUTILUS_APPLICATION (application),
-                                            NAUTILUS_WINDOW (gtk_application_get_active_window 
(application)));
-}
-
-static void
 action_bookmarks (GSimpleAction *action,
                  GVariant *parameter,
                  gpointer user_data)
@@ -250,7 +239,6 @@ action_show_hide_sidebar (GSimpleAction *action,
 
 static GActionEntry app_entries[] = {
        { "new-window", action_new_window, NULL, NULL, NULL },
-       { "connect-to-server", action_connect_to_server, NULL, NULL, NULL },
        { "bookmarks", action_bookmarks, NULL, NULL, NULL },
        { "preferences", action_preferences, NULL, NULL, NULL },
        { "show-hide-sidebar", NULL, NULL, "true", action_show_hide_sidebar },
diff --git a/src/nautilus-application.c b/src/nautilus-application.c
index bde2330..4626c8a 100644
--- a/src/nautilus-application.c
+++ b/src/nautilus-application.c
@@ -31,7 +31,6 @@
 
 #include "nautilus-application-actions.h"
 #include "nautilus-bookmarks-window.h"
-#include "nautilus-connect-server-dialog.h"
 #include "nautilus-dbus-manager.h"
 #include "nautilus-desktop-window.h"
 #include "nautilus-freedesktop-dbus.h"
@@ -78,8 +77,6 @@ struct _NautilusApplicationPriv {
 
        NautilusBookmarkList *bookmark_list;
 
-       GtkWidget *connect_server_window;
-
        NautilusShellSearchProvider *search_provider;
 
        GList *windows;
@@ -519,71 +516,6 @@ nautilus_application_open (GApplication *app,
        }
 }
 
-static gboolean
-go_to_server_cb (NautilusWindow *window,
-                GFile          *location,
-                GError         *error,
-                gpointer        user_data)
-{
-       gboolean retval;
-       NautilusFile *file;
-
-       if (error == NULL) {
-               file = nautilus_file_get_existing (location);
-               nautilus_connect_server_dialog_add_server (file);
-               nautilus_file_unref (file);
-
-               retval = TRUE;
-       } else {
-               retval = FALSE;
-       }
-
-       return retval;
-}
-
-static void
-on_connect_server_response (GtkDialog      *dialog,
-                           int             response,
-                           GtkApplication *application)
-{
-       if (response == GTK_RESPONSE_OK) {
-               GFile *location;
-               NautilusWindow *window = NAUTILUS_WINDOW (gtk_application_get_active_window (application));
-
-               location = nautilus_connect_server_dialog_get_location (NAUTILUS_CONNECT_SERVER_DIALOG 
(dialog));
-               if (location != NULL) {
-                       nautilus_window_slot_open_location_full (nautilus_window_get_active_slot (window),
-                                                                location,
-                                                                
NAUTILUS_WINDOW_OPEN_FLAG_USE_DEFAULT_LOCATION,
-                                                                NULL, go_to_server_cb, application);
-               }
-       }
-
-       gtk_widget_destroy (GTK_WIDGET (dialog));
-}
-
-GtkWidget *
-nautilus_application_connect_server (NautilusApplication *application,
-                                    NautilusWindow      *window)
-{
-       GtkWidget *dialog;
-
-       dialog = application->priv->connect_server_window;
-
-       if (dialog == NULL) {
-               dialog = nautilus_connect_server_dialog_new (window);
-               g_signal_connect (dialog, "response", G_CALLBACK (on_connect_server_response), application);
-               application->priv->connect_server_window = dialog;
-
-               g_object_add_weak_pointer (G_OBJECT (dialog),
-                                          (gpointer *) &application->priv->connect_server_window);
-       }
-
-       gtk_window_present (GTK_WINDOW (dialog));
-
-       return dialog;
-}
-
 static void
 nautilus_application_finalize (GObject *object)
 {
diff --git a/src/nautilus-application.h b/src/nautilus-application.h
index 3dd4af5..8ca0992 100644
--- a/src/nautilus-application.h
+++ b/src/nautilus-application.h
@@ -79,9 +79,6 @@ NautilusBookmarkList *
 void nautilus_application_edit_bookmarks (NautilusApplication *application,
                                          NautilusWindow      *window);
 
-GtkWidget * nautilus_application_connect_server (NautilusApplication *application,
-                                                NautilusWindow      *window);
-
 NautilusProgressUIHandler * nautilus_application_get_progress_ui_handler (NautilusApplication *application);
 
 #endif /* __NAUTILUS_APPLICATION_H__ */
diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index d315316..5a4cee9 100644
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@ -1050,19 +1050,6 @@ places_sidebar_show_error_message_cb (GtkPlacesSidebar *sidebar,
        eel_show_error_dialog (primary, secondary, GTK_WINDOW (window));
 }
 
-/* Callback used when the places sidebar needs us to present the Connect to Server dialog */
-static void
-places_sidebar_show_connect_to_server_cb (GtkPlacesSidebar *sidebar,
-                                         gpointer          user_data)
-{
-       NautilusWindow *window = NAUTILUS_WINDOW (user_data);
-       NautilusApplication *application = NAUTILUS_APPLICATION (g_application_get_default ());
-       GtkWidget *dialog;
- 
-       dialog = nautilus_application_connect_server (application, window);
-       gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
-}
-
 static GList *
 build_selection_list_from_gfile_list (GList *gfile_list)
 {
@@ -1334,14 +1321,11 @@ nautilus_window_set_up_sidebar (NautilusWindow *window)
                                           (GTK_PLACES_OPEN_NORMAL
                                            | GTK_PLACES_OPEN_NEW_TAB
                                            | GTK_PLACES_OPEN_NEW_WINDOW));
-       gtk_places_sidebar_set_show_connect_to_server (GTK_PLACES_SIDEBAR (window->priv->places_sidebar), 
TRUE);
 
        g_signal_connect (window->priv->places_sidebar, "open-location",
                          G_CALLBACK (places_sidebar_open_location_cb), window);
        g_signal_connect (window->priv->places_sidebar, "show-error-message",
                          G_CALLBACK (places_sidebar_show_error_message_cb), window);
-       g_signal_connect (window->priv->places_sidebar, "show-connect-to-server",
-                         G_CALLBACK (places_sidebar_show_connect_to_server_cb), window);
        g_signal_connect (window->priv->places_sidebar, "drag-action-requested",
                          G_CALLBACK (places_sidebar_drag_action_requested_cb), window);
        g_signal_connect (window->priv->places_sidebar, "drag-action-ask",
diff --git a/src/nautilus-window.ui b/src/nautilus-window.ui
index 5205ced..ab0e1d8 100644
--- a/src/nautilus-window.ui
+++ b/src/nautilus-window.ui
@@ -32,6 +32,7 @@
                 <child>
                   <object class="GtkPlacesSidebar" id="places_sidebar">
                     <property name="visible">True</property>
+                    <property name="show_other_locations">True</property>
                   </object>
                   <packing>
                     <property name="pack_type">start</property>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]