[gnome-flashback/wip/flashback: 1/4] Revert "own org.gnome.Shell"

[Alberts Muktupāvels <muktupavels src gnome org>]

commit 9279e39d73ce5c2cd69d169149c6a10e75b8bd3e
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Sun Dec 14 00:52:33 2014 +0200

    Revert "own org.gnome.Shell"
    
    This reverts commit 670c310e8eaf89e895da96e62edc2a724c4ec068.
    
    Conflicts:
        gnome-flashback/flashback-application.c

 gnome-flashback/flashback-application.c            |   17 -----------------
 .../flashback-end-session-dialog.c                 |   20 --------------------
 .../libkey-grabber/flashback-key-grabber.c         |   18 ------------------
 3 files changed, 0 insertions(+), 55 deletions(-)
---
diff --git a/gnome-flashback/flashback-application.c b/gnome-flashback/flashback-application.c
index 457d1dd..bcba7f1 100644
--- a/gnome-flashback/flashback-application.c
+++ b/gnome-flashback/flashback-application.c
@@ -45,8 +45,6 @@ struct _FlashbackApplicationPrivate {
        FlashbackKeyGrabber        *grabber;
        MetaIdleMonitorDBus        *idle_monitor;
        GvcApplet                  *applet;
-
-       gint                        bus_name;
 };
 
 G_DEFINE_TYPE_WITH_PRIVATE (FlashbackApplication, flashback_application, G_TYPE_OBJECT);
@@ -134,11 +132,6 @@ flashback_application_finalize (GObject *object)
 {
        FlashbackApplication *app = FLASHBACK_APPLICATION (object);
 
-       if (app->priv->bus_name) {
-               g_bus_unown_name (app->priv->bus_name);
-               app->priv->bus_name = 0;
-       }
-
        g_clear_object (&app->priv->automount);
        g_clear_object (&app->priv->background);
        g_clear_object (&app->priv->config);
@@ -164,16 +157,6 @@ flashback_application_init (FlashbackApplication *application)
        g_signal_connect (priv->settings, "changed",
                          G_CALLBACK (flashback_application_settings_changed), application);
        flashback_application_settings_changed (priv->settings, NULL, application);
-
-       priv->bus_name = g_bus_own_name (G_BUS_TYPE_SESSION,
-                                        "org.gnome.Shell",
-                                        G_BUS_NAME_OWNER_FLAGS_ALLOW_REPLACEMENT |
-                                        G_BUS_NAME_OWNER_FLAGS_REPLACE,
-                                        NULL,
-                                        NULL,
-                                        NULL,
-                                        NULL,
-                                        NULL);
 }
 
 static void
diff --git a/gnome-flashback/libend-session-dialog/flashback-end-session-dialog.c 
b/gnome-flashback/libend-session-dialog/flashback-end-session-dialog.c
index a75c89b..d100dd0 100644
--- a/gnome-flashback/libend-session-dialog/flashback-end-session-dialog.c
+++ b/gnome-flashback/libend-session-dialog/flashback-end-session-dialog.c
@@ -125,15 +125,9 @@ handle_open (DBusEndSessionDialog *object,
 }
 
 static void
-/*
 on_bus_acquired (GDBusConnection *connection,
                  const gchar     *name,
                  gpointer         user_data)
-*/
-name_appeared_handler (GDBusConnection *connection,
-                       const gchar     *name,
-                       const gchar     *name_owner,
-                       gpointer         user_data)
 {
        FlashbackEndSessionDialog *dialog;
        GError *error = NULL;
@@ -152,7 +146,6 @@ name_appeared_handler (GDBusConnection *connection,
        }
 }
 
-/*
 static void
 on_name_acquired (GDBusConnection *connection,
                   const char      *name,
@@ -166,7 +159,6 @@ on_name_lost (GDBusConnection *connection,
               gpointer         user_data)
 {
 }
-*/
 
 static void
 flashback_end_session_dialog_finalize (GObject *object)
@@ -186,10 +178,7 @@ flashback_end_session_dialog_finalize (GObject *object)
        }
 
        if (dialog->priv->bus_name) {
-               /*
                g_bus_unown_name (dialog->priv->bus_name);
-               */
-               g_bus_unwatch_name (dialog->priv->bus_name);
                dialog->priv->bus_name = 0;
        }
 
@@ -205,14 +194,6 @@ flashback_end_session_dialog_init (FlashbackEndSessionDialog *dialog)
 
        dialog->priv->dialog = NULL;
        dialog->priv->iface = NULL;
-       dialog->priv->bus_name = g_bus_watch_name (G_BUS_TYPE_SESSION,
-                                                  "org.gnome.Shell",
-                                                  G_BUS_NAME_WATCHER_FLAGS_NONE,
-                                                  name_appeared_handler,
-                                                  NULL,
-                                                  dialog,
-                                                  NULL);
-       /*
        dialog->priv->bus_name = g_bus_own_name (G_BUS_TYPE_SESSION,
                                                 "org.gnome.Shell",
                                                 G_BUS_NAME_OWNER_FLAGS_ALLOW_REPLACEMENT |
@@ -222,7 +203,6 @@ flashback_end_session_dialog_init (FlashbackEndSessionDialog *dialog)
                                                 on_name_lost,
                                                 dialog,
                                                 NULL);
-       */
 }
 
 static void
diff --git a/gnome-flashback/libkey-grabber/flashback-key-grabber.c 
b/gnome-flashback/libkey-grabber/flashback-key-grabber.c
index 610bf0a..e83d40e 100644
--- a/gnome-flashback/libkey-grabber/flashback-key-grabber.c
+++ b/gnome-flashback/libkey-grabber/flashback-key-grabber.c
@@ -223,15 +223,9 @@ handle_ungrab_accelerator (DBusKeyGrabber        *object,
 }
 
 static void
-/*
 on_bus_acquired (GDBusConnection *connection,
                  const gchar     *name,
                  gpointer         user_data)
-*/
-name_appeared_handler (GDBusConnection *connection,
-                       const gchar     *name,
-                       const gchar     *name_owner,
-                       gpointer         user_data)
 {
        FlashbackKeyGrabber *grabber;
        DBusKeyGrabber *skeleton;
@@ -268,10 +262,7 @@ flashback_key_grabber_finalize (GObject *object)
        grabber = FLASHBACK_KEY_GRABBER (object);
 
        if (grabber->priv->bus_name) {
-               /*
                g_bus_unown_name (grabber->priv->bus_name);
-               */
-               g_bus_unwatch_name (grabber->priv->bus_name);
                grabber->priv->bus_name = 0;
        }
 
@@ -302,14 +293,6 @@ flashback_key_grabber_init (FlashbackKeyGrabber *grabber)
        g_signal_connect (grabber->priv->bindings, "binding-activated",
                          G_CALLBACK (binding_activated), grabber);
 
-       grabber->priv->bus_name = g_bus_watch_name (G_BUS_TYPE_SESSION,
-                                                   KEY_GRABBER_DBUS_NAME,
-                                                   G_BUS_NAME_WATCHER_FLAGS_NONE,
-                                                   name_appeared_handler,
-                                                   NULL,
-                                                   grabber,
-                                                   NULL);
-       /*
        grabber->priv->bus_name = g_bus_own_name (G_BUS_TYPE_SESSION,
                                                  KEY_GRABBER_DBUS_NAME,
                                                  G_BUS_NAME_OWNER_FLAGS_ALLOW_REPLACEMENT |
@@ -319,7 +302,6 @@ flashback_key_grabber_init (FlashbackKeyGrabber *grabber)
                                                  NULL,
                                                  grabber,
                                                  NULL);
-       */
 }
 
 static void