Skip to content
Permalink
Browse files
[gconf] Remove GConf support, as it's abandoned upstream
  • Loading branch information
thp committed May 13, 2014
1 parent accac6c commit 5c0ed22c7900e31e2b7bb774660e5fe637315caf
Showing with 3 additions and 174 deletions.
  1. +0 −10 configure.ac
  2. +1 −1 debian/control
  3. +1 −3 debian/rules
  4. +0 −17 debian/usb-moded.schemas
  5. +1 −12 docs/usb_moded-doc.txt
  6. +0 −2 rpm/usb-moded.spec
  7. +0 −6 src/Makefile.am
  8. +0 −95 src/usb_moded-gconf.c
  9. +0 −27 src/usb_moded-gconf.h
  10. +0 −1 src/usb_moded.c
@@ -54,14 +54,6 @@ AC_ARG_ENABLE([n900], AS_HELP_STRING([--enable-n900], [Enable N900 extra's @<:@d
esac],[n900=false])
AM_CONDITIONAL([N900], [test x$n900 = xtrue])

AC_ARG_ENABLE([gconf], AS_HELP_STRING([--enable-gconf], [Use GConf for configuration storage @<:@default=false@:>@]),
[case "${enableval}" in
yes) gconf=true ; CFLAGS="-DGCONF -I/usr/include/gconf/2 -I/usr/include/orbit-2.0 -lgconf-2 $CFLAGS" ;;
no) conf=false ;;
*) AC_MSG_ERROR([bad value ${enableval} for --enable-gconf]) ;;
esac],[gconf=false])
AM_CONDITIONAL([GCONF], [test x$gconf = xtrue])

AC_ARG_ENABLE([app_sync], AS_HELP_STRING([--enable-app-sync], [Enable application syncing @<:@default=true@:>@]),
[case "${enableval}" in
yes) app_sync=true ; CFLAGS="-DAPP_SYNC $CFLAGS" ;;
@@ -118,8 +110,6 @@ AC_ARG_ENABLE([ofono], AS_HELP_STRING([--enable-ofono], [Enable ofono DBUS inter
esac],[ofono=false])
AM_CONDITIONAL([SYSTEMD], [test x$ofono = xtrue])

#TODO: Figure out how to check for this depending on the gconf flag
# gconf-2.0 >= 2.16.0
PKG_CHECK_MODULES([USB_MODED], [
glib-2.0 >= 2.24.0
dbus-1 >= 1.2.1
@@ -2,7 +2,7 @@ Source: usb-moded
Section: misc
Priority: optional
Maintainer: Philippe De Swert <philippe.de-swert@nokia.com>
Build-Depends: debhelper (>= 5), autoconf, automake, libdbus-1-dev, libdbus-glib-1-dev, libglib2.0-dev, libgconf2-dev, doxygen, libudev-dev
Build-Depends: debhelper (>= 5), autoconf, automake, libdbus-1-dev, libdbus-glib-1-dev, libglib2.0-dev, doxygen, libudev-dev
Standards-Version: 3.9.1

Package: usb-moded
@@ -74,8 +74,6 @@ ifneq (0,$(MAKE_DOCS))
endif
mkdir -p $(CURDIR)/debian/usb-moded/etc/usb-moded
install -m 644 $(CURDIR)/usb-moded.ini $(CURDIR)/debian/usb-moded/etc/usb-moded/usb-moded.ini
mkdir -p $(CURDIR)/debian/usb-moded/etc/gconf/schemas
install -m 644 $(CURDIR)/debian/usb-moded.schemas $(CURDIR)/debian/usb-moded/etc/gconf/schemas/usb-moded.schemas



@@ -101,7 +99,7 @@ binary-arch: build install
# dh_installinit
# dh_installcron
# dh_installinfo
dh_gconf
# dh_gconf
dh_installman
dh_link
dh_strip --dbg-package=usb-moded-dbg

This file was deleted.

@@ -36,7 +36,7 @@ Similary a mode can be set.

dbus-send --system --type=method_call --print-reply --dest=com.meego.usb_moded /com/meego/usb_moded com.meego.usb_moded.set_mode string:'<mode_name>'

Even the configuration can be set over DBus (this will set either the gconf key or use the settings file)
Even the configuration can be set over DBus

dbus-send --system --type=method_call --print-reply --dest=com.meego.usb_moded /com/meego/usb_moded com.meego.usb_moded.set_config string:'<mode_name>'

@@ -48,17 +48,6 @@ The supported modes can be queried over dbus as follows:

dbus-send --system --type=method_call --print-reply --dest=com.meego.usb_moded /com/meego/usb_moded com.meego.usb_moded.get_modes

=== WITH GCONF ONLY ===

However this can also be optionally handled by setting the following GConf key (gconf has to be compiled in).

/Meego/System/UsbMode (querying and setting can be done as follows:

gconftool-2 -g /Meego/System/UsbMode
gconftool-2 -s /Meego/System/UsbMode --type=string <mode_name>

=== END WITH GCONF ONLY ===

Usb_moded will also broadcast changes and errors over the system bus.
This will happen on the com.meego.usb_moded interface

@@ -265,7 +265,6 @@ install -m 644 -D src/usb_moded-appsync-dbus.h %{buildroot}/%{_includedir}/%{nam
install -m 644 -D usb_moded.pc %{buildroot}/%{_libdir}/pkgconfig/usb_moded.pc
install -d %{buildroot}/%{_docdir}/%{name}/html/
install -m 644 docs/html/* %{buildroot}/%{_docdir}/%{name}/html/
install -m 644 -D debian/%{name}.schemas %{buildroot}/%{_sysconfdir}/gconf/schemas/%{name}.schemas
install -m 644 -D debian/manpage.1 %{buildroot}/%{_mandir}/man1/usb-moded.1
install -m 644 -D debian/usb_moded.conf %{buildroot}/%{_sysconfdir}/dbus-1/system.d/usb_moded.conf
install -m 644 -D %{SOURCE2} %{buildroot}/%{_sysconfdir}/modprobe.d/usb_moded.conf
@@ -296,7 +295,6 @@ systemctl daemon-reload || :
%defattr(-,root,root,-)
%doc debian/copyright
%config(noreplace) %{_sysconfdir}/dbus-1/system.d/usb_moded.conf
%config(noreplace) %{_sysconfdir}/gconf/schemas/%{name}.schemas
%config(noreplace) %{_sysconfdir}/modprobe.d/usb_moded.conf
%ghost %config(noreplace) %{_sysconfdir}/modprobe.d/g_ether.conf
%{_sbindir}/usb_moded
@@ -36,12 +36,6 @@ usb_moded_SOURCES = \
usb_moded-android.h \
usb_moded-android.c

if GCONF
usb_moded_SOURCES += \
usb_moded-gconf.c \
usb_moded-gconf.h
endif

if UDEV
usb_moded_SOURCES += \
usb_moded-udev.c \

This file was deleted.

This file was deleted.

@@ -43,7 +43,6 @@
#include "usb_moded-dbus.h"
#include "usb_moded-dbus-private.h"
#include "usb_moded-hw-ab.h"
#include "usb_moded-gconf.h"
#include "usb_moded-modules.h"
#include "usb_moded-log.h"
#include "usb_moded-lock.h"

0 comments on commit 5c0ed22

Please sign in to comment.