client: Make DBusConnection global

diff --git a/client/interactive.h b/client/interactive.h
index c5c73ed799891e86ecf62ad4b3ea4ca729c47274..394882dae875f7de70a106eeed24ffa6dcaec03e 100644 (file)
--- a/client/interactive.h
+++ b/client/interactive.h
@@ -22,6 +22,8 @@
 
 #include <dbus/dbus.h>
 
+extern DBusConnection *connection;
+
 void show_interactive(DBusConnection *connection, GMainLoop *mainloop);
 int commands(DBusConnection *connection, char *argv[], int argc);
 int commands_no_options(DBusConnection *connection, char *argv[], int argc);

diff --git a/client/main.c b/client/main.c
index d54d14880783da8f29577fcce884177571970dea..f913534aace744b47b9bf2c706d3c50a07b2670b 100644 (file)
--- a/client/main.c
+++ b/client/main.c
@@ -42,6 +42,7 @@
 #include "monitor.h"
 
 static GMainLoop *main_loop;
+DBusConnection *connection;
 
 static gboolean timeout_wait(gpointer data)
 {
@@ -72,7 +73,6 @@ static gboolean readmonitor(GIOChannel *channel, GIOCondition condition,
 
 int main(int argc, char *argv[])
 {
-       DBusConnection *connection;
        DBusError err;
        int events, error;
        GIOChannel *gchan;