[Xfce4-commits] r29095 - in xfcalendar/trunk: po src

[Juha Kautto]

Author: juha
Date: 2009-01-04 08:05:03 +0000 (Sun, 04 Jan 2009)
New Revision: 29095

Modified:
   xfcalendar/trunk/po/en_GB.po
   xfcalendar/trunk/src/appointment.c
Log:
Fixed Bug 4767: Orage complains about endtime before start for TODO
                even if there is no endtime defined at all.
-This line, and those below, will be ignored--

M    src/appointment.c
M    po/en_GB.po


Modified: xfcalendar/trunk/po/en_GB.po
===================================================================
--- xfcalendar/trunk/po/en_GB.po	2009-01-03 14:41:18 UTC (rev 29094)
+++ xfcalendar/trunk/po/en_GB.po	2009-01-04 08:05:03 UTC (rev 29095)
@@ -387,7 +387,7 @@
 #. special timing for SUSPEND/HIBERNATE
 #: ../panel-plugin/oc_config.c:391
 msgid "fix time after suspend/hibernate"
-msgstr ""
+msgstr "fix time after suspend/hibernate"
 
 #: ../panel-plugin/oc_config.c:395
 msgid ""
@@ -397,6 +397,11 @@
 "you have this selected. (Selecting this prevents cpu and interrupt saving "
 "features from working.)"
 msgstr ""
+"You only need this if you do short term (less than 5 hours) suspend or "
+"hibernate and your visible time does not include seconds. Under these "
+"circumstances it is possible that Orageclock shows time inaccurately unless "
+"you have this selected. (Selecting this prevents cpu and interrupt saving "
+"features from working.)"
 
 #: ../panel-plugin/oc_config.c:407
 msgid ""
@@ -3343,16 +3348,15 @@
 
 #: ../src/parameters.c:1019
 msgid "First Orage start. Searching default timezone."
-msgstr ""
+msgstr "First Orage start. Searching default timezone."
 
 #: ../src/parameters.c:1038
-#, fuzzy, c-format
 msgid "Default timezone set to %s."
-msgstr "set timezone to:"
+msgstr "Default timezone set to %s."
 
 #: ../src/parameters.c:1041
 msgid "Default timezone not found, please, set it manually."
-msgstr ""
+msgstr "Default timezone not found, please, set it manually."
 
 #: ../src/reminder.c:425
 msgid "Reminder "

Modified: xfcalendar/trunk/src/appointment.c
===================================================================
--- xfcalendar/trunk/src/appointment.c	2009-01-03 14:41:18 UTC (rev 29094)
+++ xfcalendar/trunk/src/appointment.c	2009-01-04 08:05:03 UTC (rev 29095)
@@ -742,8 +742,10 @@
 {
     gint result;
 
-    /* Journal does not have end time so no need to check */
-    if (appt->type == XFICAL_TYPE_JOURNAL)
+    /* Journal does not have end time so no need to check.
+     * Or if TODO has no end time no need to check. */
+    if (appt->type == XFICAL_TYPE_JOURNAL
+    ||  (appt->type == XFICAL_TYPE_TODO && !appt->use_due_time))
         return(TRUE);
     if (xfical_compare_times(appt) > 0) {
         result = xfce_message_dialog(GTK_WINDOW(apptw->Window)