(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

diff --git a/src/interfaces/hostnamed/hostnamed.c b/src/interfaces/hostnamed/hostnamed.c
index 979df6e78da437ed16d09f7b034ef61137804ab8..cf066b285d64914f04fb0c1689cc12bcefc75fcf 100644 (file)
--- a/src/interfaces/hostnamed/hostnamed.c
+++ b/src/interfaces/hostnamed/hostnamed.c
@@ -196,9 +196,8 @@ static void hostnamed_on_bus_acquired(GDBusConnection *conn,
     } else {
 
                dbus_interface_exported = TRUE;
     } else {
 
                dbus_interface_exported = TRUE;

-               g_printf("exported %s's interface on the system bus...", name);
+               g_printf("exported %s's interface on the system bus...\n", name);

        }
        }

-

 }
 
 static void hostnamed_on_name_acquired(GDBusConnection *conn,
 }
 
 static void hostnamed_on_name_acquired(GDBusConnection *conn,


@@ -206,7 +205,6 @@ static void hostnamed_on_name_acquired(GDBusConnection *conn,
                                        gpointer user_data) {
 
     g_printf("success!\n");
                                        gpointer user_data) {
 
     g_printf("success!\n");

- 

 }
 
 static void hostnamed_on_name_lost(GDBusConnection *conn,
 }
 
 static void hostnamed_on_name_lost(GDBusConnection *conn,


@@ -215,12 +213,11 @@ static void hostnamed_on_name_lost(GDBusConnection *conn,
 
        if(!conn) {
 
 
        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", name);
-
+               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);

                hostnamed_mem_clean();
        }
 
                hostnamed_mem_clean();
        }
 

-    g_printf("lost name %s, exiting...", name);
+    g_printf("lost name %s, exiting...\n", name);

 
     hostnamed_mem_clean();
 }
 
     hostnamed_mem_clean();
 }


@@ -228,7 +225,7 @@ static void hostnamed_on_name_lost(GDBusConnection *conn,
 /* --- end bus/name handlers, begin misc unix functions --- */
 
 /* safe call to clean and then exit
 /* --- end bus/name handlers, begin misc unix functions --- */
 
 /* safe call to clean and then exit

- * this stops our GMainLoop safely before letting main() return  */
+ * this stops our GMainLoop safely before letting main() return */

 void hostnamed_mem_clean() {
 
        g_printf("exiting...\n");
 void hostnamed_mem_clean() {
 
        g_printf("exiting...\n");

diff --git a/src/interfaces/localed/localed.c b/src/interfaces/localed/localed.c
index c11ae36b2c5be0f8a2bb6aaaa00070bd83abc8cf..10ae7b714337f44bd60f796f908f4e1cdbabed4f 100644 (file)
--- a/src/interfaces/localed/localed.c
+++ b/src/interfaces/localed/localed.c
@@ -70,16 +70,8 @@ static void localed_on_bus_acquired(GDBusConnection *conn,
                                     const gchar *name,
                                     gpointer user_data) {
 
                                     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 
     localed_interf = locale1_skeleton_new();
 
     /* attach function pointers to generated struct's method handlers 


@@ -93,25 +85,42 @@ static void localed_on_name_acquired(GDBusConnection *conn,
                                          "/org/freedesktop/locale1",
                                          NULL)) {
 
                                          "/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 {
+
+        dbus_interface_exported = TRUE;
+        g_printf("exported %s's interface on the system bus...\n", name);

     }
     }

+}

 
 

+static void localed_on_name_acquired(GDBusConnection *conn,
+                                        const gchar *name,
+                                     gpointer user_data) {
+
+       g_printf("success!\n");

 }
 
 static void localed_on_name_lost(GDBusConnection *conn,
                                    const gchar *name,
                                    gpointer user_data) {
 
 }
 
 static void localed_on_name_lost(GDBusConnection *conn,
                                    const gchar *name,
                                    gpointer user_data) {
 

-    g_print("lost name %s, exiting...", name);
+       if(!conn) {

 
 

-    localed_mem_clean();
-    g_dbus_interface_skeleton_unexport(G_DBUS_INTERFACE_SKELETON(localed_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);
+               localed_mem_clean();
+       }

 
 

+       g_print("lost name %s, exiting...\n", name);
+
+    localed_mem_clean();

 }
 
 /* --- end bus/name handlers, begin misc unix functions --- */
 
 }
 
 /* --- 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 localed_mem_clean() {
 
     g_ptr_array_foreach(localed_freeable, (GFunc) g_free, NULL);
 void localed_mem_clean() {
 
     g_ptr_array_foreach(localed_freeable, (GFunc) g_free, NULL);

diff --git a/src/interfaces/logind/logind.c b/src/interfaces/logind/logind.c
index 3b9cab68686c73dcc592e1e45043e5c581a62c41..b08db9f17f3de7d9ddbbde3a3ce56451c8b708b0 100644 (file)
--- 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) {
 
                                    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();
 
 
     logind_interf = login1_manager_skeleton_new();
 


@@ -93,25 +85,42 @@ static void logind_on_name_acquired(GDBusConnection *conn,
                                          "/org/freedesktop/login1_manager",
                                          NULL)) {
 
                                          "/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) {
 
 }
 
 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 --- */
 
 }
 
 /* --- 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);
 void logind_mem_clean() {
 
     g_ptr_array_foreach(logind_freeable, (GFunc) g_free, NULL);

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) {
 
                                       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();
 
 
     timedated_interf = timedate1_skeleton_new();
 


@@ -93,25 +85,42 @@ static void timedated_on_name_acquired(GDBusConnection *conn,
                                          "/org/freedesktop/timedate1",
                                          NULL)) {
 
                                          "/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) {
 
 }
 
 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 --- */
 
 }
 
 /* --- 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);
 void timedated_mem_clean() {
 
     g_ptr_array_foreach(timedated_freeable, (GFunc) g_free, NULL);