← Back to branch summary

~elementary-os/elementaryos/os-patch-at-spi2-core-xenial

« back to all changes in this revision

Viewing changes to debian/patches/register_with_session_manager

  • Committer: RabbitBot
  • Date: 2016-11-16 09:38:52 UTC
  • Revision ID: rabbitbot@elementary.io-20161116093852-xn6hcgpg5y25xooo
Initial import, version 2.18.3-4ubuntu1

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/register_with_session_manager
 
1
commit d4ae614301bbc7f7204dab795cbd6f1289c401d2
 
2
Author: Alberts Muktupāvels <alberts.muktupavels@gmail.com>
 
3
Date:   Fri Sep 18 03:28:51 2015 +0300
 
4
 
 
5
    at-spi-bus-launcher: register with session manager
 
6
    
 
7
    This application is started in Initialization phase. In this phase
 
8
    it is required to register with session manager. See:
 
9
    https://wiki.gnome.org/Projects/SessionManagement/NewGnomeSession
 
10
    
 
11
    https://bugzilla.gnome.org/show_bug.cgi?id=753931
 
12
 
 
13
diff --git a/bus/at-spi-bus-launcher.c b/bus/at-spi-bus-launcher.c
 
14
index b6bd8e8..c445be8 100644
 
15
--- a/bus/at-spi-bus-launcher.c
 
16
+++ b/bus/at-spi-bus-launcher.c
 
17
@@ -51,6 +51,8 @@ typedef struct {
 
18
   GSettings *a11y_schema;
 
19
   GSettings *interface_schema;
 
20
 
 
21
+  GDBusProxy *client_proxy;
 
22
+
 
23
   A11yBusState state;
 
24
   /* -1 == error, 0 == pending, > 0 == running */
 
25
   int a11y_bus_pid;
 
26
@@ -76,6 +78,133 @@ static const gchar introspection_xml[] =
 
27
 static GDBusNodeInfo *introspection_data = NULL;
 
28
 
 
29
 static void
 
30
+respond_to_end_session (GDBusProxy *proxy)
 
31
+{
 
32
+  GVariant *parameters;
 
33
+
 
34
+  parameters = g_variant_new ("(bs)", TRUE, "");
 
35
+
 
36
+  g_dbus_proxy_call (proxy,
 
37
+                     "EndSessionResponse", parameters,
 
38
+                     G_DBUS_CALL_FLAGS_NONE,
 
39
+                     -1, NULL, NULL, NULL);
 
40
+}
 
41
+
 
42
+static void
 
43
+g_signal_cb (GDBusProxy *proxy,
 
44
+             gchar      *sender_name,
 
45
+             gchar      *signal_name,
 
46
+             GVariant   *parameters,
 
47
+             gpointer    user_data)
 
48
+{
 
49
+  A11yBusLauncher *app = user_data;
 
50
+
 
51
+  if (g_strcmp0 (signal_name, "QueryEndSession") == 0)
 
52
+    respond_to_end_session (proxy);
 
53
+  else if (g_strcmp0 (signal_name, "EndSession") == 0)
 
54
+    respond_to_end_session (proxy);
 
55
+  else if (g_strcmp0 (signal_name, "Stop") == 0)
 
56
+    g_main_loop_quit (app->loop);
 
57
+}
 
58
+
 
59
+static void
 
60
+client_proxy_ready_cb (GObject      *source_object,
 
61
+                       GAsyncResult *res,
 
62
+                       gpointer      user_data)
 
63
+{
 
64
+  A11yBusLauncher *app = user_data;
 
65
+  GError *error = NULL;
 
66
+
 
67
+  app->client_proxy = g_dbus_proxy_new_for_bus_finish (res, &error);
 
68
+
 
69
+  if (error != NULL)
 
70
+    {
 
71
+      g_warning ("Failed to get a client proxy: %s", error->message);
 
72
+      g_error_free (error);
 
73
+
 
74
+      return;
 
75
+    }
 
76
+
 
77
+  g_signal_connect (app->client_proxy, "g-signal",
 
78
+                    G_CALLBACK (g_signal_cb), app);
 
79
+}
 
80
+
 
81
+static void
 
82
+register_client (A11yBusLauncher *app)
 
83
+{
 
84
+  GDBusProxyFlags flags;
 
85
+  GDBusProxy *sm_proxy;
 
86
+  GError *error;
 
87
+  const gchar *app_id;
 
88
+  const gchar *autostart_id;
 
89
+  gchar *client_startup_id;
 
90
+  GVariant *parameters;
 
91
+  GVariant *variant;
 
92
+  gchar *object_path;
 
93
+
 
94
+  flags = G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES |
 
95
+          G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS;
 
96
+
 
97
+  error = NULL;
 
98
+  sm_proxy = g_dbus_proxy_new_sync (app->session_bus, flags, NULL,
 
99
+                                    "org.gnome.SessionManager",
 
100
+                                    "/org/gnome/SessionManager",
 
101
+                                    "org.gnome.SessionManager",
 
102
+                                    NULL, &error);
 
103
+
 
104
+  if (error != NULL)
 
105
+    {
 
106
+      g_warning ("Failed to get session manager proxy: %s", error->message);
 
107
+      g_error_free (error);
 
108
+
 
109
+      return;
 
110
+    }
 
111
+
 
112
+  app_id = "at-spi-bus-launcher";
 
113
+  autostart_id = g_getenv ("DESKTOP_AUTOSTART_ID");
 
114
+
 
115
+  if (autostart_id != NULL)
 
116
+    {
 
117
+      client_startup_id = g_strdup (autostart_id);
 
118
+      g_unsetenv ("DESKTOP_AUTOSTART_ID");
 
119
+    }
 
120
+  else
 
121
+    {
 
122
+      client_startup_id = g_strdup ("");
 
123
+    }
 
124
+
 
125
+  parameters = g_variant_new ("(ss)", app_id, client_startup_id);
 
126
+  g_free (client_startup_id);
 
127
+
 
128
+  error = NULL;
 
129
+  variant = g_dbus_proxy_call_sync (sm_proxy,
 
130
+                                    "RegisterClient", parameters,
 
131
+                                    G_DBUS_CALL_FLAGS_NONE,
 
132
+                                    -1, NULL, &error);
 
133
+
 
134
+  g_object_unref (sm_proxy);
 
135
+
 
136
+  if (error != NULL)
 
137
+    {
 
138
+      g_warning ("Failed to register client: %s", error->message);
 
139
+      g_error_free (error);
 
140
+
 
141
+      return;
 
142
+    }
 
143
+
 
144
+  g_variant_get (variant, "(o)", &object_path);
 
145
+  g_variant_unref (variant);
 
146
+
 
147
+  flags = G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES;
 
148
+  g_dbus_proxy_new_for_bus (G_BUS_TYPE_SESSION, flags, NULL,
 
149
+                            "org.gnome.SessionManager", object_path,
 
150
+                            "org.gnome.SessionManager.ClientPrivate",
 
151
+                            NULL, client_proxy_ready_cb, app);
 
152
+
 
153
+  g_free (object_path);
 
154
+}
 
155
+
 
156
+static void
 
157
 setup_bus_child (gpointer data)
 
158
 {
 
159
   A11yBusLauncher *app = data;
 
160
@@ -454,7 +583,8 @@ on_name_acquired (GDBusConnection *connection,
 
161
                   gpointer         user_data)
 
162
 {
 
163
   A11yBusLauncher *app = user_data;
 
164
-  (void) app;
 
165
+
 
166
+  register_client (app);
 
167
 }
 
168
 
 
169
 static int sigterm_pipefd[2];