[Xfce4-commits] [xfce/xfce4-power-manager] 32/63: Removed all dbus includes and add gio dependency
noreply at xfce.org
noreply at xfce.org
Sun Mar 22 13:02:27 CET 2015
This is an automated email from the git hooks/post-receive script.
eric pushed a commit to branch master
in repository xfce/xfce4-power-manager.
commit 42892ec44912c9eaef1e9e2ad4d96c07b59fabb5
Author: Peter de Ridder <peter at xfce.org>
Date: Mon Mar 9 20:52:08 2015 +0100
Removed all dbus includes and add gio dependency
---
common/xfpm-power-common.c | 1 -
common/xfpm-power-common.h | 2 --
configure.ac.in | 5 +----
libdbus/xfpm-dbus-monitor.c | 4 ----
libdbus/xfpm-dbus-monitor.h | 1 -
libdbus/xfpm-dbus.h | 3 +--
libdbus/xfpm-unique.c | 2 --
panel-plugins/power-manager-plugin/power-manager-button.c | 1 -
settings/xfpm-settings-main.c | 3 ---
src/xfpm-battery.h | 1 -
src/xfpm-console-kit.c | 2 --
src/xfpm-inhibit.c | 3 ---
src/xfpm-kbd-backlight.c | 1 -
src/xfpm-main.c | 3 ---
src/xfpm-manager.c | 3 +--
src/xfpm-manager.h | 1 -
src/xfpm-network-manager.c | 1 -
src/xfpm-polkit.c | 2 --
src/xfpm-power.c | 2 --
19 files changed, 3 insertions(+), 38 deletions(-)
diff --git a/common/xfpm-power-common.c b/common/xfpm-power-common.c
index f757f34..43fc731 100644
--- a/common/xfpm-power-common.c
+++ b/common/xfpm-power-common.c
@@ -23,7 +23,6 @@
#endif
#include <libxfce4util/libxfce4util.h>
-#include <dbus/dbus-glib-lowlevel.h>
#include <upower.h>
#include "xfpm-power-common.h"
diff --git a/common/xfpm-power-common.h b/common/xfpm-power-common.h
index 0fc84bf..6272c5a 100644
--- a/common/xfpm-power-common.h
+++ b/common/xfpm-power-common.h
@@ -21,8 +21,6 @@
#ifndef XFPM_UPOWER_COMMON
#define XFPM_UPOWER_COMMON
-#include <dbus/dbus-glib.h>
-
#define UPOWER_NAME "org.freedesktop.UPower"
#define UPOWER_PATH "/org/freedesktop/UPower"
diff --git a/configure.ac.in b/configure.ac.in
index bac8e09..351844f 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -61,8 +61,6 @@ XDT_I18N([@LINGUAS@])
#=====================================================#
m4_define([gtk_minimum_version], [3.10.0])
m4_define([glib_minimum_version], [2.30.0])
-m4_define([dbus_minimum_version], [1.1])
-m4_define([dbus_glib_minimum_version], [0.84])
m4_define([xfconf_minimum_version], [4.10.0])
m4_define([libxfce4ui_minimum_version],[4.11.0])
@@ -79,8 +77,7 @@ XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [glib_minimum_version])
XDT_CHECK_PACKAGE([GOBJECT], [gobject-2.0], [glib_minimum_version])
XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [glib_minimum_version])
XDT_CHECK_PACKAGE([GMODULE], [gmodule-2.0], [glib_minimum_version])
-XDT_CHECK_PACKAGE([DBUS], [dbus-1], [dbus_minimum_version])
-XDT_CHECK_PACKAGE([DBUS_GLIB], [dbus-glib-1], [dbus_glib_minimum_version])
+XDT_CHECK_PACKAGE([GIO], [gio-2.0], [glib_minimum_version])
XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0],[xfconf_minimum_version])
XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-2],[libxfce4ui_minimum_version])
XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0],[libxfce4util_minimum_version])
diff --git a/libdbus/xfpm-dbus-monitor.c b/libdbus/xfpm-dbus-monitor.c
index a5888c4..a2b5899 100644
--- a/libdbus/xfpm-dbus-monitor.c
+++ b/libdbus/xfpm-dbus-monitor.c
@@ -27,10 +27,6 @@
#include <glib.h>
-#include <dbus/dbus.h>
-#include <dbus/dbus-glib-lowlevel.h>
-#include <dbus/dbus-glib.h>
-
#include <libxfce4util/libxfce4util.h>
#include "xfpm-dbus.h"
diff --git a/libdbus/xfpm-dbus-monitor.h b/libdbus/xfpm-dbus-monitor.h
index b946502..168c47b 100644
--- a/libdbus/xfpm-dbus-monitor.h
+++ b/libdbus/xfpm-dbus-monitor.h
@@ -22,7 +22,6 @@
#define __XFPM_DBUS_MONITOR_H
#include <glib-object.h>
-#include <dbus/dbus.h>
G_BEGIN_DECLS
diff --git a/libdbus/xfpm-dbus.h b/libdbus/xfpm-dbus.h
index 728b180..fb1fd23 100644
--- a/libdbus/xfpm-dbus.h
+++ b/libdbus/xfpm-dbus.h
@@ -22,8 +22,7 @@
#define __XFPM_DBUS_H
#include <glib.h>
-#include <dbus/dbus.h>
-#include <dbus/dbus-glib.h>
+#include <gio/gio.h>
gboolean xfpm_dbus_name_has_owner (DBusConnection *bus,
const gchar *name);
diff --git a/libdbus/xfpm-unique.c b/libdbus/xfpm-unique.c
index adb1d72..971bae0 100644
--- a/libdbus/xfpm-unique.c
+++ b/libdbus/xfpm-unique.c
@@ -29,8 +29,6 @@
#include "xfpm-unique.h"
#include "xfpm-dbus.h"
-#include <dbus/dbus-glib-lowlevel.h>
-
static void xfpm_unique_dbus_class_init (XfpmUniqueClass *klass);
static void xfpm_unique_dbus_init (XfpmUnique *unique);
diff --git a/panel-plugins/power-manager-plugin/power-manager-button.c b/panel-plugins/power-manager-plugin/power-manager-button.c
index 48f6c36..26c2f4d 100644
--- a/panel-plugins/power-manager-plugin/power-manager-button.c
+++ b/panel-plugins/power-manager-plugin/power-manager-button.c
@@ -29,7 +29,6 @@
#include <glib.h>
#include <libxfce4util/libxfce4util.h>
#include <libxfce4ui/libxfce4ui.h>
-#include <dbus/dbus-glib.h>
#include <upower.h>
#include <xfconf/xfconf.h>
diff --git a/settings/xfpm-settings-main.c b/settings/xfpm-settings-main.c
index 0bbb6ec..70f379f 100644
--- a/settings/xfpm-settings-main.c
+++ b/settings/xfpm-settings-main.c
@@ -33,9 +33,6 @@
#include <libxfce4util/libxfce4util.h>
#include <libxfce4ui/libxfce4ui.h>
-#include <dbus/dbus-glib.h>
-#include <dbus/dbus-glib-lowlevel.h>
-
#include <xfconf/xfconf.h>
#include "common/xfpm-common.h"
diff --git a/src/xfpm-battery.h b/src/xfpm-battery.h
index 3039f6e..4d3e912 100644
--- a/src/xfpm-battery.h
+++ b/src/xfpm-battery.h
@@ -23,7 +23,6 @@
#include <glib-object.h>
#include <gtk/gtk.h>
-#include <dbus/dbus-glib.h>
#include <upower.h>
#include "xfpm-enum-glib.h"
diff --git a/src/xfpm-console-kit.c b/src/xfpm-console-kit.c
index c065306..dbb58f6 100644
--- a/src/xfpm-console-kit.c
+++ b/src/xfpm-console-kit.c
@@ -30,8 +30,6 @@
#include <string.h>
#endif
-#include <dbus/dbus-glib.h>
-
#include "xfpm-console-kit.h"
#include "xfpm-dbus-monitor.h"
diff --git a/src/xfpm-inhibit.c b/src/xfpm-inhibit.c
index a3c2cd8..a8619ee 100644
--- a/src/xfpm-inhibit.c
+++ b/src/xfpm-inhibit.c
@@ -32,9 +32,6 @@
#include <glib.h>
-#include <dbus/dbus-glib.h>
-#include <dbus/dbus-glib-lowlevel.h>
-
#include <libxfce4util/libxfce4util.h>
#include "xfpm-inhibit.h"
diff --git a/src/xfpm-kbd-backlight.c b/src/xfpm-kbd-backlight.c
index 83ebbc0..a70f043 100644
--- a/src/xfpm-kbd-backlight.c
+++ b/src/xfpm-kbd-backlight.c
@@ -26,7 +26,6 @@
#include <string.h>
#endif
-#include <dbus/dbus-glib.h>
#include <libxfce4util/libxfce4util.h>
#include "xfpm-kbd-backlight.h"
diff --git a/src/xfpm-main.c b/src/xfpm-main.c
index 2731e01..7467903 100644
--- a/src/xfpm-main.c
+++ b/src/xfpm-main.c
@@ -41,9 +41,6 @@
#include <libxfce4util/libxfce4util.h>
#include <libxfce4ui/libxfce4ui.h>
-#include <dbus/dbus-glib.h>
-#include <dbus/dbus-glib-lowlevel.h>
-
#include "xfpm-dbus.h"
#include "xfpm-debug.h"
#include "xfpm-common.h"
diff --git a/src/xfpm-manager.c b/src/xfpm-manager.c
index 5b0f4dc..724ae87 100644
--- a/src/xfpm-manager.c
+++ b/src/xfpm-manager.c
@@ -37,8 +37,7 @@
#include <libxfce4ui/libxfce4ui.h>
#include <xfconf/xfconf.h>
-#include <dbus/dbus-glib.h>
-#include <dbus/dbus-glib-lowlevel.h>
+#include <gio/gunixfdlist.h>
#include <libnotify/notify.h>
diff --git a/src/xfpm-manager.h b/src/xfpm-manager.h
index fcbceb3..7a1d131 100644
--- a/src/xfpm-manager.h
+++ b/src/xfpm-manager.h
@@ -22,7 +22,6 @@
#define __XFPM_MANAGER_H
#include <glib-object.h>
-#include <dbus/dbus-glib.h>
G_BEGIN_DECLS
diff --git a/src/xfpm-network-manager.c b/src/xfpm-network-manager.c
index 908b813..da240a1 100644
--- a/src/xfpm-network-manager.c
+++ b/src/xfpm-network-manager.c
@@ -23,7 +23,6 @@
#endif
#include <glib.h>
-#include <dbus/dbus-glib.h>
#include "xfpm-network-manager.h"
diff --git a/src/xfpm-polkit.c b/src/xfpm-polkit.c
index c6510ab..a92f2f6 100644
--- a/src/xfpm-polkit.c
+++ b/src/xfpm-polkit.c
@@ -57,8 +57,6 @@
#include <errno.h>
#endif
-#include <dbus/dbus-glib.h>
-
#include "xfpm-polkit.h"
#include "xfpm-debug.h"
diff --git a/src/xfpm-power.c b/src/xfpm-power.c
index b374dc9..318c5fb 100644
--- a/src/xfpm-power.c
+++ b/src/xfpm-power.c
@@ -33,8 +33,6 @@
#include <errno.h>
#endif
-#include <dbus/dbus-glib.h>
-#include <dbus/dbus-glib-lowlevel.h>
#include <upower.h>
#include <gdk/gdkx.h>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list