RSSyl: Allow use of .netrc by libcurl. Bug/enhancement #3309, by Vincent Pelletier

[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 4fd3ef520064c88cc4a0967f15d661a9ee272851..eae703eb9e2b9c2ed1047ec599407378f62ce076 100644 (file)
--- a/src/plugins/vcalendar/vcal_meeting_gtk.c
+++ b/src/plugins/vcalendar/vcal_meeting_gtk.c
@@ -88,9 +88,6 @@ struct _VCalMeeting
        GtkWidget *total_avail_msg;
        PrefsAccount *account;
        gboolean visible;
-#if !GTK_CHECK_VERSION(2,12,0)
-       GtkTooltips *tips;
-#endif
 };
 
 struct _VCalAttendee {
@@ -278,9 +275,6 @@ VCalAttendee *attendee_add(VCalMeeting *meet, gchar *address, gchar *name, gchar
 {
        GtkWidget *att_hbox = gtk_hbox_new(FALSE, 6);
        VCalAttendee *attendee  = g_new0(VCalAttendee, 1);
-#if !(GTK_CHECK_VERSION(2,12,0))
-       GtkTooltips *tips = meet->tips;
-#endif
 
        attendee->address       = gtk_entry_new();
        attendee->cutype        = gtk_combo_box_new_text();
@@ -368,7 +362,7 @@ static gchar *get_organizer(VCalMeeting *meet)
                cur = cur->next;
                i++;
        }
-       if (cur)
+       if (cur && cur->data)
                return g_strdup(((PrefsAccount *)(cur->data))->address);
        else
                return g_strdup("");
@@ -384,7 +378,7 @@ static gchar *get_organizer_name(VCalMeeting *meet)
                cur = cur->next;
                i++;
        }
-       if (cur)
+       if (cur && cur->data)
                return g_strdup(((PrefsAccount *)(cur->data))->name);
        else
                return g_strdup("");
@@ -714,9 +708,6 @@ static void meeting_end_changed(GtkWidget *widget, gpointer data)
 static void att_update_icon(VCalMeeting *meet, VCalAttendee *attendee, gint avail, gchar *text)
 {
        const gchar *icon = GTK_STOCK_DIALOG_INFO;
-#if !(GTK_CHECK_VERSION(2,12,0))
-       GtkTooltips *tips = meet->tips;
-#endif
 
        switch (avail) {
                case 0:  icon = GTK_STOCK_DIALOG_WARNING;       break;
@@ -867,9 +858,6 @@ static gboolean find_availability(const gchar *dtstart, const gchar *dtend, GSLi
        GHashTable *avail_table_avail = g_hash_table_new(NULL, g_direct_equal);
        GHashTable *avail_table_before = g_hash_table_new(NULL, g_direct_equal);
        GHashTable *avail_table_after = g_hash_table_new(NULL, g_direct_equal);
-#if !(GTK_CHECK_VERSION(2,12,0))
-       GtkTooltips *tips = meet->tips;
-#endif
        
        for (cur = attendees; cur; cur = cur->next) {
                VCalAttendee *attendee = (VCalAttendee *)cur->data;
@@ -1015,9 +1003,6 @@ static gboolean check_attendees_availability(VCalMeeting *meet, gboolean tell_if
                                "internal.ifb", NULL);
        gboolean local_only = FALSE;
        GSList *attlist;
-#if !(GTK_CHECK_VERSION(2,12,0))
-       GtkTooltips *tips = meet->tips;
-#endif
 
        if (vcalprefs.freebusy_get_url == NULL
        ||  *vcalprefs.freebusy_get_url == '\0') {
@@ -1126,12 +1111,13 @@ static gboolean check_attendees_availability(VCalMeeting *meet, gboolean tell_if
                        if (strncmp(tmp, "http://", 7) 
                        && strncmp(tmp, "https://", 8)
                        && strncmp(tmp, "webcal://", 9)
+                       && strncmp(tmp, "webcals://", 10)
                        && strncmp(tmp, "ftp://", 6))
                                contents = file_read_to_str(tmp);
                        else {
                                gchar *label = g_strdup_printf(_("Fetching planning for %s..."), email);
-                               if (!strncmp(tmp, "webcal://", 9)) {
-                                       gchar *tmp2 = g_strdup_printf("http://%s", tmp+9);
+                               if (!strncmp(tmp, "webcal", 6)) {
+                                       gchar *tmp2 = g_strdup_printf("http%s", tmp+6);
                                        g_free(tmp);
                                        tmp = tmp2;
                                }
@@ -1261,10 +1247,17 @@ static gboolean send_meeting_cb(GtkButton *widget, gpointer data)
                gdk_window_set_cursor(meet->window->window, watch_cursor);
 
        organizer       = get_organizer(meet);
-       organizer_name  = get_organizer_name(meet);
        account         = account_find_from_address(organizer, FALSE);
 
-       if (account && account->set_domain && account->domain) {
+       if(account == NULL) {
+               debug_print("can't get account from address %s\n", organizer);
+               g_free(organizer);
+               return FALSE;
+       }
+
+       organizer_name  = get_organizer_name(meet);
+
+       if (account->set_domain && account->domain) {
                g_snprintf(buf, sizeof(buf), "%s", account->domain); 
        } else if (!strncmp(get_domain_name(), "localhost", strlen("localhost"))) {
                g_snprintf(buf, sizeof(buf), "%s", 
@@ -1391,12 +1384,10 @@ static VCalMeeting *vcal_meeting_create_real(VCalEvent *event, gboolean visible)
        GtkTextBuffer *buffer = NULL;
        GtkWidget *date_hbox, *date_vbox, *save_hbox, *label, *hbox;
        gchar *s = NULL;
-       GtkObject *start_h_adj, *start_m_adj, *end_h_adj, *end_m_adj;
        int i = 0, num = 0;
        GtkWidget *scrolledwin;
        GList *times = NULL;
        GList *accounts;
-       GtkListStore *menu;
        gchar *time_text = NULL;
 #ifdef GENERIC_UMPC
        GtkWidget *notebook;
@@ -1406,14 +1397,7 @@ static VCalMeeting *vcal_meeting_create_real(VCalEvent *event, gboolean visible)
        if (!watch_cursor)
                watch_cursor = gdk_cursor_new(GDK_WATCH);
 
-#if !(GTK_CHECK_VERSION(2,12,0))
-       meet->tips = tips;
-#endif
        meet->visible = visible;
-       start_h_adj = gtk_adjustment_new (0, 0, 23, 1, 10, 10);
-       start_m_adj = gtk_adjustment_new (0, 0, 59, 1, 10, 10);
-       end_h_adj   = gtk_adjustment_new (0, 0, 23, 1, 10, 10);
-       end_m_adj   = gtk_adjustment_new (0, 0, 59, 1, 10, 10);
 
        meet->window            = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "vcal_meeting_gtk");
 #ifndef GENERIC_UMPC
@@ -1439,7 +1423,6 @@ static VCalMeeting *vcal_meeting_create_real(VCalEvent *event, gboolean visible)
        meet->start_time = gtk_combo_box_text_new_with_entry();
 #endif
        gtk_combo_box_set_active(GTK_COMBO_BOX(meet->start_time), -1);
-       menu = GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(meet->start_time)));
 #if !GTK_CHECK_VERSION(2, 24, 0)       
        combobox_set_popdown_strings(GTK_COMBO_BOX(meet->start_time), times);
 #else  
@@ -1452,7 +1435,6 @@ static VCalMeeting *vcal_meeting_create_real(VCalEvent *event, gboolean visible)
        meet->end_time = gtk_combo_box_text_new_with_entry();
 #endif
        gtk_combo_box_set_active(GTK_COMBO_BOX(meet->end_time), -1);
-       menu = GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(meet->end_time)));
 #if !GTK_CHECK_VERSION(2, 24, 0)       
        combobox_set_popdown_strings(GTK_COMBO_BOX(meet->end_time), times);
 #else  
@@ -1968,12 +1950,11 @@ void multisync_export(void)
        icalcomponent *calendar = NULL;
        FILE *fp;
 
-       if (is_dir_exist(path))
-               remove_dir_recursive(path);
-       if (!is_dir_exist(path))
-               make_dir(path);
-       if (!is_dir_exist(path)) {
-               perror(path);
+       if (is_dir_exist(path) && remove_dir_recursive(path) < 0) {
+               g_free(path);
+               return;
+       }
+       if (make_dir(path) != 0) {
                g_free(path);
                return;
        }
@@ -2122,6 +2103,7 @@ putfile:
        && strncmp(file, "http://", 7) 
        && strncmp(file, "https://", 8)
        && strncmp(file, "webcal://", 9)
+       && strncmp(file, "webcals://", 10)
        && strncmp(file, "ftp://", 6)) {
                gchar *afile = NULL;
                if (file[0] != G_DIR_SEPARATOR)
@@ -2138,8 +2120,8 @@ putfile:
                g_free(file);
        } else if (file) {
                FILE *fp = g_fopen(tmpfile, "rb");
-               if (!strncmp(file, "webcal://", 9)) {
-                       gchar *tmp = g_strdup_printf("http://%s", file+9);
+               if (!strncmp(file, "webcal", 6)) {
+                       gchar *tmp = g_strdup_printf("http%s", file+6);
                        g_free(file);
                        file = tmp;
                }
@@ -2269,6 +2251,7 @@ gboolean vcal_meeting_export_freebusy(const gchar *path, const gchar *user,
        && strncmp(file, "http://", 7) 
        && strncmp(file, "https://", 8)
        && strncmp(file, "webcal://", 9)
+       && strncmp(file, "webcals://", 10)
        && strncmp(file, "ftp://", 6)) {
                gchar *afile = NULL;
                if (file[0] != G_DIR_SEPARATOR)
@@ -2285,8 +2268,8 @@ gboolean vcal_meeting_export_freebusy(const gchar *path, const gchar *user,
                g_free(file);
        } else if (file) {
                FILE *fp = g_fopen(tmpfile, "rb");
-               if (!strncmp(file, "webcal://", 9)) {
-                       gchar *tmp = g_strdup_printf("http://%s", file+9);
+               if (!strncmp(file, "webcal", 6)) {
+                       gchar *tmp = g_strdup_printf("http%s", file+6);
                        g_free(file);
                        file = tmp;
                }