[Xfce4-commits] <parole:master> Omissions from first try added

[Hakan Erduman]

Updating branch refs/heads/master
         to 303674839f58a610ed1dfc99b036704faf240568 (commit)
       from d8ce4cfa839f47181c9f8905756b081504b9784b (commit)

commit 303674839f58a610ed1dfc99b036704faf240568
Author: Hakan Erduman <smultimeter at gmail.com>
Date:   Tue Nov 5 12:56:56 2013 +0100

    Omissions from first try added

 configure.ac.in                      |   10 ++++++++++
 src/plugins/Makefile.am              |    6 +++++-
 src/plugins/mpris2/mpris2.desktop.in |    4 ++--
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index 3386947..680b5e3 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -223,6 +223,14 @@ AC_MSG_CHECKING([whether to build the system tray plugin])
 AM_CONDITIONAL([PAROLE_TRAY_PLUGIN], [test x"$ac_tray_plugin" = x"yes"])
 AC_MSG_RESULT([$ac_tray_plugin])
 
+# MPRIS2 plugin.
+#--------------------------
+AC_ARG_ENABLE([mpris2-plugin], AC_HELP_STRING([--disable-mpris2-plugin], [Don't build parole mpris2 plugin]),
+  [ac_mpris2_plugin=$enableval], [ac_mpris2_plugin=yes])
+AC_MSG_CHECKING([whether to build the mpris2 plugin])
+AM_CONDITIONAL([PAROLE_MPRIS2_PLUGIN], [test x"$ac_mpris2_plugin" = x"yes"])
+AC_MSG_RESULT([$ac_mpris2_plugin])
+
 # ===================================================== #
 #             Check for debugging support               #
 # ===================================================== #
@@ -256,6 +264,7 @@ src/plugins/Makefile
 src/plugins/sample/Makefile
 src/plugins/notify/Makefile
 src/plugins/tray/Makefile
+src/plugins/mpris2/Makefile
 docs/Makefile
 docs/plugin-api/version.xml
 docs/plugin-api/Makefile
@@ -284,6 +293,7 @@ echo "
         =================
         Notify:                         ${ac_notify_plugin}
         System Tray icon:               ${ac_tray_plugin}
+        MPRIS2:                         ${ac_mpris2_plugin}
 
 ------------------------------------------------------
 
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index 7b2439b..9089e4a 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -6,4 +6,8 @@ endif
 
 if PAROLE_NOTIFY_PLUGIN
 SUBDIRS+=notify
-endif
\ No newline at end of file
+endif
+
+if PAROLE_MPRIS2_PLUGIN
+SUBDIRS+=mpris2
+endif
diff --git a/src/plugins/mpris2/mpris2.desktop.in b/src/plugins/mpris2/mpris2.desktop.in
index 55fb3c3..37cb641 100644
--- a/src/plugins/mpris2/mpris2.desktop.in
+++ b/src/plugins/mpris2/mpris2.desktop.in
@@ -1,6 +1,6 @@
 [Parole Plugin]
 Module=parole-mpris2
 _Name=MPRIS2
-_Description=Allow MPRIS2 remote control
-Authors=Hakan Erduman hakan at erduman.de
+_Description=MPRIS2 remote control
+Authors=Matias De Lellis mati86dl at gmail.com Hakan Erduman smultimeter at gmail.com
 Website=http://goodies.xfce.org/projects/applications/parole