Updating branch refs/heads/master to 1f8a35beacfd3a12d21e7244a85f366126852209 (commit) from f90a64fbafab6040801e71475f5e7096321efff6 (commit)
commit 1f8a35beacfd3a12d21e7244a85f366126852209 Author: Juha Kautto <j...@xfce.org> Date: Mon Nov 18 22:58:56 2013 +0200 4.9.9.1 Fix for appointment add ito Orage file in 4.9.9.0 version Previous version was not able to add to base Orage file at all. Fixed that. configure.in.in | 2 +- src/appointment.c | 27 ++++++++++++++++----------- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/configure.in.in b/configure.in.in index 8683eb5..71e2f35 100644 --- a/configure.in.in +++ b/configure.in.in @@ -9,7 +9,7 @@ dnl Written for Xfce by Juha Kautto <j...@xfce.org> dnl dnl Version information -m4_define([orage_version], [4.9.9.0-git]) +m4_define([orage_version], [4.9.9.1-git]) m4_define([gtk_minimum_version], [2.14.0]) m4_define([xfce_minimum_version], [4.8.0]) diff --git a/src/appointment.c b/src/appointment.c index ddc7f48..ba0b39f 100644 --- a/src/appointment.c +++ b/src/appointment.c @@ -1185,18 +1185,23 @@ static gboolean save_xfical_from_appt_win(appt_win *apptw) if (apptw->File_insert_cb) { tmp = gtk_combo_box_get_active_text( GTK_COMBO_BOX(apptw->File_insert_cb)); - for (i = 0; i < g_par.foreign_count && !found; i++) { - if (strcmp(g_par.foreign_data[i].file, tmp) == 0 || - strcmp(g_par.foreign_data[i].name, tmp) == 0) { - found = TRUE; - } - } - if (found) { /* it should always been found */ - xf_file_id = g_strdup_printf("F%02d.", i-1); + if (strcmp(tmp, _("Orage default file")) == 0) { + xf_file_id = g_strdup("O00."); } - else { /* error! */ - orage_message(150, P_N "Matching foreign file not found: %s", tmp); - ok = FALSE; + else { + for (i = 0; i < g_par.foreign_count && !found; i++) { + if (strcmp(g_par.foreign_data[i].file, tmp) == 0 || + strcmp(g_par.foreign_data[i].name, tmp) == 0) { + found = TRUE; + } + } + if (found) { /* it should always been found */ + xf_file_id = g_strdup_printf("F%02d.", i-1); + } + else { /* error! */ + orage_message(150, P_N "Matching foreign file not found: %s", tmp); + ok = FALSE; + } } } else { _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits