diff options
| author | Ted Gould <ted@canonical.com> | 2009-05-28 10:34:38 -0500 |
|---|---|---|
| committer | Ted Gould <ted@canonical.com> | 2009-05-28 10:34:38 -0500 |
| commit | b470b71b0d2bd80552bcb36ed8a5c3b7aaa6e7d4 (patch) | |
| tree | 311daff96bf854bc02945cd5838c678ba016758e /src | |
| parent | 6669d085f582706ed1dc278034381fd570aa7f1d (diff) | |
| parent | 7bd2ed28f7657191beb001f60109167ab1644a57 (diff) | |
| download | ayatana-indicator-messages-b470b71b0d2bd80552bcb36ed8a5c3b7aaa6e7d4.tar.gz ayatana-indicator-messages-b470b71b0d2bd80552bcb36ed8a5c3b7aaa6e7d4.tar.bz2 ayatana-indicator-messages-b470b71b0d2bd80552bcb36ed8a5c3b7aaa6e7d4.zip | |
Fixing the service file to make it correct. Also some other smaller
cleanups.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/indicator-messages.c | 11 |
2 files changed, 12 insertions, 3 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index c543e48..74db2df 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -4,10 +4,10 @@ bin_PROGRAMS = indicator-messages-service messaginglibdir = $(INDICATORDIR) messaginglib_LTLIBRARIES = libmessaging.la libmessaging_la_SOURCES = indicator-messages.c im-menu-item.c im-menu-item.h app-menu-item.c app-menu-item.h -libmessaging_la_CFLAGS = $(APPLET_CFLAGS) -Wall -Wl,-Bsymbolic-functions -Wl,-z,defs -Wl,--as-needed +libmessaging_la_CFLAGS = $(APPLET_CFLAGS) -Wall -Wl,-Bsymbolic-functions -Wl,-z,defs -Wl,--as-needed -Werror libmessaging_la_LIBADD = $(APPLET_LIBS) libmessaging_la_LDFLAGS = -module -avoid-version indicator_messages_service_SOURCES = indicator-service.c im-menu-item.c im-menu-item.h app-menu-item.c app-menu-item.h -indicator_messages_service_CFLAGS = $(APPLET_CFLAGS) -Wall -Wl,-Bsymbolic-functions -Wl,-z,defs -Wl,--as-needed +indicator_messages_service_CFLAGS = $(APPLET_CFLAGS) -Wall -Wl,-Bsymbolic-functions -Wl,-z,defs -Wl,--as-needed -Werror indicator_messages_service_LDADD = $(APPLET_LIBS) diff --git a/src/indicator-messages.c b/src/indicator-messages.c index bccffe7..efb52b2 100644 --- a/src/indicator-messages.c +++ b/src/indicator-messages.c @@ -65,7 +65,16 @@ get_menu (void) DBusGConnection * connection = dbus_g_bus_get(DBUS_BUS_SESSION, NULL); DBusGProxy * proxy = dbus_g_proxy_new_for_name(connection, DBUS_SERVICE_DBUS, DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS); - org_freedesktop_DBus_start_service_by_name (proxy, INDICATOR_MESSAGES_DBUS_NAME, 0, &returnval, &error); + if (!org_freedesktop_DBus_start_service_by_name (proxy, INDICATOR_MESSAGES_DBUS_NAME, 0, &returnval, &error)) { + g_error("Unable to send message to DBus to start service: %s", error != NULL ? error->message : "(NULL error)" ); + g_error_free(error); + return NULL; + } + + if (returnval != DBUS_START_REPLY_SUCCESS && returnval != DBUS_START_REPLY_ALREADY_RUNNING) { + g_error("Return value isn't indicative of success: %d", returnval); + return NULL; + } return GTK_MENU(dbusmenu_gtkmenu_new(INDICATOR_MESSAGES_DBUS_NAME, INDICATOR_MESSAGES_DBUS_OBJECT)); } |