brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

main: factor out dbus names acquisition

Browse Source 
This way it will be a lot shorter to add
a new name acquisition in the future

https://bugzilla.gnome.org/show_bug.cgi?id=658078

Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
This commit is contained in:
Marc-Antoine Perennou 2011-09-23 19:57:46 +02:00 committed by Jasper St. Pierre
parent 85cd189a69
commit 39727d1156
1 changed files with 73 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

132
src/main.c
View File

@ -37,9 +37,60 @@ extern GType gnome_shell_plugin_get_type (void);
static gboolean is_gdm_mode = FALSE; static gboolean is_gdm_mode = FALSE;
static void static void
shell_dbus_init (gboolean replace) shell_dbus_acquire_name (DBusGProxy *bus,
guint32 request_name_flags,
guint32 *request_name_result,
gchar *name,
gboolean fatal)
{ {
GError *error = NULL; GError *error = NULL;
if (!dbus_g_proxy_call (bus, "RequestName", &error,
G_TYPE_STRING, name,
G_TYPE_UINT, request_name_flags,
G_TYPE_INVALID,
G_TYPE_UINT, request_name_result,
G_TYPE_INVALID))
{
g_printerr ("failed to acquire %s: %s\n", name, error->message);
if (fatal)
exit (1);
}
}
static void
shell_dbus_acquire_names (DBusGProxy *bus,
guint32 request_name_flags,
gchar *name,
gboolean fatal,
gchar *other, ...) G_GNUC_NULL_TERMINATED;
static void
shell_dbus_acquire_names (DBusGProxy *bus,
guint32 request_name_flags,
gchar *name,
gboolean fatal,
gchar *other, ...)
{
va_list al;
guint32 request_name_result;
va_start (al, other);
for (;;)
{
shell_dbus_acquire_name (bus,
request_name_flags,
&request_name_result,
name, fatal);
name = va_arg (al, gchar *);
if (!name)
break;
fatal = va_arg (al, gboolean);
}
va_end (al);
}
static void
shell_dbus_init (gboolean replace)
{
DBusGConnection *session; DBusGConnection *session;
DBusGProxy *bus; DBusGProxy *bus;
guint32 request_name_flags; guint32 request_name_flags;
@ -61,16 +112,10 @@ shell_dbus_init (gboolean replace)
request_name_flags = DBUS_NAME_FLAG_DO_NOT_QUEUE | DBUS_NAME_FLAG_ALLOW_REPLACEMENT; request_name_flags = DBUS_NAME_FLAG_DO_NOT_QUEUE | DBUS_NAME_FLAG_ALLOW_REPLACEMENT;
if (replace) if (replace)
request_name_flags |= DBUS_NAME_FLAG_REPLACE_EXISTING; request_name_flags |= DBUS_NAME_FLAG_REPLACE_EXISTING;
if (!dbus_g_proxy_call (bus, "RequestName", &error, shell_dbus_acquire_name (bus,
G_TYPE_STRING, SHELL_DBUS_SERVICE, request_name_flags,
G_TYPE_UINT, request_name_flags, &request_name_result,
G_TYPE_INVALID, SHELL_DBUS_SERVICE, TRUE);
G_TYPE_UINT, &request_name_result,
G_TYPE_INVALID))
{
g_printerr ("failed to acquire org.gnome.Shell: %s\n", error->message);
exit (1);
}
if (!(request_name_result == DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER if (!(request_name_result == DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER
|| request_name_result == DBUS_REQUEST_NAME_REPLY_ALREADY_OWNER)) || request_name_result == DBUS_REQUEST_NAME_REPLY_ALREADY_OWNER))
{ {
@ -79,56 +124,25 @@ shell_dbus_init (gboolean replace)
exit (1); exit (1);
} }
/*
* We always specify REPLACE_EXISTING to ensure we kill off
* the existing service if it was running.
*/
request_name_flags |= DBUS_NAME_FLAG_REPLACE_EXISTING;
shell_dbus_acquire_names (bus,
request_name_flags,
/* Also grab org.gnome.Panel to replace any existing panel process */ /* Also grab org.gnome.Panel to replace any existing panel process */
if (!dbus_g_proxy_call (bus, "RequestName", &error, G_TYPE_STRING, "org.gnome.Panel", TRUE,
"org.gnome.Panel", G_TYPE_UINT, /* ...and the org.gnome.Magnifier service. */
DBUS_NAME_FLAG_REPLACE_EXISTING | request_name_flags, MAGNIFIER_DBUS_SERVICE, FALSE,
G_TYPE_INVALID, G_TYPE_UINT, /* ...and the org.freedesktop.Notifications service. */
&request_name_result, G_TYPE_INVALID)) "org.freedesktop.Notifications", FALSE,
{ NULL);
g_print ("failed to acquire org.gnome.Panel: %s\n", error->message);
exit (1);
}
/* ...and the org.gnome.Magnifier service.
*/
if (!dbus_g_proxy_call (bus, "RequestName", &error,
G_TYPE_STRING, MAGNIFIER_DBUS_SERVICE,
G_TYPE_UINT, DBUS_NAME_FLAG_REPLACE_EXISTING | request_name_flags,
G_TYPE_INVALID,
G_TYPE_UINT, &request_name_result,
G_TYPE_INVALID))
{
g_print ("failed to acquire %s: %s\n", MAGNIFIER_DBUS_SERVICE, error->message);
/* Failing to acquire the magnifer service is not fatal. Log the error,
* but keep going. */
}
/* ...and the org.freedesktop.Notifications service; we always
* specify REPLACE_EXISTING to ensure we kill off
* notification-daemon if it was running.
*/
if (!dbus_g_proxy_call (bus, "RequestName", &error,
G_TYPE_STRING, "org.freedesktop.Notifications",
G_TYPE_UINT, DBUS_NAME_FLAG_REPLACE_EXISTING | request_name_flags,
G_TYPE_INVALID,
G_TYPE_UINT, &request_name_result,
G_TYPE_INVALID))
{
g_print ("failed to acquire org.freedesktop.Notifications: %s\n", error->message);
}
/* ...and the on-screen keyboard service */ /* ...and the on-screen keyboard service */
if (!dbus_g_proxy_call (bus, "RequestName", &error, shell_dbus_acquire_name (bus,
G_TYPE_STRING, "org.gnome.Caribou.Keyboard", DBUS_NAME_FLAG_REPLACE_EXISTING,
G_TYPE_UINT, DBUS_NAME_FLAG_REPLACE_EXISTING, &request_name_result,
G_TYPE_INVALID, "org.gnome.Caribou.Keyboard", FALSE);
G_TYPE_UINT, &request_name_result,
G_TYPE_INVALID))
{
g_print ("failed to acquire org.gnome.Caribou.Keyboard: %s\n", error->message);
}
g_object_unref (bus); g_object_unref (bus);
} }