Commit 130d6cdb authored by Marco Trevisan's avatar Marco Trevisan Committed by Bastien Nocera
Browse files

main: Move fprintd_dbus_conn declaration to main.c

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.

../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;
     |                         ^~~~~~~~~~~~~~~~~
parent e2fd5219
......@@ -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);
......@@ -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;
......@@ -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);
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment