GtkWidget *total_avail_msg;
PrefsAccount *account;
gboolean visible;
-#if !GTK_CHECK_VERSION(2,12,0)
- GtkTooltips *tips;
-#endif
};
struct _VCalAttendee {
{
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();
cur = cur->next;
i++;
}
- if (cur)
+ if (cur && cur->data)
return g_strdup(((PrefsAccount *)(cur->data))->address);
else
return g_strdup("");
cur = cur->next;
i++;
}
- if (cur)
+ if (cur && cur->data)
return g_strdup(((PrefsAccount *)(cur->data))->name);
else
return g_strdup("");
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;
gchar *msg, *intro = NULL, *outro = NULL, *before = NULL, *after = NULL;
if (multiple)
- intro = g_strdup(_("The following person(s) are busy at the time of your planned meeting:\n- "));
+ intro = g_strdup(_("The following people are busy at the time of your planned meeting:\n- "));
else if (!strcmp(unavailable_persons, _("You")))
intro = g_strdup(_("You are busy at the time of your planned meeting"));
else
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;
"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') {
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;
}
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;
}
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) {
- g_snprintf(buf, sizeof(buf), "%s", account->domain);
- } else if (!strncmp(get_domain_name(), "localhost", strlen("localhost"))) {
- g_snprintf(buf, sizeof(buf), "%s",
- strchr(account->address, '@') ?
- strchr(account->address, '@')+1 :
- account->address);
- } else {
- g_snprintf(buf, sizeof(buf), "%s", "");
+ if(account == NULL) {
+ debug_print("can't get account from address %s\n", organizer);
+ g_free(organizer);
+ return FALSE;
}
- generate_msgid(buf, 255, account->address);
+
+ organizer_name = get_organizer_name(meet);
if (meet->uid) {
uid = g_strdup(meet->uid);
} else {
- uid = g_strdup(buf);
+ uid = prefs_account_generate_msgid(account);
}
dtstart = get_date(meet, TRUE);
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;
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
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
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
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);
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);
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;
}
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++;
icalproperty_new_prodid(
"-//Claws Mail//NONSGML Claws Mail Calendar//EN"),
icalproperty_new_calscale("GREGORIAN"),
- 0
+ (void*)0
);
vcal_manager_event_dump(event, FALSE, FALSE, calendar, FALSE);
tmp = g_strconcat(path, G_DIR_SEPARATOR_S, file, NULL);
icalproperty_new_prodid(
"-//Claws Mail//NONSGML Claws Mail Calendar//EN"),
icalproperty_new_calscale("GREGORIAN"),
- 0
+ (void*)0
);
for (cur = list; cur; cur = cur->next) {
}
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);
&& 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)
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;
}
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);
icalproperty_new_prodid(
"-//Claws Mail//NONSGML Claws Mail Calendar//EN"),
icalproperty_new_calscale("GREGORIAN"),
- 0
+ (void*)0
);
timezone = icalcomponent_new(ICAL_VTIMEZONE_COMPONENT);
ICAL_VFREEBUSY_COMPONENT,
icalproperty_vanew_dtstart(itt_start, 0),
icalproperty_vanew_dtend(itt_end, 0),
- 0
+ (void*)0
);
debug_print("DTSTART:%s\nDTEND:%s\n",
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);
&& 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)
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;
}
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);
projects / claws.git / blobdiff