Updating branch refs/heads/master
to eff744be6887b5758b4d515a3db901990d8f85cf (commit)
from 1fc45d628b2f432aff62900d0a0963e175986cdc (commit)
commit eff744be6887b5758b4d515a3db901990d8f85cf
Author: Juha Kautto <j...@xfce.org>
Date: Sun Jul 24 15:08:07 2011 +0300
4.8.1.7 Removed unnecessary critical message when searching text
Orage gave unnecessary critical warning when appointment file was empty.
Added check to only give warning if file is big enough so there is reason
to believe it is not empty.
configure.in.in | 2 +-
src/ical-archive.c | 1 +
src/ical-code.c | 5 ++++-
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/configure.in.in b/configure.in.in
index 1052937..9278b25 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.8.1.6-git])
+m4_define([orage_version], [4.8.1.7-git])
m4_define([gtk_minimum_version], [2.10.0])
m4_define([xfce_minimum_version], [4.6.0])
diff --git a/src/ical-archive.c b/src/ical-archive.c
index 01617cc..1cfa01e 100644
--- a/src/ical-archive.c
+++ b/src/ical-archive.c
@@ -193,6 +193,7 @@ static void
xfical_icalcomponent_archive_recurrent(icalcomponent *e
* enddates and actually only the date parts since time will stay.
* Note that we may need to remove limited recurrency events. We only
* add X-ORAGE-ORIG... dates if those are not there already.
+ * NOTE: these are not added to Archive file.
*/
sdate = icalcomponent_get_dtstart(e);
pdtstart = icalcomponent_get_first_property(e, ICAL_DTSTART_PROPERTY);
diff --git a/src/ical-code.c b/src/ical-code.c
index 8a70d5d..1fb5618 100644
--- a/src/ical-code.c
+++ b/src/ical-code.c
@@ -3741,7 +3741,10 @@ static xfical_appt
*xfical_appt_get_next_with_string_internal(char *str
, text_len, strlen(text_upper));
}
if (!beg) {
- orage_message(250, P_N "Could not find initial BEGIN:V-type from
Orage ical file (%s)"
+ /* the file can actually be empty and not have any events, so this
+ may be quite ok */
+ if (text_len > 100)
+ orage_message(50, P_N "Could not find initial BEGIN:V-type
from Orage ical file (%s). Maybe file is empty."
, search_file);
return(NULL);
}
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
