(4) move on_name_acquired functionality to on_bus_acquired

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

diff --git a/src/interfaces/localed/localed.c b/src/interfaces/localed/localed.c
index 5ecd79095483c06e11ab9a1bb3db6744a7f40160..10ae7b714337f44bd60f796f908f4e1cdbabed4f 100644 (file)
--- a/src/interfaces/localed/localed.c
+++ b/src/interfaces/localed/localed.c
@@ -16,18 +16,26 @@
 
 #include <unistd.h>
 #include <limits.h>
+#include <signal.h>
 
 #include <sys/param.h>
 #include <string.h>
 
 #include <glib/gprintf.h>
+#include <glib-unix.h>
 
 #include "localed-gen.h"
+#include "localed.h"
 
 GPtrArray *localed_freeable;
 Locale1 *localed_interf;
 
-/* --- begin method/property/signal code --- */
+GMainLoop *localed_loop;
+
+guint bus_descriptor;
+gboolean dbus_interface_exported; /* reliable because of gdbus operational guarantees */
+
+/* --- begin method/property/dbus signal code --- */
 
 /*static gboolean
 on_handle_set_hostname(Locale1 *hn1_passed_interf,
@@ -56,22 +64,14 @@ our_get_hostname() {
        return strncpy(ret, hostname_buf, hostname_divider);
 }*/
 
-/* --- end method/property/signal code, begin bus/name handlers --- */
+/* --- end method/property/dbus signal code, begin bus/name handlers --- */
 
 static void localed_on_bus_acquired(GDBusConnection *conn,
                                     const gchar *name,
                                     gpointer user_data) {
 
-    g_print("got bus, name: %s\n", name);   
-
-}
-
-static void localed_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);
+ 
     localed_interf = locale1_skeleton_new();
 
     /* attach function pointers to generated struct's method handlers 
@@ -85,36 +85,50 @@ static void localed_on_name_acquired(GDBusConnection *conn,
                                          "/org/freedesktop/locale1",
                                          NULL)) {
 
-        g_printf("Failed to export Locale1's interface!");
-    }
+        g_printf("failed to export %s's interface!\n", name);
+        localed_mem_clean();
 
-}
+    } else {
 
-/* --- end bus/name handlers, begin misc functions --- */
+        dbus_interface_exported = TRUE;
+        g_printf("exported %s's interface on the system bus...\n", name);
+    }
+}
 
-/* free()'s */
-void localed_mem_clean() {
+static void localed_on_name_acquired(GDBusConnection *conn,
+                                        const gchar *name,
+                                     gpointer user_data) {
 
-    g_ptr_array_foreach(localed_freeable, (GFunc) g_free, NULL);
-       g_ptr_array_free(localed_freeable, TRUE);
+       g_printf("success!\n");
 }
 
 static void localed_on_name_lost(GDBusConnection *conn,
                                    const gchar *name,
                                    gpointer user_data) {
 
-    g_print("lost name %s, exiting...", name);
+       if(!conn) {
+
+               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);
+               localed_mem_clean();
+       }
+
+       g_print("lost name %s, exiting...\n", name);
 
     localed_mem_clean();
-    g_dbus_interface_skeleton_unexport(G_DBUS_INTERFACE_SKELETON(localed_interf));
+}
+
+/* --- end bus/name handlers, begin misc unix functions --- */
+
+/* safe call to clean and then exit
+ * this stops our GMainLoop safely before letting main() return */
+void localed_mem_clean() {
 
+    g_ptr_array_foreach(localed_freeable, (GFunc) g_free, NULL);
+       g_ptr_array_free(localed_freeable, TRUE);
 }
 
 int main() {
 
-       guint bus_descriptor;
-       GMainLoop *localed_loop;
-
        localed_loop = g_main_loop_new(NULL, TRUE);
        localed_freeable = g_ptr_array_new();