[Xfce4-commits] <orage:master> 4.8.3.2: Enhancement 8231: alarm type selectable for foreign ics files

[juha]

Updating branch refs/heads/master
         to 1aac08d0c480ea3f2904c31c170f8184810f3133 (commit)
       from 989abdb15e3e06eee5876d702587ca24456779c7 (commit)

commit 1aac08d0c480ea3f2904c31c170f8184810f3133
Author: juha <juha at t400.domain.invalid>
Date:   Mon Jan 28 11:08:17 2013 +0200

    4.8.3.2: Enhancement 8231: alarm type selectable for foreign ics files
    
    It is now possible to set default alarm type for foreign file alarms.
    Note that this is done via parameter "Use notify foreign alarm" and it is
    not documented and not available in menus and forms.

 configure.in.in  |    2 +-
 src/ical-code.c  |    8 ++++++--
 src/parameters.c |    4 ++++
 src/parameters.h |    1 +
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/configure.in.in b/configure.in.in
index 061f7c4..abc72b5 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -9,7 +9,7 @@ dnl Written for Xfce by Juha Kautto <juha at xfce.org>
 dnl
 
 dnl Version information
-m4_define([orage_version], [4.8.3.1-git])
+m4_define([orage_version], [4.8.3.2-git])
 
 m4_define([gtk_minimum_version], [2.10.0])
 m4_define([xfce_minimum_version], [4.6.0])
diff --git a/src/ical-code.c b/src/ical-code.c
index 95fce2a..cf88623 100644
--- a/src/ical-code.c
+++ b/src/ical-code.c
@@ -1675,8 +1675,12 @@ static void get_alarm_data(icalcomponent *ca,  xfical_appt *appt)
             appt->note = (char *)icalproperty_get_description(p);
             */
         /* default display alarm is orage if none is set */
-        if (!appt->display_alarm_orage && !appt->display_alarm_notify)	
-            appt->display_alarm_orage = TRUE;
+        if (!appt->display_alarm_orage && !appt->display_alarm_notify) {
+            if (g_par.use_foreign_display_alarm_notify)
+                appt->display_alarm_notify = TRUE;
+            else
+                appt->display_alarm_orage = TRUE;
+        }
     }
     else if (act == ICAL_ACTION_AUDIO) {
         get_alarm_data_x(ca, appt);
diff --git a/src/parameters.c b/src/parameters.c
index c4b564d..4e55434 100644
--- a/src/parameters.c
+++ b/src/parameters.c
@@ -1162,6 +1162,8 @@ void read_parameters(void)
         g_sprintf(f_par, "Foreign file %02d read-only", i);
         g_par.foreign_data[i].read_only = orage_rc_get_bool(orc, f_par, TRUE);
     }
+    g_par.use_foreign_display_alarm_notify = orage_rc_get_bool(orc
+            , "Use notify foreign alarm", FALSE);
     g_log_level = orage_rc_get_int(orc, "Logging level", 0);
     g_par.priority_list_limit = orage_rc_get_int(orc, "Priority list limit", 8);
     g_par.use_wakeup_timer = orage_rc_get_bool(orc, "Use wakeup timer", TRUE);
@@ -1256,6 +1258,8 @@ void write_parameters(void)
         g_sprintf(f_par, "Foreign file %02d read-only", i);
         orage_rc_del_item(orc, f_par);
     }
+    orage_rc_put_bool(orc, "Use notify foreign alarm"
+            , g_par.use_foreign_display_alarm_notify);
     orage_rc_put_int(orc, "Logging level", g_log_level);
     orage_rc_put_int(orc, "Priority list limit", g_par.priority_list_limit);
     orage_rc_put_bool(orc, "Use wakeup timer", g_par.use_wakeup_timer);
diff --git a/src/parameters.h b/src/parameters.h
index 208efd3..724e40e 100644
--- a/src/parameters.h
+++ b/src/parameters.h
@@ -65,6 +65,7 @@ typedef struct _parameters
     /* foreign files */
     int foreign_count;
     foreign_file foreign_data[10];
+    gboolean use_foreign_display_alarm_notify; /* changes alarm to notify */
 
     /* other */
     char *orage_file;