From 130d6cdb639ccb458b30fc79634644031ddd41ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
Date: Mon, 27 Jan 2020 19:10:57 +0100
Subject: [PATCH] main: Move fprintd_dbus_conn declaration to main.c
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

There's no need to declare it as extern in the header as it is already
declared in the source files where it's used.

Fixes:
../src/device.c:51:25: error: redundant redeclaration of ‘fprintd_dbus_conn’ [-Werror=redundant-decls]
  51 | extern DBusGConnection *fprintd_dbus_conn;
     |                         ^~~~~~~~~~~~~~~~~
In file included from ../src/device.c:34:
../src/fprintd.h:29:25: note: previous declaration of ‘fprintd_dbus_conn’ was here
  29 | extern DBusGConnection *fprintd_dbus_conn;
     |                         ^~~~~~~~~~~~~~~~~
---
 src/fprintd.h | 1 -
 src/main.c    | 2 +-
 src/manager.c | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/fprintd.h b/src/fprintd.h
index 3f28026..330523e 100644
--- a/src/fprintd.h
+++ b/src/fprintd.h
@@ -26,7 +26,6 @@
 /* General */
 #define TIMEOUT 30
 #define FPRINT_SERVICE_NAME "net.reactivated.Fprint"
-extern DBusGConnection *fprintd_dbus_conn;
 
 /* Errors */
 GQuark fprint_error_quark(void);
diff --git a/src/main.c b/src/main.c
index ce1a47d..bae586d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -35,7 +35,7 @@
 
 fp_storage store;
 
-extern DBusGConnection *fprintd_dbus_conn;
+DBusGConnection *fprintd_dbus_conn = NULL;
 static gboolean no_timeout = FALSE;
 static gboolean g_fatal_warnings = FALSE;
 
diff --git a/src/manager.c b/src/manager.c
index cf4b9f3..b14c78b 100644
--- a/src/manager.c
+++ b/src/manager.c
@@ -27,7 +27,7 @@
 
 #include "fprintd.h"
 
-DBusGConnection *fprintd_dbus_conn;
+extern DBusGConnection *fprintd_dbus_conn;
 
 static gboolean fprint_manager_get_devices(FprintManager *manager,
 	GPtrArray **devices, GError **error);