(4) move on_name_acquired functionality to on_bus_acquired

work that was previously done in foo_on_name_acquired(), such as attaching
the interface to the name, is now done in foo_on_bus_acquired(), as GIO docs
suggest. this fixed a bug with logind failing to export, the name_acquired function
executed executed too late to export a big interface like logind.

fix some minor error msg/consistency stuff in hostnamed, merge across pals. builds

1 files changed, 23 insertions, 14 deletions

diff --git a/src/interfaces/logind/logind.c b/src/interfaces/logind/logind.c
index 3b9cab6..b08db9f 100644
--- a/src/interfaces/logind/logind.c
+++ b/src/interfaces/logind/logind.c
@@ -70,15 +70,7 @@ static void logind_on_bus_acquired(GDBusConnection *conn,
                                    const gchar *name,
                                    gpointer user_data) {
 
-    g_print("got bus, name: %s\n", name);   
-
-}
-
-static void logind_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);
 
     logind_interf = login1_manager_skeleton_new();
 
@@ -93,25 +85,42 @@ static void logind_on_name_acquired(GDBusConnection *conn,
                                          "/org/freedesktop/login1_manager",
                                          NULL)) {
 
-        g_printf("Failed to export Login1Manager's interface!");
+        g_printf("failed to export %s's interface!\n", name);
+        logind_mem_clean();
+
+    } else {
+
+        dbus_interface_exported = TRUE;
+        g_printf("exported %s's interface on the system bus...\n", name);
     }
+}
 
+static void logind_on_name_acquired(GDBusConnection *conn,
+    		                        const gchar *name,
+                                    gpointer user_data) {
+
+   g_printf("success!\n");
 }
 
 static void logind_on_name_lost(GDBusConnection *conn,
                                 const gchar *name,
                                 gpointer user_data) {
 
-    g_print("lost name %s, exiting...", name);
+    if(!conn) {
 
-    logind_mem_clean();
-    g_dbus_interface_skeleton_unexport(G_DBUS_INTERFACE_SKELETON(logind_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);
 
+    }
+
+    g_print("lost name %s, exiting...\n", name);
+
+    logind_mem_clean();
 }
 
 /* --- end bus/name handlers, begin misc unix functions --- */
 
-/* free()'s */
+/* safe call to clean and then exit
+ * this stops our GMainLoop sfaely before letting main() return */
 void logind_mem_clean() {
 
     g_ptr_array_foreach(logind_freeable, (GFunc) g_free, NULL);