Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel

diff --git a/webcit/groupdav_get.c b/webcit/groupdav_get.c
index b99e7caaf80c008ec1cfefcb7052169ccbabaefd..fa53c1fe3d9087aa37c05d16e49f1b8249884be1 100644 (file)
--- a/webcit/groupdav_get.c
+++ b/webcit/groupdav_get.c
@@ -154,8 +154,7 @@ void groupdav_get(void)
                return;
        }
 
-       /** GET on the collection itself returns an ICS of the entire collection.
-        */
+       /* GET on the collection itself returns an ICS of the entire collection. */
        if (StrLength(dav_uid) == 0) {
                groupdav_get_big_ics();
                FreeStrBuf(&dav_roomname);

diff --git a/webcit/tasks.c b/webcit/tasks.c
index e0d5a55717bb97e2ef9689bf94caa00c21fef5cf..f9ecf61d93bf1d3ead9dd16c0de69e0bb05aa4a9 100644 (file)
--- a/webcit/tasks.c
+++ b/webcit/tasks.c
@@ -383,7 +383,7 @@ void save_individual_task(icalcomponent *supplied_vtodo, long msgnum, char* from
 
        if (supplied_vtodo != NULL) {
                vtodo = supplied_vtodo;
-               /**
+               /*
                 * If we're looking at a fully encapsulated VCALENDAR
                 * rather than a VTODO component, attempt to use the first
                 * relevant VTODO subcomponent.  If there is none, the
@@ -407,7 +407,7 @@ void save_individual_task(icalcomponent *supplied_vtodo, long msgnum, char* from
 
        if (havebstr("save_button")) {
 
-               /** Replace values in the component with ones from the form */
+               /* Replace values in the component with ones from the form */
 
                while (prop = icalcomponent_get_first_property(vtodo,
                                                               ICAL_SUMMARY_PROPERTY), prop != NULL) {
@@ -497,7 +497,7 @@ void save_individual_task(icalcomponent *supplied_vtodo, long msgnum, char* from
                                                   icalproperty_new_due(t)
                                );
                }
-               /** Give this task a UID if it doesn't have one. */
+               /* Give this task a UID if it doesn't have one. */
                syslog(9, "Give this task a UID if it doesn't have one.\n");
                if (icalcomponent_get_first_property(vtodo,
                                                     ICAL_UID_PROPERTY) == NULL) {
@@ -552,7 +552,7 @@ void save_individual_task(icalcomponent *supplied_vtodo, long msgnum, char* from
                icalcomponent_free(encaps);
        }
 
-       /**
+       /*
         * If the user clicked 'Delete' then explicitly delete the message.
         */
        if (havebstr("delete_button")) {