Fix bug #3808: Replace icaltime_from_timet with icaltime_from_timet_with_zone

[claws.git] / src / plugins / vcalendar / vcal_meeting_gtk.c

diff --git a/src/plugins/vcalendar/vcal_meeting_gtk.c b/src/plugins/vcalendar/vcal_meeting_gtk.c
index 99e43fd4055d19253655007e5df7732406a5bff2..976d7da2f15a18f40a636d7991c640dd7e8402e9 100644 (file)
--- a/src/plugins/vcalendar/vcal_meeting_gtk.c
+++ b/src/plugins/vcalendar/vcal_meeting_gtk.c
@@ -32,7 +32,7 @@
 #ifdef USE_PTHREAD
 #include <pthread.h>
 #endif
-#include <ical.h>
+#include <libical/ical.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <curl/curl.h>
@@ -477,7 +477,7 @@ static gchar *get_date(VCalMeeting *meet, int start)
        debug_print("DST change offset to apply to time %d\n", dst_offset);
        t += dst_offset;
        debug_print("%s\n", ctime(&t));
-       return g_strdup(icaltime_as_ical_string(icaltime_from_timet(t, FALSE)));
+       return g_strdup(icaltime_as_ical_string(icaltime_from_timet_with_zone(t, FALSE, NULL)));
 }
 
 static gchar *get_location(VCalMeeting *meet)
@@ -893,8 +893,8 @@ static gboolean find_availability(const gchar *dtstart, const gchar *dtend, GSLi
        found = FALSE;
        while (!found && offset >= -3600*6) {
                gboolean ok = TRUE;
-               struct icaltimetype new_start = icaltime_from_timet(icaltime_as_timet(start)+offset, FALSE);
-               struct icaltimetype new_end   = icaltime_from_timet(icaltime_as_timet(end)+offset, FALSE);
+               struct icaltimetype new_start = icaltime_from_timet_with_zone(icaltime_as_timet(start)+offset, FALSE, NULL);
+               struct icaltimetype new_end   = icaltime_from_timet_with_zone(icaltime_as_timet(end)+offset, FALSE, NULL);
                for (cur = attendees; cur; cur = cur->next) {
                        VCalAttendee *attendee = (VCalAttendee *)cur->data;
                        debug_print("trying %s - %s (offset %d)\n", 
@@ -919,8 +919,8 @@ static gboolean find_availability(const gchar *dtstart, const gchar *dtend, GSLi
        offset = 1800;
        while (!found && offset <= 3600*6) {
                gboolean ok = TRUE;
-               struct icaltimetype new_start = icaltime_from_timet(icaltime_as_timet(start)+offset, FALSE);
-               struct icaltimetype new_end   = icaltime_from_timet(icaltime_as_timet(end)+offset, FALSE);
+               struct icaltimetype new_start = icaltime_from_timet_with_zone(icaltime_as_timet(start)+offset, FALSE, NULL);
+               struct icaltimetype new_end   = icaltime_from_timet_with_zone(icaltime_as_timet(end)+offset, FALSE, NULL);
                for (cur = attendees; cur; cur = cur->next) {
                        VCalAttendee *attendee = (VCalAttendee *)cur->data;
                        debug_print("trying %s - %s (offset %d)\n", 
@@ -1225,7 +1225,7 @@ static gboolean send_meeting_cb(GtkButton *widget, gpointer data)
        PrefsAccount *account = NULL;
        gboolean res = FALSE;
        gboolean found_att = FALSE;
-       Folder *folder = folder_find_from_name ("vCalendar", vcal_folder_get_class());
+       Folder *folder = folder_find_from_name (PLUGIN_NAME, vcal_folder_get_class());
        gboolean redisp = FALSE;
 
        if (meet->uid == NULL && meet->visible && 
@@ -1981,13 +1981,13 @@ void multisync_export(void)
                for (cur = files; cur; cur = cur->next) {
                        file = (char *)cur->data;
                        if (fprintf(fp, "1 1 %s\n", file) < 0)
-                               perror(file);
+                               FILE_OP_ERROR(file, "fprintf");
                        g_free(file);
                }
                if (fclose(fp) == EOF)
-                       perror(file);
+                       FILE_OP_ERROR(file, "fclose");
        } else {
-               perror(file);
+               FILE_OP_ERROR(file, "fopen");
        }
        g_free(path);
        g_slist_free(files);
@@ -2172,8 +2172,8 @@ gboolean vcal_meeting_export_freebusy(const gchar *path, const gchar *user,
 
        icalcomponent_add_component(calendar, timezone);
 
-       itt_start = icaltime_from_timet(whole_start, FALSE);
-       itt_end = icaltime_from_timet(whole_end, FALSE);
+       itt_start = icaltime_from_timet_with_zone(whole_start, FALSE, NULL);
+       itt_end = icaltime_from_timet_with_zone(whole_end, FALSE, NULL);
        itt_start.second = itt_start.minute = itt_start.hour = 0;
        itt_end.second = 59; itt_end.minute = 59; itt_end.hour = 23;