Actually encrypt passwords before storing them
[claws.git] / src / plugins / vcalendar / vcal_meeting_gtk.c
index eae703e..0c7a36c 100644 (file)
@@ -1016,7 +1016,7 @@ static gboolean check_attendees_availability(VCalMeeting *meet, gboolean tell_if
                        num_format++;
                }
                if (num_format > 2) {
-                       g_warning("wrong format in %s!\n", real_url);
+                       g_warning("wrong format in %s!", real_url);
                        g_free(real_url);
                        return FALSE;
                }
@@ -1595,13 +1595,13 @@ static VCalMeeting *vcal_meeting_create_real(VCalEvent *event, gboolean visible)
        date_hbox = gtk_hbox_new(FALSE, 6);
        date_vbox = gtk_vbox_new(FALSE, 6);
        hbox = gtk_hbox_new(FALSE, 6);
-       label = gtk_label_new(_("<b>Starts at:</b> "));
+       label = gtk_label_new(g_strconcat("<b>",_("Starts at:"),"</b> ",NULL));
        gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
        gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
        
        gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
        gtk_box_pack_start(GTK_BOX(hbox), meet->start_time, FALSE, FALSE, 0);
-       label = gtk_label_new(_("<b> on:</b>"));
+       label = gtk_label_new(g_strconcat("<b> ",_("on:"),"</b>",NULL));
        gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
        gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
        gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
@@ -1619,13 +1619,13 @@ static VCalMeeting *vcal_meeting_create_real(VCalEvent *event, gboolean visible)
 
        date_vbox = gtk_vbox_new(FALSE, 6);
        hbox = gtk_hbox_new(FALSE, 6);
-       label = gtk_label_new(_("<b>Ends at:</b> ")); 
+       label = gtk_label_new(g_strconcat("<b>",_("Ends at:"),"</b> ", NULL));
        gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
        gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
        
        gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
        gtk_box_pack_start(GTK_BOX(hbox), meet->end_time, FALSE, FALSE, 0);
-       label = gtk_label_new(_("<b> on:</b>")); 
+       label = gtk_label_new(g_strconcat("<b> ",_("on:"),"</b>",NULL));
        gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
        gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
        gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
@@ -1962,7 +1962,8 @@ void multisync_export(void)
        list = vcal_folder_get_waiting_events();
        for (cur = list; cur; cur = cur->next) {
                VCalEvent *event = (VCalEvent *)cur->data;
-               file = g_strdup_printf("multisync%lu-%d", time(NULL), i);
+               file = g_strdup_printf("multisync%lld-%d",
+                               (long long)time(NULL), i);
 
                i++;
 
@@ -2059,7 +2060,7 @@ gboolean vcal_meeting_export_calendar(const gchar *path,
        }
 
        if (str_write_to_file(icalcomponent_as_ical_string(calendar), internal_file) < 0) {
-               g_warning("can't export internal cal\n");
+               g_warning("can't export internal cal");
        }
        
        g_free(internal_file);
@@ -2126,7 +2127,7 @@ putfile:
                        file = tmp;
                }
                if (fp) {
-                       res = vcal_curl_put(file, fp, filesize, user, pass);
+                       res = vcal_curl_put(file, fp, filesize, user, (pass != NULL ? pass : ""));
                        fclose(fp);
                }
                g_free(file);
@@ -2221,7 +2222,7 @@ gboolean vcal_meeting_export_freebusy(const gchar *path, const gchar *user,
        icalcomponent_add_component(calendar, vfreebusy);
        
        if (str_write_to_file(icalcomponent_as_ical_string(calendar), internal_file) < 0) {
-               g_warning("can't export freebusy\n");
+               g_warning("can't export freebusy");
        }
        
        g_free(internal_file);
@@ -2274,7 +2275,7 @@ gboolean vcal_meeting_export_freebusy(const gchar *path, const gchar *user,
                        file = tmp;
                }
                if (fp) {
-                       res = vcal_curl_put(file, fp, filesize, user, pass);
+                       res = vcal_curl_put(file, fp, filesize, user, (pass != NULL ? pass : ""));
                        fclose(fp);
                }
                g_free(file);