[cheese] remove dbus support from cheese, fixes bug #622915
- From: Daniel G. Siegel <dgsiegel src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [cheese] remove dbus support from cheese, fixes bug #622915
- Date: Mon, 17 Jan 2011 23:49:50 +0000 (UTC)
commit 4d879012859075a3e9493dba9d4a50d963b2a887
Author: daniel g. siegel <dgsiegel gnome org>
Date: Tue Jan 18 00:46:28 2011 +0100
remove dbus support from cheese, fixes bug #622915
configure.ac | 4 ----
data/Makefile.am | 9 ---------
data/org.gnome.Cheese.service.in | 3 ---
libcheese/cheese-camera-device-monitor.c | 1 -
4 files changed, 0 insertions(+), 17 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index d71075c..40cbb37 100644
--- a/configure.ac
+++ b/configure.ac
@@ -83,8 +83,6 @@ GDK_REQUIRED=2.14.0
LIBGNOMEDESKTOP_REQUIRED=2.26.0
GSTREAMER_REQUIRED=0.10.23
CAIRO_REQUIRED=1.4.0
-DBUS_REQUIRED=1.0
-DBUS_GLIB_REQUIRED=0.7
PANGOCAIRO_REQUIRED=1.18.0
LIBRSVG_REQUIRED=2.18.0
CLUTTER_REQUIRED=1.4
@@ -142,8 +140,6 @@ PKG_CHECK_MODULES(CHEESE, \
gstreamer-0.10 >= $GSTREAMER_REQUIRED \
gstreamer-plugins-base-0.10 >= $GSTREAMER_REQUIRED \
cairo >= $CAIRO_REQUIRED \
- dbus-1 >= $DBUS_REQUIRED \
- dbus-glib-1 >= $DBUS_GLIB_REQUIRED \
pangocairo >= $PANGOCAIRO_REQUIRED \
librsvg-2.0 >= $LIBRSVG_REQUIRED \
clutter-1.0 >= $CLUTTER_REQUIRED \
diff --git a/data/Makefile.am b/data/Makefile.am
index 19bc2a6..1b61e1e 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -11,15 +11,6 @@ gsettings_SCHEMAS = org.gnome.Cheese.gschema.xml
gtkrcdir = $(pkgdatadir)
gtkrc_DATA = gtkrc
-# Dbus service file
-servicedir = $(datadir)/dbus-1/services
-service_in_files = org.gnome.Cheese.service.in
-service_DATA = $(service_in_files:.service.in=.service)
-
-# Rule to make the service file with bindir expanded
-$(service_DATA): $(service_in_files) Makefile
- @sed -e "s|\ bindir\@|$(bindir)|" $< > $@
-
pkgdata_DATA = \
cheese-main-window.ui \
cheese-about.ui \
diff --git a/libcheese/cheese-camera-device-monitor.c b/libcheese/cheese-camera-device-monitor.c
index c2e1a29..45f3083 100644
--- a/libcheese/cheese-camera-device-monitor.c
+++ b/libcheese/cheese-camera-device-monitor.c
@@ -24,7 +24,6 @@
#endif
#include <glib-object.h>
-#include <dbus/dbus-glib-lowlevel.h>
#include <string.h>
#ifdef HAVE_UDEV
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]