Revert "application: add common startup code"

This reverts commit 23ae53870a39afe43548111b6432db39511a6e97. This
change was needed for split of desktop-related functionality, but it
seems no more needed to me. Let's revert those changes to make the
code a bit easier as a preparation for the next commits.

2 files changed, 6 insertions, 27 deletions

diff --git a/src/nautilus-application.c b/src/nautilus-application.c
index 675985667..e25289132 100644
--- a/src/nautilus-application.c
+++ b/src/nautilus-application.c
@@ -1152,9 +1152,10 @@ maybe_migrate_gtk_filechooser_preferences (void)
     }
 }
 
-void
-nautilus_application_startup_common (NautilusApplication *self)
+static void
+nautilus_application_startup (GApplication *app)
 {
+    NautilusApplication *self = NAUTILUS_APPLICATION (app);
     NautilusApplicationPrivate *priv;
 
     nautilus_profile_start (NULL);
@@ -1169,6 +1170,9 @@ nautilus_application_startup_common (NautilusApplication *self)
 
     gtk_window_set_default_icon_name (APPLICATION_ID);
 
+    /* create DBus manager */
+    priv->fdb_manager = nautilus_freedesktop_dbus_new ();
+
     /* initialize preferences and create the global GSettings objects */
     nautilus_global_preferences_init ();
 
@@ -1206,22 +1210,6 @@ nautilus_application_startup_common (NautilusApplication *self)
                              NULL, 0);
 }
 
-static void
-nautilus_application_startup (GApplication *app)
-{
-    NautilusApplication *self = NAUTILUS_APPLICATION (app);
-    NautilusApplicationPrivate *priv;
-
-    nautilus_profile_start (NULL);
-    priv = nautilus_application_get_instance_private (self);
-
-    /* create DBus manager */
-    priv->fdb_manager = nautilus_freedesktop_dbus_new ();
-    nautilus_application_startup_common (self);
-
-    nautilus_profile_end (NULL);
-}
-
 static gboolean
 nautilus_application_dbus_register (GApplication     *app,
                                     GDBusConnection  *connection,
@@ -1297,14 +1285,6 @@ update_dbus_opened_locations (NautilusApplication *self)
     g_return_if_fail (NAUTILUS_IS_APPLICATION (self));
 
     priv = nautilus_application_get_instance_private (self);
-
-    /* Children of nautilus application could not handle the dbus, so don't
-     * do anything in that case */
-    if (!priv->fdb_manager)
-    {
-        return;
-    }
-
     dbus_object_path = g_application_get_dbus_object_path (G_APPLICATION (self));
 
     g_return_if_fail (dbus_object_path);
diff --git a/src/nautilus-application.h b/src/nautilus-application.h
index 50bcf4d1c..813d6ad79 100644
--- a/src/nautilus-application.h
+++ b/src/nautilus-application.h
@@ -82,6 +82,5 @@ GtkWidget * nautilus_application_connect_server (NautilusApplication *applicatio
 
 void nautilus_application_search (NautilusApplication *application,
                                   NautilusQuery       *query);
-void nautilus_application_startup_common (NautilusApplication *application);
 gboolean nautilus_application_is_sandboxed (void);
 G_END_DECLS