maryjane/syncevolution
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

GDBus GIO: abort when D-Bus name cannot be obtained

Browse source 
In contrast to the version from GDBus libdbus, GDBus GIO's
dbus_get_bus_connection() with name doesn't fail even if the name
cannot be obtained. That's because it asynchronously asks for the
name without waiting for success.

As a quick-and-dirty solution register a function which kills the
process when the name registration fails. This assumes that the
process will run as a daemon with exactly one name, where failures to
obtain that name are indeed fatal.
This commit is contained in:
Patrick Ohly 2012-04-13 16:34:10 +02:00
parent 13bc7461a7
commit 25bfedbda1
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/gdbusxx/gdbus-cxx-bridge.cpp
View file

@ -33,6 +33,14 @@ namespace GDBusCXX {
MethodHandler::MethodMap MethodHandler::m_methodMap;
boost::function<void (void)> MethodHandler::m_callback;
static void GDBusNameLost(GDBusConnection *connection,
const gchar *name,
gpointer user_data)
{
g_critical("lost D-Bus connection or failed to obtain %s D-Bus name, quitting", name);
exit(1);
}
DBusConnectionPtr dbus_get_bus_connection(const char *busType,
const char *name,
bool unshared,
@ -82,8 +90,10 @@ DBusConnectionPtr dbus_get_bus_connection(const char *busType,
}
if(name) {
g_bus_own_name_on_connection(conn.get(), name, G_BUS_NAME_OWNER_FLAGS_NONE,
NULL, NULL, NULL, NULL);
// Copy name, to ensure that it remains available.
char *copy = g_strdup(name);
g_bus_own_name_on_connection(conn.get(), copy, G_BUS_NAME_OWNER_FLAGS_NONE,
NULL, GDBusNameLost, copy, g_free);
g_dbus_connection_set_exit_on_close(conn.get(), TRUE);
}