[Xfce4-commits] <orage:master> 4.7.6.11: fixes after make distcheck

[Juha Kautto]

Updating branch refs/heads/master
         to d698fcbc064f276263fb138a3e00d733278e056b (commit)
       from 288f617f32a047f1b645ed9c31c2341091cf18b3 (commit)

commit d698fcbc064f276263fb138a3e00d733278e056b
Author: Juha Kautto <juha at xfce.org>
Date:   Fri Dec 17 00:33:06 2010 +0200

    4.7.6.11: fixes after make distcheck
    
    Fixed errors reported by make distcheck

 configure.in.in                      |    2 +-
 libical/src/libicalss/icalset.h      |    5 +++--
 libical/zoneinfo/Makefile.am         |    7 ++++---
 po/POTFILES.in                       |    2 --
 src/Makefile.am                      |    1 +
 src/{tray_icon.h => ical-internal.h} |   27 +++++++++++++++++++--------
 6 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/configure.in.in b/configure.in.in
index 3ed04b9..9d68725 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -9,7 +9,7 @@ dnl Written for Xfce by Juha Kautto <juha at xfce.org>
 dnl
 
 dnl Version information
-m4_define([orage_version], [4.7.6.9-git])
+m4_define([orage_version], [4.7.6.11-git])
 
 m4_define([gtk_minimum_version], [2.10.0])
 m4_define([xfce_minimum_version], [4.6.0])
diff --git a/libical/src/libicalss/icalset.h b/libical/src/libicalss/icalset.h
index 4008c62..0fc1e99 100644
--- a/libical/src/libicalss/icalset.h
+++ b/libical/src/libicalss/icalset.h
@@ -117,9 +117,10 @@ icalset* icalset_new_file(const char* path);
 icalset* icalset_new_file_reader(const char* path);
 icalset* icalset_new_file_writer(const char* path);
 
+/* fixed by Juha on 16.12.2010 */
 icalset* icalset_new_dir(const char* path);
-icalset* icalset_new_file_reader(const char* path);
-icalset* icalset_new_file_writer(const char* path);
+icalset* icalset_new_dir_reader(const char* path);
+icalset* icalset_new_dir_writer(const char* path);
 
 void icalset_free(icalset* set);
 
diff --git a/libical/zoneinfo/Makefile.am b/libical/zoneinfo/Makefile.am
index 779763c..f0dd513 100644
--- a/libical/zoneinfo/Makefile.am
+++ b/libical/zoneinfo/Makefile.am
@@ -41,9 +41,10 @@ install-data-local:
 
 uninstall-local:
 	@$(NORMAL_UNINSTALL)
-	for dir in $(DIRS); do \
-	  rm -fr $(DESTDIR)$(datadir)/$(PACKAGE)/zoneinfo/$$dir; \
-	done
+	rm -fr $(DESTDIR)$(datadir)/$(PACKAGE)/zoneinfo/*
+#	for dir in $(DIRS); do \
+#	  rm -fr $(DESTDIR)$(datadir)/$(PACKAGE)/zoneinfo/$$dir; \
+#	done
 
 dist-hook:
 	for dir in $(DIRS); do \
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 8c4ed69..eec11c0 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -4,12 +4,10 @@ globaltime/globaltime.c
 globaltime/gt_parfile.c
 globaltime/gt_prefs.c
 globaltime/timezone_selection.c
-globaltime/tz_zoneinfo_read.c
 globaltime/globaltime.desktop.in
 panel-plugin/oc_config.c
 panel-plugin/xfce4-orageclock-plugin.c
 panel-plugin/timezone_selection.c
-panel-plugin/tz_zoneinfo_read.c
 src/about-xfcalendar.c
 src/appointment.c
 src/day-view.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 56dce5f..bc63e13 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -15,6 +15,7 @@ orage_SOURCES =					\
 	ical-archive.c						\
 	ical-code.c							\
 	ical-code.h							\
+	ical-internal.h						\
 	ical-expimp.c						\
 	interface.c							\
 	interface.h							\
diff --git a/src/tray_icon.h b/src/ical-internal.h
similarity index 50%
copy from src/tray_icon.h
copy to src/ical-internal.h
index 7321189..db875a3 100644
--- a/src/tray_icon.h
+++ b/src/ical-internal.h
@@ -1,7 +1,7 @@
 /*      Orage - Calendar and alarm handler
  *
  * Copyright (c) 2005-2008 Juha Kautto  (juha at xfce.org)
- * Copyright (c) 2004-2006 Mickael Graf (korbinus at xfce.org)
+ * Copyright (c) 2004-2005 Mickael Graf (korbinus at xfce.org)
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,13 +21,24 @@
 
  */
 
-#ifndef __TRAY_ICON_H__
-#define __TRAY_ICON_H__
+#ifndef __ICAL_INTERNAL_H__
+#define __ICAL_INTERNAL_H__
 
-GdkPixbuf *orage_create_icon(gboolean static_icon, gint size);
+typedef struct
+{
+    struct icaltimetype stime; /* start time */
+    struct icaltimetype etime; /* end time */
+    struct icaldurationtype duration;
+    struct icaltimetype ctime; /* completed time for VTODO appointmnets */
+    icalcomponent_kind ikind;  /* type of component, VEVENt, VTODO... */
+} xfical_period;
 
-GtkStatusIcon *create_TrayIcon(GdkPixbuf *orage_logo);
+gboolean ic_internal_file_open(icalcomponent **p_ical
+        , icalset **p_fical, gchar *file_icalpath, gboolean test);
+char *ic_get_char_timezone(icalproperty *p);
+xfical_period ic_get_period(icalcomponent *c, gboolean local);
+char *ic_generate_uid(void);
+struct icaltimetype ic_convert_to_timezone(struct icaltimetype t
+        , icalproperty *p);
 
-void refresh_TrayIcon(void);
-
-#endif /* !__TRAY_ICON_H__ */
+#endif /* !__ICAL_INTERNAL_H__ */