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

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

diff --git a/src/plugins/vcalendar/vcalendar.c b/src/plugins/vcalendar/vcalendar.c
index 2577408c778f59c3d148bece1cd81f3a07f1a6ce..bdfe503824a783f54d14b48318a6d9ac9c7fde95 100644 (file)
--- a/src/plugins/vcalendar/vcalendar.c
+++ b/src/plugins/vcalendar/vcalendar.c
@@ -1086,7 +1086,7 @@ static gboolean vcalviewer_action_cb(GtkButton *widget, gpointer data)
        if (!account) {
                AlertValue val = alertpanel_full(_("No account found"), 
                                        _("You have no account matching any attendee.\n"
-                                           "Do you want to reply anyway ?"),
+                                           "Do you want to reply anyway?"),
                                        GTK_STOCK_CANCEL, _("+Reply anyway"), NULL, FALSE,
                                        NULL, ALERT_QUESTION, G_ALERTDEFAULT);
                if (val == G_ALERTALTERNATE) {          
@@ -1321,8 +1321,11 @@ void vcalendar_init(void)
        gchar *directory = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
                                "vcalendar", NULL);
        START_TIMING("");
-       if (!is_dir_exist(directory))
-               make_dir (directory);
+       if (!is_dir_exist(directory) && make_dir (directory) != 0) {
+               g_free(directory);
+               return;
+       }
+
        g_free(directory);
 
        vcal_prefs_init();
@@ -1339,16 +1342,15 @@ void vcalendar_init(void)
                folder_scan_tree(folder, TRUE);
                END_TIMING();
        }
-       if (folder) {
-               if (!folder->inbox) {
-                       folder->klass->create_tree(folder);
-                       folder_scan_tree(folder, TRUE);
-               }
-               if (folder->klass->scan_required(folder, folder->inbox)) {
-                       START_TIMING("scanning folder");
-                       folder_item_scan(folder->inbox);
-                       END_TIMING();
-               }
+
+       if (!folder->inbox) {
+               folder->klass->create_tree(folder);
+               folder_scan_tree(folder, TRUE);
+       }
+       if (folder->klass->scan_required(folder, folder->inbox)) {
+               START_TIMING("scanning folder");
+               folder_item_scan(folder->inbox);
+               END_TIMING();
        }
        
        vcal_folder_gtk_init();
@@ -1380,7 +1382,6 @@ void vcalendar_done(void)
        MainWindow *mainwin = mainwindow_get_mainwindow();
        FolderView *folderview = NULL;
        FolderItem *fitem = NULL;
-       SummaryView *summaryview = NULL;
 
        icalmemory_free_ring();
 
@@ -1389,7 +1390,6 @@ void vcalendar_done(void)
        if (mainwin == NULL)
                return;
 
-       summaryview = mainwin->summaryview;
        folderview = mainwin->folderview;
        fitem = folderview->summaryview->folder_item;