remove unused alarmmgr_server objectsubmit/tizen_3.0_wearable/20161015.000000submit/tizen_3.0_tv/20161015.000000submit/tizen_3.0_mobile/20161015.000000submit/tizen_3.0_ivi/20161010.000010submit/tizen_3.0_ivi/20161010.000000submit/tizen_3.0_common/20161104.104000submit/tizen/20161005.072822accepted/tizen/wearable/20161006.075638accepted/tizen/tv/20161006.075627accepted/tizen/mobile/20161006.075606accepted/tizen/ivi/20161006.075653accepted/tizen/common/20161005.165556accepted/tizen/3.0/wearable/20161015.080405accepted/tizen/3.0/tv/20161016.003647accepted/tizen/3.0/mobile/20161015.032341accepted/tizen/3.0/ivi/20161011.053545

Change-Id: Ic01ff720605f70c00d8eb44917487f60e72574ec
Signed-off-by: Jiwoong Im <jiwoong.im@samsung.com>

1 files changed, 7 insertions, 10 deletions

diff --git a/alarm-manager.c b/alarm-manager.c
index c7a7c3c..5294404 100644
--- a/alarm-manager.c
+++ b/alarm-manager.c
@@ -111,7 +111,6 @@ static int log_fd = 0;
 /*  GDBus Declaration */
 #define ALARM_MGR_DBUS_PATH	"/org/tizen/alarm/manager"
 #define ALARM_MGR_DBUS_NAME	"org.tizen.alarm.manager"
-GDBusObjectManagerServer *alarmmgr_server = NULL;
 static AlarmManager* interface = NULL;
 
 sqlite3 *alarmmgr_db;
@@ -2042,6 +2041,8 @@ gboolean alarm_manager_alarm_set_rtc_time(AlarmManager *pObj, GDBusMethodInvocat
 	alarm_tm = gmtime_r(&current_time, &tm);
 	if (alarm_tm == NULL) {
 		ALARM_MGR_EXCEPTION_PRINT("alarm_tm is NULL");
+		return_code = ERR_ALARM_SYSTEM_FAIL;
+		g_dbus_method_invocation_return_value(invoc, g_variant_new("(i)", return_code));
 		return true;
 	}
 
@@ -3298,12 +3299,6 @@ static bool __initialize_dbus()
 	guint subsc_id;
 	ALARM_MGR_LOG_PRINT("__initialize_dbus Enter");
 
-	alarmmgr_server = g_dbus_object_manager_server_new(ALARM_MGR_DBUS_PATH);
-	if (alarmmgr_server == NULL) {
-		ALARM_MGR_EXCEPTION_PRINT("Creating a new server object is failed.");
-		return false;
-	}
-
 	connection = g_bus_get_sync(G_BUS_TYPE_SYSTEM, NULL, &error);
 	if (connection == NULL) {
 		ALARM_MGR_EXCEPTION_PRINT("g_bus_get_sync() is failed");
@@ -3317,6 +3312,7 @@ static bool __initialize_dbus()
 	interface = alarm_manager_skeleton_new();
 	if (interface == NULL) {
 		ALARM_MGR_EXCEPTION_PRINT("Creating a skeleton object is failed.");
+		g_object_unref(connection);
 		return false;
 	}
 
@@ -3347,6 +3343,7 @@ static bool __initialize_dbus()
 		ALARM_MGR_EXCEPTION_PRINT("Subscribing to signal for invoking callback is failed.");
 		g_object_unref(interface);
 		interface = NULL;
+		g_object_unref(connection);
 		return false;
 	}
 
@@ -3354,11 +3351,10 @@ static bool __initialize_dbus()
 		ALARM_MGR_EXCEPTION_PRINT("Exporting the interface is failed.");
 		g_object_unref(interface);
 		interface = NULL;
+		g_object_unref(connection);
 		return false;
 	}
 
-	g_dbus_object_manager_server_set_connection(alarmmgr_server, connection);
-
 	guint owner_id = g_bus_own_name_on_connection(connection,
 			ALARM_MGR_DBUS_NAME, G_BUS_NAME_OWNER_FLAGS_NONE,
 			NULL, NULL, NULL, NULL);
@@ -3366,7 +3362,8 @@ static bool __initialize_dbus()
 	if (owner_id == 0) {
 		ALARM_MGR_EXCEPTION_PRINT("Acquiring the own name is failed.");
 		g_object_unref(interface);
-		g_object_unref(alarmmgr_server);
+		interface = NULL;
+		g_object_unref(connection);
 		return false;
 	}