diff options
| author | Johan Hedberg <johan.hedberg@nokia.com> | 2008-09-06 02:14:11 +0300 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@nokia.com> | 2008-09-06 02:14:11 +0300 |
| commit | c0e36773cd39036911e2691e90a1549f95713b27 (patch) | |
| tree | 1dfd759363deda37fbd470ad9252cf4700a0c9b6 /audio | |
| parent | e39e47274ac26e9900067f55e6a2090e3c861d2e (diff) | |
| parent | 91402bad9a182902c242f98f1e5f55d4190b4d01 (diff) | |
Merge branch 'master' of ssh://master.kernel.org/pub/scm/bluetooth/bluez
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/audio/main.c b/audio/main.c index bf0e4884..4583ca81 100644 --- a/audio/main.c +++ b/audio/main.c @@ -39,8 +39,6 @@ #include "device.h" #include "manager.h" -static DBusConnection *connection = NULL; - static GKeyFile *load_config_file(const char *file) { GError *err = NULL; @@ -58,6 +56,8 @@ static GKeyFile *load_config_file(const char *file) return keyfile; } +static DBusConnection *connection; + static int audio_init(void) { GKeyFile *config; |