summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2010-09-19 21:17:26 +0200
committerLennart Poettering <lennart@poettering.net>2010-09-20 01:18:20 +0200
commit25b5d47b961542ceca5f589cc69041b2d941c054 (patch)
tree62d898f7b3c6a5b94f1344b71f5206c9e174aa8d
parent24dc214f55e7c7c17d888d0ccf94cd3625767462 (diff)
dbus: bump dependency on dbus-glib to 0.82
dbus-glib >= 0.82 requires dbus >= 1.1 so we can safely remove DBUS_API_SUBJECT_TO_CHANGE.
-rw-r--r--configure.ac2
-rw-r--r--src/ck-manager.c1
-rw-r--r--src/ck-seat.c1
-rw-r--r--src/ck-session-leader.c1
-rw-r--r--src/ck-session.c1
-rw-r--r--src/ck-vt-monitor.c1
-rw-r--r--src/main.c1
-rw-r--r--tools/list-sessions.c1
8 files changed, 1 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac
index 43f57aa..5ac60f9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,7 +35,7 @@ AM_GLIB_GNU_GETTEXT
# Dependencies
-DBUS_REQUIRED_VERSION=0.30
+DBUS_REQUIRED_VERSION=0.82
GLIB_REQUIRED_VERSION=2.14
X11_REQUIRED_VERSION=1.0.0
POLKIT_REQUIRED_VERSION=0.92
diff --git a/src/ck-manager.c b/src/ck-manager.c
index ae399e8..a040be3 100644
--- a/src/ck-manager.c
+++ b/src/ck-manager.c
@@ -35,7 +35,6 @@
#include <glib/gi18n.h>
#include <glib/gstdio.h>
#include <glib-object.h>
-#define DBUS_API_SUBJECT_TO_CHANGE
#include <dbus/dbus-glib.h>
#include <dbus/dbus-glib-lowlevel.h>
diff --git a/src/ck-seat.c b/src/ck-seat.c
index 2e48963..59db29f 100644
--- a/src/ck-seat.c
+++ b/src/ck-seat.c
@@ -30,7 +30,6 @@
#include <glib/gi18n.h>
#include <glib-object.h>
-#define DBUS_API_SUBJECT_TO_CHANGE
#include <dbus/dbus-glib.h>
#include <dbus/dbus-glib-lowlevel.h>
diff --git a/src/ck-session-leader.c b/src/ck-session-leader.c
index 3702602..c2ab15b 100644
--- a/src/ck-session-leader.c
+++ b/src/ck-session-leader.c
@@ -32,7 +32,6 @@
#include <glib/gi18n.h>
#include <glib/gstdio.h>
#include <glib-object.h>
-#define DBUS_API_SUBJECT_TO_CHANGE
#include <dbus/dbus-glib.h>
#include <dbus/dbus-glib-lowlevel.h>
diff --git a/src/ck-session.c b/src/ck-session.c
index 8a566bb..f291bf3 100644
--- a/src/ck-session.c
+++ b/src/ck-session.c
@@ -32,7 +32,6 @@
#include <glib/gi18n.h>
#include <glib/gstdio.h>
#include <glib-object.h>
-#define DBUS_API_SUBJECT_TO_CHANGE
#include <dbus/dbus-glib.h>
#include <dbus/dbus-glib-lowlevel.h>
diff --git a/src/ck-vt-monitor.c b/src/ck-vt-monitor.c
index 9310341..c6458b6 100644
--- a/src/ck-vt-monitor.c
+++ b/src/ck-vt-monitor.c
@@ -34,7 +34,6 @@
#include <glib/gstdio.h>
#include <glib-object.h>
-#define DBUS_API_SUBJECT_TO_CHANGE
#include <dbus/dbus-glib.h>
#include <dbus/dbus-glib-lowlevel.h>
diff --git a/src/main.c b/src/main.c
index f685026..a39bd71 100644
--- a/src/main.c
+++ b/src/main.c
@@ -34,7 +34,6 @@
#include <glib/gi18n.h>
#include <glib-object.h>
-#define DBUS_API_SUBJECT_TO_CHANGE
#include <dbus/dbus-glib.h>
#include <dbus/dbus-glib-lowlevel.h>
diff --git a/tools/list-sessions.c b/tools/list-sessions.c
index 3933772..c3a020b 100644
--- a/tools/list-sessions.c
+++ b/tools/list-sessions.c
@@ -32,7 +32,6 @@
#include <glib.h>
#include <glib/gi18n.h>
-#define DBUS_API_SUBJECT_TO_CHANGE
#include <dbus/dbus.h>
#include <dbus/dbus-glib.h>
#include <dbus/dbus-glib-lowlevel.h>