From 9173453254f32fd81964fbe4c176ffe65bdb74ea Mon Sep 17 00:00:00 2001 From: Patrick McCarty Date: Mon, 23 Jul 2012 13:14:57 -0700 Subject: [PATCH] Fix crash when switching to Timer tab in Clock app The alarm-server tries to get info from the dbus system bus, but it is running in the user session, which uses the dbus session bus. This commit fixes the crash, though there is still an issue with setting the alarms. Change-Id: I87665c33518f22ede30a5aa82e3504830fa57490 Signed-off-by: Patrick McCarty --- alarm-lib.c | 2 +- alarm-manager.c | 2 +- packaging/alarm-manager.changes | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/alarm-lib.c b/alarm-lib.c index da24dbd..3055d49 100755 --- a/alarm-lib.c +++ b/alarm-lib.c @@ -190,7 +190,7 @@ static int __sub_init() g_thread_init(NULL); dbus_g_thread_init(); - alarm_context.bus = dbus_g_bus_get(DBUS_BUS_SYSTEM, &error); + alarm_context.bus = dbus_g_bus_get(DBUS_BUS_SESSION, &error); if (alarm_context.bus == NULL) { ALARM_MGR_EXCEPTION_PRINT("dbus bus get failed\n"); diff --git a/alarm-manager.c b/alarm-manager.c index 5e4bac6..db06265 100755 --- a/alarm-manager.c +++ b/alarm-manager.c @@ -2344,7 +2344,7 @@ static bool __initialize_dbus() dbus_g_object_type_install_info(ALARM_MANAGER_TYPE_OBJECT, &dbus_glib_alarm_manager_object_info); - connection = dbus_g_bus_get(DBUS_BUS_SYSTEM, &error); + connection = dbus_g_bus_get(DBUS_BUS_SESSION, &error); if (!connection) { ALARM_MGR_EXCEPTION_PRINT("dbus_g_bus_get failed\n"); diff --git a/packaging/alarm-manager.changes b/packaging/alarm-manager.changes index dc47191..fae2657 100644 --- a/packaging/alarm-manager.changes +++ b/packaging/alarm-manager.changes @@ -1,3 +1,6 @@ +* Mon Jul 23 2012 Patrick McCarty f7983c6 +- Fix crash when switching to Timer tab in Clock app + * Thu Jun 28 2012 Patrick McCarty - 0.4.46 - Fix initscript symlinks for alarm-server -- 2.7.4