Updating branch refs/heads/master
to dc47ada567ed90de61ea6f6170da5a3801b78b4e (commit)
from 4c97617684a366db2b7a384752912c5f10cd3128 (commit)
commit dc47ada567ed90de61ea6f6170da5a3801b78b4e
Author: Juha Kautto <j...@xfce.org>
Date: Sat Apr 17 18:49:02 2010 +0300
4.7.5.22: compatibility patch for 4.7 panel (bug 6382)
small make file change for new 4.7 panel
configure.in.in | 2 +-
globaltime/timezone_selection.c | 1 -
panel-plugin/Makefile.am | 4 +++-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/configure.in.in b/configure.in.in
index dc3c882..067cd2a 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -9,7 +9,7 @@ dnl Written for Xfce by Juha Kautto <j...@xfce.org>
dnl
dnl Version information
-m4_define([orage_version], [4.7.5.21-git])
+m4_define([orage_version], [4.7.5.22-git])
m4_define([gtk_minimum_version], [2.10.0])
m4_define([xfce_minimum_version], [4.6.0])
diff --git a/globaltime/timezone_selection.c b/globaltime/timezone_selection.c
index 59a4dbe..86b998a 100644
--- a/globaltime/timezone_selection.c
+++ b/globaltime/timezone_selection.c
@@ -53,7 +53,6 @@
#include <libxfce4util/libxfce4util.h>
#include <libxfcegui4/libxfcegui4.h>
-#include <libxfce4panel/xfce-panel-plugin.h>
#include "tz_zoneinfo_read.h"
#include "timezone_selection.h"
diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index 7201c50..5e17ce7 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -5,10 +5,12 @@ plugin_PROGRAMS = xfce4-orageclock-plugin
xfce4_orageclock_plugin_CFLAGS =
\
-DPACKAGE_DATA_DIR=\"$(datadir)\" \
-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
- @LIBXFCE4PANEL_CFLAGS@
+ @LIBXFCE4PANEL_CFLAGS@ \
+ @LIBXFCEGUI4_CFLAGS@
xfce4_orageclock_plugin_LDFLAGS =
\
@LIBXFCE4PANEL_LIBS@ \
+ @LIBXFCEGUI4_LIBS@ \
-lX11
xfce4_orageclock_plugin_SOURCES =
\
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
