Fix restart and shutdown (#172)

* Revert "csm-manager.c: Unset WAYLAND_DISPLAY during shutdown in a wayland"

This reverts commit 128fe7f.

* Revert "csm-manager.c: Stop the user dbus-daemon at the end of the session."

This reverts commit 9961f98.

cinnamon-session/csm-manager.c

@@ -941,71 +941,6 @@ _client_stop (const char *id,
         return FALSE;
 }
 
-static void
-maybe_restart_user_bus (CsmManager *manager)
-{
-        CsmSystem *system;
-        g_autoptr(GVariant) reply = NULL;
-        g_autoptr(GError) error = NULL;
-
-        if (manager->priv->dbus_disconnected)
-                return;
-
-        if (g_strcmp0 (g_getenv ("XDG_SESSION_TYPE"), "wayland") == 0) {
-            g_debug ("CsmManager: Unsetting environment GNOME_SETUP_DISPLAY WAYLAND_DISPLAY DISPLAY XAUTHORITY");
-
-            GVariantBuilder builder;
-            g_variant_builder_init (&builder, G_VARIANT_TYPE ("as"));
-            g_variant_builder_add (&builder, "s", "GNOME_SETUP_DISPLAY");
-            g_variant_builder_add (&builder, "s", "WAYLAND_DISPLAY");
-            g_variant_builder_add (&builder, "s", "DISPLAY");
-            g_variant_builder_add (&builder, "s", "XAUTHORITY");
-
-            reply = g_dbus_connection_call_sync (manager->priv->connection,
-                                                 "org.freedesktop.systemd1",
-                                                 "/org/freedesktop/systemd1",
-                                                 "org.freedesktop.systemd1.Manager",
-                                                 "UnsetEnvironment",
-                                                 g_variant_new ("(@as)",
-                                                                g_variant_builder_end (&builder)),
-                                                 NULL,
-                                                 G_DBUS_CALL_FLAGS_NONE,
-                                                 -1, NULL, &error);
-
-            if (error != NULL) {
-                    g_debug ("CsmManager: unsetting environment failed: %s", error->message);
-                    g_clear_error (&error);
-            }
-            else {
-                g_variant_unref (reply);
-            }
-        }
-
-        system = csm_get_system ();
-
-        if (!csm_system_is_last_session_for_user (system))
-                return;
-
-        g_debug ("CsmManager: reloading user bus");
-
-        reply = g_dbus_connection_call_sync (manager->priv->connection,
-                                             "org.freedesktop.systemd1",
-                                             "/org/freedesktop/systemd1",
-                                             "org.freedesktop.systemd1.Manager",
-                                             "StopUnit",
-                                             g_variant_new ("(ss)", "dbus.service", "fail"),
-                                             NULL,
-                                             G_DBUS_CALL_FLAGS_NONE,
-                                             -1,
-                                             NULL,
-                                             &error);
-
-        if (error != NULL) {
-                g_debug ("CsmManager: reloading user bus failed: %s", error->message);
-                g_clear_error (&error);
-        }
-}
-
 static void
 do_phase_exit (CsmManager *manager)
 {
@@ -1014,7 +949,6 @@ do_phase_exit (CsmManager *manager)
                                    (CsmStoreFunc)_client_stop,
                                    NULL);
         }
-        maybe_restart_user_bus (manager);
         end_phase (manager);
 }