[Pkg-wmaker-commits] [wmauda] 12/17: Import Upstream version 0.8

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch master
in repository wmauda.

commit e614c4a83e66ff656652c412ee50b008e688c20e
Author: Doug Torrance <dtorrance at piedmont.edu>
Date:   Thu Jul 6 21:06:48 2017 -0400

    Import Upstream version 0.8
---
 Makefile |  5 ++++-
 wmauda.1 | 19 +++++++------------
 wmauda.c |  9 +--------
 3 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/Makefile b/Makefile
index 840ad7c..5958f1b 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,10 @@ PIXMAP_DIR	:= $(PREFIX)/share/pixmaps
 MANPAGE_DIR	:= $(PREFIX)/share/man/man1
 
 CFLAGS 	+= $(shell pkg-config audacious --cflags) $(shell pkg-config dbus-1 --cflags)
-LIBS 	:= $(shell pkg-config audacious --libs)   $(shell pkg-config dbus-1 --libs)
+LIBS 	:= $(shell pkg-config audacious --libs) $(shell pkg-config audclient --libs)  $(shell pkg-config dbus-1 --libs)
+
+CFLAGS  += $(shell pkg-config gtk+-2.0 --cflags)
+LIBS    += $(shell pkg-config gtk+-2.0 --libs)
 
 OBJS 	= wmauda.o
 HEADERS = config.h dock-master.xpm
diff --git a/wmauda.1 b/wmauda.1
index 08bba8f..0d4553d 100644
--- a/wmauda.1
+++ b/wmauda.1
@@ -1,15 +1,13 @@
-.TH WMAUDA 1 "16 April 2006" "Version 0.1" "WMAuda Manual Pages"
+.TH WMAUDA 1 "12 Feb 2012" "Version 0.8" "WMAuda Manual Pages"
 .SH NAME
 WMAUDA \- a dockable Audacious control applet.
 .SH SYNOPSIS
 .B wmauda
-[\-h] [\-\-help] [\-s \fI<session>\fP] [\-\-session=\fI<session>\fP]
-[\-c \fI<command>\fP] [\-\-command=\fI<command>\fP] [\-i \fI<icon>\fP]
-[\-\-icon=\fI<icon>\fP] [\-n] [\-\-single] [\-t] [\-\-title]
-[\-\-version]
+[\-h] [\-\-help] [\-c \fI<command>\fP] [\-\-command=\fI<command>\fP] [\-i \fI<icon>\fP]
+[\-\-icon=\fI<icon>\fP] [\-n] [\-\-single] [\-t] [\-\-title] [\-\-version]
 .SH DESCRIPTION
 \fIWMAUDA\fP is a dock applet for the Window Maker window manager.
-From the applet you can start and control audacious.
+From the applet you can start and control Audacious.
 
 .SH OPTIONS
 wmauda accepts the following options:
@@ -17,18 +15,15 @@ wmauda accepts the following options:
 .B \-h, \-\-help
 Show summary of options.
 .TP
-.B \-s, \-\-session
-Select Audacious session (Default: 0).
-.TP
 .B \-c, \-\-command
-Command to start audacious (Default: audacious).
+Command to start Audacious (Default: audacious).
 .TP
 .B \-i, \-\-icon 
-Icon to show instead of the default one when audacious is not running.  The
+Icon to show instead of the default one when Audacious is not running.  The
 icon must be in XPM format.
 .TP
 .B \-n, \-\-single
-Start audacious with only a single click (Default: Double click).
+Start Audacious with only a single click (Default: Double click).
 .TP
 .B \-t, \-\-title
 Show the song title when the mouse is in the wmauda window.
diff --git a/wmauda.c b/wmauda.c
index 07dc4a8..f2b83b0 100644
--- a/wmauda.c
+++ b/wmauda.c
@@ -360,14 +360,7 @@ void button_press_cb(GtkWidget *w, GdkEventButton *event, gpointer data)
 
 	if (xmms_running)
 	{
-		if (event->button == 2)
-		{
-			if(audacious_remote_is_pl_win(dbus_proxy))
-				audacious_remote_pl_win_toggle(dbus_proxy, FALSE);
-			else
-				audacious_remote_pl_win_toggle(dbus_proxy, TRUE);
-		}
-		else if (event->button == 3)
+		if ((event->button == 2) || (event->button == 3))
 		{
 			if(audacious_remote_is_main_win(dbus_proxy))
 				audacious_remote_main_win_toggle(dbus_proxy, FALSE);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmauda.git