[vlc-commits] Remove recursion into modules/control/dbus/ and clean up D-Bus rules

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Sep  9 13:55:47 2012 +0300| [c90a86804c265d4776c8b846148efa5812217496] | committer: Rémi Denis-Courmont

Remove recursion into modules/control/dbus/ and clean up D-Bus rules

modules/control/dbus/dbus.h is removed as it conflicted with the global
libdbus header and was included only once.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c90a86804c265d4776c8b846148efa5812217496
---

 bin/Makefile.am                                   |    4 +-
 configure.ac                                      |   45 +++++++--------------
 modules/control/Modules.am                        |   14 ++++++-
 modules/control/dbus/Modules.am                   |   12 ------
 modules/control/dbus/dbus.c                       |   14 ++++++-
 modules/control/dbus/dbus.h                       |   43 --------------------
 modules/gui/qt4/components/simple_preferences.cpp |   22 +++++-----
 modules/misc/Modules.am                           |    8 +++-
 src/Makefile.am                                   |    7 ++++
 9 files changed, 70 insertions(+), 99 deletions(-)

Diff:   http://git.videolan.org/gitweb.cgi/vlc.git/?a=commitdiff;h=c90a86804c265d4776c8b846148efa5812217496