(4) move on_name_acquired functionality to on_bus_acquired

[systembsd.git] / src / interfaces / timedated / timedated.c

diff --git a/src/interfaces/timedated/timedated.c b/src/interfaces/timedated/timedated.c
index 8f30d01310630482fd0386a3ddf3c6dc6134f0d1..3df5fc6e3e1fd956ef15894741f2896eb154680b 100644 (file)
--- a/src/interfaces/timedated/timedated.c
+++ b/src/interfaces/timedated/timedated.c
@@ -70,15 +70,7 @@ static void timedated_on_bus_acquired(GDBusConnection *conn,
                                       const gchar *name,
                                       gpointer user_data) {
 
-    g_print("got bus, name: %s\n", name);   
-
-}
-
-static void timedated_on_name_acquired(GDBusConnection *conn,
-                                          const gchar *name,
-                                       gpointer user_data) {
-
-    g_print("got '%s' on system bus\n", name);
+    g_print("got bus/name, exporting %s's interface...\n", name);
 
     timedated_interf = timedate1_skeleton_new();
 
@@ -93,25 +85,42 @@ static void timedated_on_name_acquired(GDBusConnection *conn,
                                          "/org/freedesktop/timedate1",
                                          NULL)) {
 
-        g_printf("Failed to export Timedate1's interface!");
+        g_printf("failed to export %s's interface!\n", name);
+        timedated_mem_clean();
+
+    } else {
+
+        dbus_interface_exported = TRUE;
+        g_printf("exported %s's interface on the system bus...\n", name);
     }
+}
+
+static void timedated_on_name_acquired(GDBusConnection *conn,
+                                          const gchar *name,
+                                       gpointer user_data) {
 
+   g_printf("success!\n"); 
 }
 
 static void timedated_on_name_lost(GDBusConnection *conn,
                                    const gchar *name,
                                    gpointer user_data) {
 
-    g_print("lost name %s, exiting...", name);
+    if(!conn) {
 
-    timedated_mem_clean();
-    g_dbus_interface_skeleton_unexport(G_DBUS_INTERFACE_SKELETON(timedated_interf));
+        g_printf("failed to connect to the system bus while trying to acquire name '%s': either dbus-daemon isn't running or we don't have permission to push names and/or their interfaces to it.\n", name);
+        timedated_mem_clean();
+    }
 
+    g_print("lost name %s, exiting...\n", name);
+
+    timedated_mem_clean();
 }
 
 /* --- end bus/name handlers, begin misc unix functions --- */
 
-/* free()'s */
+/* safe call to clean and then exit
+ * this stops our GMainLoop safely before letting main() return */
 void timedated_mem_clean() {
 
     g_ptr_array_foreach(timedated_freeable, (GFunc) g_free, NULL);