[Xfce4-commits] [apps/orage] 01/01: 4.11.2.13 Coverity fix 31704 31705 removed logically dead code

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

juha pushed a commit to branch master
in repository apps/orage.

commit 53905ed03e354fbbc554ea9602fde19cbd89c9be
Author: Juha Kautto <juha at xfce.org>
Date:   Fri Mar 6 15:37:45 2015 +0200

    4.11.2.13 Coverity fix 31704 31705 removed logically dead code
    
    removed code part which can not be reached.
    processed also error code from xfical_file_open call
---
 configure.in.in |    2 +-
 src/ical-code.c |   13 ++++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/configure.in.in b/configure.in.in
index 65913f5..5c59d97 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.11.2.12-git])
+m4_define([orage_version], [4.11.2.13-git])
 
 m4_define([gtk_minimum_version], [2.14.0])
 m4_define([xfce_minimum_version], [4.8.0])
diff --git a/src/ical-code.c b/src/ical-code.c
index 661fbf7..d583140 100644
--- a/src/ical-code.c
+++ b/src/ical-code.c
@@ -3155,6 +3155,11 @@ static void xfical_alarm_build_list_internal_real(gboolean first_list_today
                             (char *)icalcomponent_get_description(c));
                 }
             }
+            if (trg_active) {
+                cnt_act_alarm++;
+                process_alarm_data(ca, new_alarm);
+            }
+            /*
             if (trg_processed) {
                 if (trg_active) {
                     cnt_act_alarm++;
@@ -3165,6 +3170,7 @@ static void xfical_alarm_build_list_internal_real(gboolean first_list_today
                 orage_message(140, P_N "Found alarm without trigger %s. Skipping it"
                         , icalcomponent_get_uid(c));
             }
+            */
         }  /* ALARM */
         if (trg_active) {
             alarm_add(new_alarm);
@@ -3222,9 +3228,10 @@ void xfical_alarm_build_list(gboolean first_list_today)
 #ifdef ORAGE_DEBUG
     orage_message(-100, P_N);
 #endif
-    xfical_file_open(TRUE);
-    xfical_alarm_build_list_internal(first_list_today);
-    xfical_file_close(TRUE);
+    if (xfical_file_open(TRUE)) {
+        xfical_alarm_build_list_internal(first_list_today);
+        xfical_file_close(TRUE);
+    }
 }
 
  /* Read next EVENT/TODO/JOURNAL component on the specified date from 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.