Updating branch refs/heads/master
to 1542be0dc85034ecf93f311851e6ace165705700 (commit)
from a0530d515bee64b2c1014093aecdcd0a5f26d323 (commit)
commit 1542be0dc85034ecf93f311851e6ace165705700
Author: Nick Schermer <[email protected]>
Date: Sun Feb 13 12:06:40 2011 +0100
Fix helper locations.
panel/Makefile.am | 2 +-
panel/panel-application.c | 2 +-
panel/panel-plugin-external-wrapper.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/panel/Makefile.am b/panel/Makefile.am
index 843bb6c..672272b 100644
--- a/panel/Makefile.am
+++ b/panel/Makefile.am
@@ -4,7 +4,7 @@ INCLUDES = \
-DG_LOG_DOMAIN=\"xfce4-panel\" \
-DDATADIR=\"$(datadir)/xfce4\" \
-DLIBDIR=\"$(libdir)/xfce4\" \
- -DHELPERDIR=\"$(HELPER_PATH_PREFIX)\" \
+ -DHELPERDIR=\"$(HELPER_PATH_PREFIX)/xfce4/panel\" \
-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
-DDBUS_API_SUBJECT_TO_CHANGE \
$(PLATFORM_CPPFLAGS)
diff --git a/panel/panel-application.c b/panel/panel-application.c
index d745069..94aa4eb 100644
--- a/panel/panel-application.c
+++ b/panel/panel-application.c
@@ -50,7 +50,7 @@
#include <panel/panel-plugin-external.h>
#define AUTOSAVE_INTERVAL (10 * 60)
-#define MIGRATE_BIN HELPERDIR G_DIR_SEPARATOR_S "panel"
G_DIR_SEPARATOR_S "migrate"
+#define MIGRATE_BIN HELPERDIR G_DIR_SEPARATOR_S "migrate"
diff --git a/panel/panel-plugin-external-wrapper.c
b/panel/panel-plugin-external-wrapper.c
index 23c35cd..fb6a202 100644
--- a/panel/panel-plugin-external-wrapper.c
+++ b/panel/panel-plugin-external-wrapper.c
@@ -51,7 +51,7 @@
-#define WRAPPER_BIN HELPERDIR G_DIR_SEPARATOR_S "panel" G_DIR_SEPARATOR_S
"wrapper"
+#define WRAPPER_BIN HELPERDIR G_DIR_SEPARATOR_S "wrapper"
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
