From dce5bdc3699faf592453492fe201606ed47e06b9 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 2 Nov 2010 11:49:38 -0400 Subject: Move calendar preferences to the calendar module. Continue replacing the use of calendar-config functions with GObject property bindings to EShellSettings properties. --- calendar/gui/dialogs/comp-editor-util.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'calendar/gui/dialogs/comp-editor-util.c') diff --git a/calendar/gui/dialogs/comp-editor-util.c b/calendar/gui/dialogs/comp-editor-util.c index 69ec171917..a29d75739c 100644 --- a/calendar/gui/dialogs/comp-editor-util.c +++ b/calendar/gui/dialogs/comp-editor-util.c @@ -33,7 +33,6 @@ #include #include #include "widgets/misc/e-dateedit.h" -#include "../calendar-config.h" #include "../itip-utils.h" #include #include "comp-editor-util.h" @@ -147,14 +146,15 @@ comp_editor_new_date_edit (gboolean show_date, FIXME: Should probably use the timezone from somewhere in the component rather than the current timezone. */ struct tm -comp_editor_get_current_time (GObject *object, gpointer data) +comp_editor_get_current_time (EDateEdit *date_edit, + CompEditor *editor) { icaltimezone *zone; struct icaltimetype tt; struct tm tmp_tm = { 0 }; /* Get the current timezone. */ - zone = calendar_config_get_icaltimezone (); + zone = comp_editor_get_timezone (editor); tt = icaltime_from_timet_with_zone (time (NULL), FALSE, zone); -- cgit v1.2.3 From ab870b27cd05cc39e4755de9c6d9e02944977c17 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 1 Mar 2011 13:04:09 -0500 Subject: Fix Gtk-Doc comment notation. Seeing lots of what I assume to be doxygen syntax in comment blocks. --- calendar/gui/dialogs/comp-editor-util.c | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) (limited to 'calendar/gui/dialogs/comp-editor-util.c') diff --git a/calendar/gui/dialogs/comp-editor-util.c b/calendar/gui/dialogs/comp-editor-util.c index a29d75739c..a98314b389 100644 --- a/calendar/gui/dialogs/comp-editor-util.c +++ b/calendar/gui/dialogs/comp-editor-util.c @@ -285,12 +285,18 @@ free_slist_strs (gpointer data) /** * comp_editor_manage_new_attendees: + * @comp: The component. + * @ma: An attendee. + * @add: %TRUE to add attendee's email to new-attendees, %FALSE to remove + * from it. + * * Manages the 'new-attendees' string of new attendees of the component. - * @param comp: The component. - * @param ma: An attendee. - * @param add: TRUE to add attendee's email to new-attendees, FALSE to remove from it. * - * @note The list is just string of emails separated by ';' + * + * + * The list is just string of emails separated by ';' + * + * **/ void comp_editor_manage_new_attendees (ECalComponent *comp, @@ -316,9 +322,10 @@ comp_editor_manage_new_attendees (ECalComponent *comp, /** * comp_editor_copy_new_attendees: - * Copies "new-attendees" information from src to des component. - * @param des: Component, to copy to. - * @param src: Component, to copy from. + * @des: Component, to copy to. + * @src: Component, to copy from. + * + * Copies "new-attendees" information from @src to @des component. **/ void comp_editor_copy_new_attendees (ECalComponent *des, ECalComponent *src) @@ -337,9 +344,10 @@ comp_editor_copy_new_attendees (ECalComponent *des, ECalComponent *src) /** * comp_editor_have_in_new_attendees: - * @param comp: Component with the "new-attendees" possibly set. - * @param ma: Meeting attendee to check. - * @return Whether ma is present in the list of new attendees of the comp. + * @comp: Component with the "new-attendees" possibly set. + * @ma: Meeting attendee to check. + * + * Returns: Whether @ma is present in the list of new attendees of the comp. **/ gboolean comp_editor_have_in_new_attendees (ECalComponent *comp, EMeetingAttendee *ma) -- cgit v1.2.3 From 777c1cbd40eb63365f2c28e38f6a93beb2d1c9d1 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 16 Aug 2011 11:25:56 -0400 Subject: Coding style and whitespace cleanup. --- calendar/gui/dialogs/comp-editor-util.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) (limited to 'calendar/gui/dialogs/comp-editor-util.c') diff --git a/calendar/gui/dialogs/comp-editor-util.c b/calendar/gui/dialogs/comp-editor-util.c index a98314b389..cbc34cb108 100644 --- a/calendar/gui/dialogs/comp-editor-util.c +++ b/calendar/gui/dialogs/comp-editor-util.c @@ -49,7 +49,8 @@ * results. **/ void -comp_editor_dates (CompEditorPageDates *dates, ECalComponent *comp) +comp_editor_dates (CompEditorPageDates *dates, + ECalComponent *comp) { ECalComponentDateTime dt; @@ -59,8 +60,8 @@ comp_editor_dates (CompEditorPageDates *dates, ECalComponent *comp) dates->complete = NULL; /* Note that the ECalComponentDateTime's returned contain allocated - icaltimetype and tzid values, so we just take over ownership of - those. */ + * icaltimetype and tzid values, so we just take over ownership of + * those. */ e_cal_component_get_dtstart (comp, &dt); if (dt.value) { dates->start = g_new (ECalComponentDateTime, 1); @@ -89,7 +90,7 @@ void comp_editor_free_dates (CompEditorPageDates *dates) { /* Note that e_cal_component_free_datetime() only frees the fields in - the struct. It doesn't free the struct itself, so we do that. */ + * the struct. It doesn't free the struct itself, so we do that. */ if (dates->start) { e_cal_component_free_datetime (dates->start); g_free (dates->start); @@ -142,9 +143,9 @@ comp_editor_new_date_edit (gboolean show_date, } /* Returns the current time, for EDateEdit widgets and ECalendar items in the - dialogs. - FIXME: Should probably use the timezone from somewhere in the component - rather than the current timezone. */ + * dialogs. + * FIXME: Should probably use the timezone from somewhere in the component + * rather than the current timezone. */ struct tm comp_editor_get_current_time (EDateEdit *date_edit, CompEditor *editor) @@ -242,7 +243,9 @@ comp_editor_strip_categories (const gchar *categories) } static GSList * -manage_new_attendees (const GSList *lst, const gchar *eml, gboolean add) +manage_new_attendees (const GSList *lst, + const gchar *eml, + gboolean add) { GSList *copy = NULL; const GSList *l; @@ -328,7 +331,8 @@ comp_editor_manage_new_attendees (ECalComponent *comp, * Copies "new-attendees" information from @src to @des component. **/ void -comp_editor_copy_new_attendees (ECalComponent *des, ECalComponent *src) +comp_editor_copy_new_attendees (ECalComponent *des, + ECalComponent *src) { GSList *copy = NULL, *l; @@ -350,7 +354,8 @@ comp_editor_copy_new_attendees (ECalComponent *des, ECalComponent *src) * Returns: Whether @ma is present in the list of new attendees of the comp. **/ gboolean -comp_editor_have_in_new_attendees (ECalComponent *comp, EMeetingAttendee *ma) +comp_editor_have_in_new_attendees (ECalComponent *comp, + EMeetingAttendee *ma) { const gchar *eml; -- cgit v1.2.3 From e64d6fe05c30c2cc1d7625a202afba3ba2da07cd Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 22 Nov 2011 18:22:14 -0500 Subject: Miscellaneous cleanups. --- calendar/gui/dialogs/comp-editor-util.c | 1 - 1 file changed, 1 deletion(-) (limited to 'calendar/gui/dialogs/comp-editor-util.c') diff --git a/calendar/gui/dialogs/comp-editor-util.c b/calendar/gui/dialogs/comp-editor-util.c index 2c087bb2f6..58c649b7ee 100644 --- a/calendar/gui/dialogs/comp-editor-util.c +++ b/calendar/gui/dialogs/comp-editor-util.c @@ -37,7 +37,6 @@ #include #include "comp-editor-util.h" - /** * comp_editor_dates: * @dates: A structure to be filled out with dates of a component -- cgit v1.2.3