Updating branch refs/heads/master
to 3528377387f4ada2edea18c0803df3781cba5ac3 (commit)
from a3d6cc71c1750cfcce0d43234f6e37411112b8b5 (commit)
commit 3528377387f4ada2edea18c0803df3781cba5ac3
Author: Connor Behan <connor.be...@gmail.com>
Date: Thu Feb 24 17:16:46 2011 -0500
Link against the right libraries for use with xfce4-panel 4.8
Makefile | 6 +++---
generic-slider.c | 3 ++-
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
index eb81a21..30ab3e7 100644
--- a/Makefile
+++ b/Makefile
@@ -12,8 +12,8 @@ PREFIX = /usr
PLUGINDIR = $(PREFIX)/lib/xfce4/xfce4/panel-plugins
PLUGINDESKTOPDIR = $(PREFIX)/share/xfce4/panel-plugins
-LIBXFCE4PANEL_CFLAGS = `$(PKG_CONFIG) --cflags libxfce4panel-1.0`
-LIBXFCE4PANEL_LIBS = `$(PKG_CONFIG) --libs libxfce4panel-1.0`
+LIBXFCE4PANEL_CFLAGS = `$(PKG_CONFIG) --cflags libxfce4panel-1.0 libxfce4ui-1`
+LIBXFCE4PANEL_LIBS = `$(PKG_CONFIG) --libs libxfce4panel-1.0 libxfce4ui-1`
all: generic-slider.c
$(CC) $(CFLAGS) $(LIBXFCE4PANEL_CFLAGS) -c generic-slider.c
@@ -30,4 +30,4 @@ install:
uninstall:
$(RM) -f $(DESTDIR)$(PLUGINDESKTOPDIR)/generic-slider.desktop
- $(RM) -f $(DESTDIR)$(PLUGINDIR)/xfce4-generic-slider-plugin
\ No newline at end of file
+ $(RM) -f $(DESTDIR)$(PLUGINDIR)/xfce4-generic-slider-plugin
diff --git a/generic-slider.c b/generic-slider.c
index ec2db58..66e6e57 100644
--- a/generic-slider.c
+++ b/generic-slider.c
@@ -1,6 +1,7 @@
#include <stdlib.h>
#include <string.h>
#include <sys/types.h>
+#include <sys/wait.h>
#include <unistd.h>
#include <libxfce4panel/xfce-panel-plugin.h>
#include <libxfcegui4/libxfcegui4.h>
@@ -165,7 +166,7 @@ static void execute_command(char *command) {
pid = fork();
if (pid == 0) {
- wait();
+ wait(NULL);
} else {
execvp(arglist[0], arglist);
perror("execvp");
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
