summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrik Flykt <patrik.flykt@linux.intel.com>2013-02-12 21:56:29 +0200
committerPatrik Flykt <patrik.flykt@linux.intel.com>2013-02-21 16:22:24 +0200
commit9cab759afb312f5c419de2ec8351717c92859248 (patch)
tree568638a19217723242d66a22626da586a40e5d90
parent94556b3ad43b6e800c8915b1b617a1c6d0983436 (diff)
downloadconnman-9cab759afb312f5c419de2ec8351717c92859248.tar.gz
connman-9cab759afb312f5c419de2ec8351717c92859248.tar.bz2
connman-9cab759afb312f5c419de2ec8351717c92859248.zip
client: Make DBusConnection global
-rw-r--r--client/interactive.h2
-rw-r--r--client/main.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/client/interactive.h b/client/interactive.h
index c5c73ed7..394882da 100644
--- 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 d54d1488..f913534a 100644
--- 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;