(3) add needed GLib headers, move loop and bus descr out of main into global

minor variable placement changes. added gboolean dbus_interface_exported,
which due to the guarantees of the name_lost, bus_acquired, and name_acquired
is a reliable source of whether not it is reasonable to try and unexport it

diff --git a/src/interfaces/localed/localed.c b/src/interfaces/localed/localed.c
index a40e4580a400c1c679a662b4915a62e34caa0f69..c11ae36b2c5be0f8a2bb6aaaa00070bd83abc8cf 100644 (file)
--- a/src/interfaces/localed/localed.c
+++ b/src/interfaces/localed/localed.c
@@ -16,6 +16,7 @@
 
 #include <unistd.h>
 #include <limits.h>
+#include <signal.h>
 
 #include <sys/param.h>
 #include <string.h>
@@ -29,6 +30,11 @@
 GPtrArray *localed_freeable;
 Locale1 *localed_interf;
 
+GMainLoop *localed_loop;
+
+guint bus_descriptor;
+gboolean dbus_interface_exported; /* reliable because of gdbus operational guarantees */
+
 /* --- begin method/property/dbus signal code --- */
 
 /*static gboolean
@@ -114,9 +120,6 @@ void localed_mem_clean() {
 
 int main() {
 
-       guint bus_descriptor;
-       GMainLoop *localed_loop;
-
        localed_loop = g_main_loop_new(NULL, TRUE);
        localed_freeable = g_ptr_array_new();
 

diff --git a/src/interfaces/logind/logind.c b/src/interfaces/logind/logind.c
index bb740a72ef3e13f63d5cfb7fb22cd9a5cf85ea55..3b9cab68686c73dcc592e1e45043e5c581a62c41 100644 (file)
--- a/src/interfaces/logind/logind.c
+++ b/src/interfaces/logind/logind.c
@@ -16,6 +16,7 @@
 
 #include <unistd.h>
 #include <limits.h>
+#include <signal.h>
 
 #include <sys/param.h>
 #include <string.h>
@@ -29,6 +30,11 @@
 GPtrArray *logind_freeable;
 Login1Manager *logind_interf;
 
+GMainLoop *logind_loop;
+
+guint bus_descriptor;
+gboolean dbus_interface_exported; /* reliable because of gdbus operational guarantees */
+
 /* --- begin method/property/dbus signal code --- */
 
 /*static gboolean
@@ -114,9 +120,6 @@ void logind_mem_clean() {
 
 int main() {
 
-       guint bus_descriptor;
-       GMainLoop *logind_loop;
-
        logind_loop = g_main_loop_new(NULL, TRUE);
        logind_freeable = g_ptr_array_new();
 

diff --git a/src/interfaces/timedated/timedated.c b/src/interfaces/timedated/timedated.c
index 5d465dd4fd4ff08f0f5bec04390b565896d4e96c..8f30d01310630482fd0386a3ddf3c6dc6134f0d1 100644 (file)
--- a/src/interfaces/timedated/timedated.c
+++ b/src/interfaces/timedated/timedated.c
@@ -16,6 +16,7 @@
 
 #include <unistd.h>
 #include <limits.h>
+#include <signal.h>
 
 #include <sys/param.h>
 #include <string.h>
@@ -29,6 +30,11 @@
 GPtrArray *timedated_freeable;
 Timedate1 *timedated_interf;
 
+GMainLoop *timedated_loop;
+
+guint bus_descriptor;
+gboolean dbus_interface_exported; /* reliable because of gdbus operational guarantees */
+
 /* --- begin method/property/dbus signal code --- */
 
 /*static gboolean
@@ -114,9 +120,6 @@ void timedated_mem_clean() {
 
 int main() {
 
-       guint bus_descriptor;
-       GMainLoop *timedated_loop;
-
        timedated_loop = g_main_loop_new(NULL, TRUE);
        timedated_freeable = g_ptr_array_new();