Fix some copyright headers

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

diff --git a/src/plugins/vcalendar/vcalendar.c b/src/plugins/vcalendar/vcalendar.c
index 576da832c078ec94f6775158e4847423ec9cceb6..b4462b3989726f216bb2f4fb8f5b68169f65fd6a 100644 (file)
--- a/src/plugins/vcalendar/vcalendar.c
+++ b/src/plugins/vcalendar/vcalendar.c
@@ -1,7 +1,6 @@
 /*
  * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2007 Colin Leroy <colin@colino.net> and 
- * the Claws Mail team
+ * Copyright (C) 1999-2018 Colin Leroy and the Claws Mail team
  *
  * 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
@@ -27,7 +26,7 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 
-#include <ical.h>
+#include <libical/ical.h>
 #include <gtk/gtk.h>
 
 #if USE_PTHREAD
@@ -157,8 +156,8 @@ static void create_meeting_from_message_cb_ui(GtkAction *action, gpointer data)
                        gchar *orgname = NULL;
                        gchar *summary = g_strdup(msginfo->subject ? msginfo->subject:_("no subject"));
                        gchar *description = file_read_stream_to_str(fp);
-                       gchar *dtstart = g_strdup(icaltime_as_ical_string(icaltime_from_timet(t, FALSE)));
-                       gchar *dtend = g_strdup(icaltime_as_ical_string(icaltime_from_timet(t2, FALSE)));
+                       gchar *dtstart = g_strdup(icaltime_as_ical_string(icaltime_from_timet_with_zone(t, FALSE, NULL)));
+                       gchar *dtend = g_strdup(icaltime_as_ical_string(icaltime_from_timet_with_zone(t2, FALSE, NULL)));
                        gchar *recur = NULL;
                        gchar *tzid = g_strdup("UTC");
                        gchar *url = NULL;
@@ -317,7 +316,7 @@ static VCalEvent *vcalviewer_get_component(const gchar *file, const gchar *chars
        g_free(tmplbl);                                         \
 }
 
-static void vcalviewer_answer_set_choices(VCalViewer *vcalviewer, VCalEvent *event, enum icalproperty_method method);
+static void vcalviewer_answer_set_choices(VCalViewer *vcalviewer, VCalEvent *event, icalproperty_method method);
 
 static void vcalviewer_reset(VCalViewer *vcalviewer) 
 {
@@ -353,7 +352,7 @@ static void vcalviewer_show_unavailable(VCalViewer *vcalviewer, gboolean visi)
                gtk_widget_hide(vcalviewer->unavail_box);
 }
 
-static void vcalviewer_answer_set_choices(VCalViewer *vcalviewer, VCalEvent *event, enum icalproperty_method method)
+static void vcalviewer_answer_set_choices(VCalViewer *vcalviewer, VCalEvent *event, icalproperty_method method)
 {
        int i = 0;
        
@@ -367,7 +366,7 @@ static void vcalviewer_answer_set_choices(VCalViewer *vcalviewer, VCalEvent *eve
        
        vcalviewer_show_unavailable(vcalviewer, FALSE);
 
-       if (method == ICAL_METHOD_REQUEST && event && !event->rec_occurence) {
+       if (method == ICAL_METHOD_REQUEST && event && !event->rec_occurrence) {
                PrefsAccount *account = vcal_manager_get_account_from_event(event);
                
                if (!account)
@@ -408,7 +407,7 @@ static void vcalviewer_answer_set_choices(VCalViewer *vcalviewer, VCalEvent *eve
                gchar *myfb = file_read_to_str(internal_ifb);
                g_free(internal_ifb);
                if (account) {
-                       enum icalparameter_partstat answer = 
+                       icalparameter_partstat answer = 
                                vcal_manager_get_reply_for_attendee(event, account->address);
                                
                        if (answer == ICAL_PARTSTAT_ACCEPTED)
@@ -441,7 +440,7 @@ static FolderItem *vcalendar_get_current_item(void)
 {
        MainWindow *mainwin = mainwindow_get_mainwindow();
        FolderItem *item = NULL;
-       Folder *folder = folder_find_from_name ("vCalendar", vcal_folder_get_class());
+       Folder *folder = folder_find_from_name (PLUGIN_NAME, vcal_folder_get_class());
        
        if (mainwin) {
                item = mainwin->summaryview->folder_item;
@@ -558,7 +557,7 @@ void vcalviewer_display_event (VCalViewer *vcalviewer, VCalEvent *event)
                        GTK_LABEL_SET_TEXT_TRIMMED(GTK_LABEL(vcalviewer->start), tmp);
                        gtk_label_set_use_markup(GTK_LABEL(vcalviewer->start), TRUE);
                        g_free(tmp);
-               } else if (event->rec_occurence) {
+               } else if (event->rec_occurrence) {
                        gchar *tmp = g_strdup_printf(g_strconcat("%s <span weight=\"bold\">",
                                                        _("(this event is part of a recurring event)"),
                                                        "</span>", NULL),
@@ -588,7 +587,7 @@ void vcalviewer_display_event (VCalViewer *vcalviewer, VCalEvent *event)
                gchar *name = vcal_manager_get_attendee_name(event, attendee);
                gchar *ename = g_markup_printf_escaped("%s", name?name:"");
                gchar *eatt = g_markup_printf_escaped("%s", attendee);
-               enum icalparameter_partstat acode = vcal_manager_get_reply_for_attendee(event, attendee);
+               icalparameter_partstat acode = vcal_manager_get_reply_for_attendee(event, attendee);
                gchar *answer = vcal_manager_get_reply_text_for_attendee(event, attendee);
                gchar *type = vcal_manager_get_cutype_text_for_attendee(event, attendee);
                gchar *tmp = NULL;
@@ -897,7 +896,7 @@ void vcalviewer_reload(FolderItem *item)
 {
        if (s_vcalviewer) {
                MainWindow *mainwin = mainwindow_get_mainwindow();
-               Folder *folder = folder_find_from_name ("vCalendar", vcal_folder_get_class());
+               Folder *folder = folder_find_from_name (PLUGIN_NAME, vcal_folder_get_class());
 
                folder_item_scan(item);
                if (mainwin && mainwin->summaryview->folder_item) {
@@ -950,7 +949,7 @@ static gboolean vcalviewer_uribtn_cb(GtkButton *widget, gpointer data)
 
 void vcalendar_refresh_folder_contents(FolderItem *item)
 {
-       Folder *folder = folder_find_from_name ("vCalendar", vcal_folder_get_class());
+       Folder *folder = folder_find_from_name (PLUGIN_NAME, vcal_folder_get_class());
        if (folder && item->folder == folder) {
                MainWindow *mainwin = mainwindow_get_mainwindow();
                folder_item_scan(item);
@@ -971,7 +970,7 @@ void vcalendar_cancel_meeting(FolderItem *item, const gchar *uid)
        VCalMeeting *meet = NULL;
        gchar *file = NULL;
        gint val = 0;
-       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;
        GtkWidget *send_notify_chkbtn = gtk_check_button_new_with_label(_("Send a notification to the attendees"));
        gboolean send_notify = TRUE;
@@ -1049,7 +1048,7 @@ static gboolean vcalviewer_action_cb(GtkButton *widget, gpointer data)
 {
         VCalViewer *vcalviewer = (VCalViewer *)data;
        gint index = gtk_combo_box_get_active(GTK_COMBO_BOX(vcalviewer->answer));
-       enum icalparameter_partstat reply[3] = {ICAL_PARTSTAT_ACCEPTED, ICAL_PARTSTAT_TENTATIVE, ICAL_PARTSTAT_DECLINED};
+       icalparameter_partstat reply[3] = {ICAL_PARTSTAT_ACCEPTED, ICAL_PARTSTAT_TENTATIVE, ICAL_PARTSTAT_DECLINED};
        PrefsAccount *account = NULL;
        VCalEvent *saved_event = NULL, *event = NULL;
        debug_print("index chosen %d\n", index);
@@ -1294,7 +1293,7 @@ static gint scan_timeout_tag = 0;
 
 static gboolean vcal_webcal_check(gpointer data)
 {
-       Folder *root = folder_find_from_name ("vCalendar", vcal_folder_get_class());
+       Folder *root = folder_find_from_name (PLUGIN_NAME, vcal_folder_get_class());
 
        if (prefs_common_get_prefs()->work_offline)
                return TRUE;
@@ -1327,10 +1326,10 @@ void vcalendar_init(void)
        mimeview_register_viewer_factory(&vcal_viewer_factory);
        folder_register_class(vcal_folder_get_class());
 
-       folder = folder_find_from_name ("vCalendar", vcal_folder_get_class());
+       folder = folder_find_from_name (PLUGIN_NAME, vcal_folder_get_class());
        if (!folder) {
                START_TIMING("creating folder");
-               folder = folder_new(vcal_folder_get_class(), "vCalendar", NULL);
+               folder = folder_new(vcal_folder_get_class(), PLUGIN_NAME, NULL);
                folder->klass->create_tree(folder);
                folder_add(folder);
                folder_scan_tree(folder, TRUE);
@@ -1356,7 +1355,7 @@ void vcalendar_init(void)
                                (GSourceFunc)vcal_webcal_check, 
                                (gpointer)NULL);
        if (prefs_common_get_prefs()->enable_color) {
-               gtkut_convert_int_to_gdk_color(prefs_common_get_prefs()->uri_col,
+               gtkut_convert_int_to_gdk_color(prefs_common_get_prefs()->color[COL_URI],
                                       &uri_color);
        }