* free the libical ringbuffer in apropriate places

* some more new libical gizmoes.

diff --git a/webcit/event.c b/webcit/event.c
index f7476f73366eff79fecb0edf7aa1c471ea02cf5b..a67e44445b659db03841afa2991c4fabd26ec839 100644 (file)
--- a/webcit/event.c
+++ b/webcit/event.c
@@ -710,6 +710,7 @@ STARTOVER:  for (attendee = icalcomponent_get_first_property(vevent, ICAL_ATTENDE
                        if (buf[0] == '2') {
                                strcpy(WC->ImportantMessage, &buf[4]);
                        }
+                       icalmemory_free_ring ();
                        icalcomponent_free(encaps);
                }
 

diff --git a/webcit/ical_dezonify.c b/webcit/ical_dezonify.c
index 7d1ed5b0d51a2542988df2e4f7ab21185437cef6..24e8d88c2336e6b2751da82cf095e206f414b4e4 100644 (file)
--- a/webcit/ical_dezonify.c
+++ b/webcit/ical_dezonify.c
@@ -124,18 +124,13 @@ void ical_dezonify_backend(icalcomponent *cal,
                }
 
                if (t == NULL) {
-                       icaltimezone_convert_time(&TheTime,
-                                               get_default_icaltimezone(),
-                                               icaltimezone_get_utc_timezone()
-                       );
+                       t = icaltimezone_copy(get_default_icaltimezone());
                }
-               else {
-                       icaltimezone_convert_time(&TheTime,
-                                               t,
-                                               icaltimezone_get_utc_timezone()
+               icaltimezone_convert_time(&TheTime,
+                                         t,
+                                         icaltimezone_get_utc_timezone()
                        );
-                       icaltimezone_free (t, 1);
-               }
+               icaltimezone_free (t, 1);
                TheTime.is_utc = 1;
        }
 

diff --git a/webcit/po/de.po b/webcit/po/de.po
index ec043a21da87e61b7fb2691b105ebd37ca87066b..3d8d4cf24091f48e77f4d641f3d3bfe6f3fca3f0 100644 (file)
--- a/webcit/po/de.po
+++ b/webcit/po/de.po
@@ -1645,7 +1645,7 @@ msgstr "Vorgabezeichensatz für EMail Kopfzeilen"
 
 #: ../preferences.c:419
 msgid "Show empty floors"
-msgstr ""
+msgstr "Leere Verzeichnisse Anzeigen"
 
 #: ../preferences.c:444
 msgid "Change"

diff --git a/webcit/webserver.c b/webcit/webserver.c
index 83554298d54c43164a64996c97adb7ef6ca0ad2c..3b32650018358e706b62bc97f424b473471eabec 100644 (file)
--- a/webcit/webserver.c
+++ b/webcit/webserver.c
@@ -950,8 +950,10 @@ void worker_entry(void)
                                lprintf(2, "master shutdown: cleaning up sessions\n");
                                do_housekeeping();
 #ifdef WEBCIT_WITH_CALENDAR_SERVICE
+                               lprintf(2, "master shutdown: cleaning up libical\n");
                                free_zone_directory ();
                                icaltimezone_release_zone_tab ();
+                               icalmemory_free_ring ();
 #endif
                                lprintf(2, "master shutdown exiting!.\n");                              
                                exit(0);