summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorraveit65 <[email protected]>2013-07-30 16:10:58 +0200
committerraveit65 <[email protected]>2013-07-30 16:10:58 +0200
commit5f09ce6843a1d1a96db95a1d9fe487d4a2afb4d7 (patch)
tree7e2e5f34ad26083c80201bfa836f67a88effc48d
parent21f1837929f4e7416ffac87c019e96baef7a8cc0 (diff)
downloadmate-user-share-5f09ce6843a1d1a96db95a1d9fe487d4a2afb4d7.tar.bz2
mate-user-share-5f09ce6843a1d1a96db95a1d9fe487d4a2afb4d7.tar.xz
Require dbus >= 1.1.1
-rw-r--r--configure.ac8
-rw-r--r--src/http.c9
2 files changed, 1 insertions, 16 deletions
diff --git a/configure.ac b/configure.ac
index 9db592b..5450ed6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -50,13 +50,7 @@ fi
AC_SUBST(HTTPD)
-PKG_CHECK_EXISTS(dbus-1 >= 1.1.1, have_dbus_1_1=true, have_dbus_1_1=false)
-if $have_dbus_1_1 ; then
- DBUS_MODULES=dbus-1
- AC_DEFINE(HAVE_DBUS_1_1, 1, [Set to true if we have D-BUS 1.1])
-fi
-
-PKG_CHECK_MODULES(USER_SHARE, glib-2.0 >= 2.15.2 gio-2.0 >= 2.26 gdk-x11-2.0 gtk+-2.0 dbus-glib-1 libnotify >= 0.7.0 libcanberra-gtk $DBUS_MODULES)
+PKG_CHECK_MODULES(USER_SHARE, glib-2.0 >= 2.15.2 gio-2.0 >= 2.26 gdk-x11-2.0 gtk+-2.0 dbus-1 >= 1.1.1 dbus-glib-1 libnotify >= 0.7.0 libcanberra-gtk $DBUS_MODULES)
AC_SUBST(USER_SHARE_CFLAGS)
AC_SUBST(USER_SHARE_LIBS)
diff --git a/src/http.c b/src/http.c
index c07a202..13b11eb 100644
--- a/src/http.c
+++ b/src/http.c
@@ -26,10 +26,7 @@
#include <glib.h>
#include <glib/gi18n.h>
#include <X11/Xlib.h>
-
-#ifdef HAVE_DBUS_1_1
#include <dbus/dbus.h>
-#endif
#include <gio/gio.h>
@@ -57,9 +54,7 @@
#define GSETTINGS_SCHEMA "org.mate.FileSharing"
-#ifdef HAVE_DBUS_1_1
static char *dbus_session_id;
-#endif
static pid_t httpd_pid = 0;
@@ -155,7 +150,6 @@ get_share_name (void)
return name;
}
-#ifdef HAVE_DBUS_1_1
static void
init_dbus() {
/* The only use we make of D-BUS is to fetch the session BUS ID so we can export
@@ -190,7 +184,6 @@ init_dbus() {
dbus_connection_close(connection);
dbus_connection_unref(connection);
}
-#endif
static void
ensure_conf_dir (void)
@@ -470,9 +463,7 @@ http_down (void)
gboolean
http_init (void)
{
-#ifdef HAVE_DBUS_1_1
init_dbus();
-#endif
return TRUE;
}