Updating branch refs/heads/master
to 670fc12dca29592a69480e19bd8e84f5ad054f37 (commit)
from ee027a9fc352c1fb439bc01102044b921ec23ed1 (commit)
commit 670fc12dca29592a69480e19bd8e84f5ad054f37
Author: Juha Kautto <j...@xfce.org>
Date: Tue Dec 14 15:28:51 2010 +0200
4.7.6.6: internal modification to share timezone selection code.
Use same source files tz_zoneinfo_read.c and tz_zoneinfo_read.h instead of
maintaining separete files.
Should make a library from these and functions.c
configure.in.in | 2 +-
globaltime/Makefile.am | 4 ++--
globaltime/timezone_selection.c | 3 +--
panel-plugin/Makefile.am | 4 ++--
panel-plugin/oc_config.c | 4 ++--
panel-plugin/timezone_selection.c | 4 ++--
panel-plugin/xfce4-orageclock-plugin.c | 2 +-
7 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/configure.in.in b/configure.in.in
index 98d9ea4..8ea5428 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.6.5-git])
+m4_define([orage_version], [4.7.6.6-git])
m4_define([gtk_minimum_version], [2.10.0])
m4_define([xfce_minimum_version], [4.6.0])
diff --git a/globaltime/Makefile.am b/globaltime/Makefile.am
index 6fea9e2..4cac2f4 100644
--- a/globaltime/Makefile.am
+++ b/globaltime/Makefile.am
@@ -7,8 +7,8 @@ globaltime_SOURCES =
\
gt_prefs.c
\
timezone_selection.c \
timezone_selection.h \
- tz_zoneinfo_read.c \
- tz_zoneinfo_read.h \
+ ../src/tz_zoneinfo_read.c \
+ ../src/tz_zoneinfo_read.h \
../src/functions.c \
../src/functions.h
diff --git a/globaltime/timezone_selection.c b/globaltime/timezone_selection.c
index 5b9022e..3bb88bc 100644
--- a/globaltime/timezone_selection.c
+++ b/globaltime/timezone_selection.c
@@ -53,8 +53,7 @@
#include "../src/orage-i18n.h"
#include "../src/functions.h"
-
-#include "tz_zoneinfo_read.h"
+#include "../src/tz_zoneinfo_read.h"
#include "timezone_selection.h"
diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index 6f35cbe..cb20d72 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -17,8 +17,8 @@ xfce4_orageclock_plugin_SOURCES =
\
oc_config.c
\
timezone_selection.c
\
timezone_selection.h
\
- tz_zoneinfo_read.c
\
- tz_zoneinfo_read.h
\
+ ../src/tz_zoneinfo_read.c
\
+ ../src/tz_zoneinfo_read.h
\
xfce4-orageclock-plugin.c
\
xfce4-orageclock-plugin.h \
../src/functions.c \
diff --git a/panel-plugin/oc_config.c b/panel-plugin/oc_config.c
index c8209f7..a952ff5 100644
--- a/panel-plugin/oc_config.c
+++ b/panel-plugin/oc_config.c
@@ -33,12 +33,12 @@
#include <gtk/gtk.h>
#include <gdk/gdkevents.h>
-#include <libxfce4panel/xfce-panel-plugin.h>
+#include <libxfce4panel/libxfce4panel.h>
#include "../src/orage-i18n.h"
#include "../src/functions.h"
#include "xfce4-orageclock-plugin.h"
-#include "tz_zoneinfo_read.h"
+#include "../src/tz_zoneinfo_read.h"
#include "timezone_selection.h"
diff --git a/panel-plugin/timezone_selection.c
b/panel-plugin/timezone_selection.c
index d86bbff..90f3392 100644
--- a/panel-plugin/timezone_selection.c
+++ b/panel-plugin/timezone_selection.c
@@ -52,9 +52,9 @@
#include <glib/gstdio.h>
#include <libxfce4util/libxfce4util.h>
-#include <libxfce4panel/xfce-panel-plugin.h>
+#include <libxfce4panel/libxfce4panel.h>
-#include "tz_zoneinfo_read.h"
+#include "../src/tz_zoneinfo_read.h"
#include "timezone_selection.h"
diff --git a/panel-plugin/xfce4-orageclock-plugin.c
b/panel-plugin/xfce4-orageclock-plugin.c
index ae97b48..25461fb 100644
--- a/panel-plugin/xfce4-orageclock-plugin.c
+++ b/panel-plugin/xfce4-orageclock-plugin.c
@@ -36,7 +36,7 @@
#include <gdk/gdkx.h>
#include <libxfce4util/libxfce4util.h>
-#include <libxfce4panel/xfce-panel-plugin.h>
+#include <libxfce4panel/libxfce4panel.h>
#include "../src/functions.h"
#include "xfce4-orageclock-plugin.h"
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
