diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2011-12-01 10:53:20 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@redhat.com> | 2012-02-20 23:04:25 +0800 |
commit | 23f5773903d64a554d977ae7d0ebbaca73528f1f (patch) | |
tree | 104e1a59da8bf96b004bce204b79f47bbe0a6d13 /calendar/gui/e-meeting-attendee.c | |
parent | 49bc4c2d765ee1780c23fdc9f42152850dabb220 (diff) | |
download | gsoc2013-evolution-23f5773903d64a554d977ae7d0ebbaca73528f1f.tar.gz gsoc2013-evolution-23f5773903d64a554d977ae7d0ebbaca73528f1f.tar.zst gsoc2013-evolution-23f5773903d64a554d977ae7d0ebbaca73528f1f.zip |
Coding style and whitespace cleanup.
Diffstat (limited to 'calendar/gui/e-meeting-attendee.c')
-rw-r--r-- | calendar/gui/e-meeting-attendee.c | 136 |
1 files changed, 70 insertions, 66 deletions
diff --git a/calendar/gui/e-meeting-attendee.c b/calendar/gui/e-meeting-attendee.c index 00e3f9d543..a7c4fff5d7 100644 --- a/calendar/gui/e-meeting-attendee.c +++ b/calendar/gui/e-meeting-attendee.c @@ -28,6 +28,10 @@ #include <gtk/gtk.h> #include "e-meeting-attendee.h" +#define E_MEETING_ATTENDEE_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE \ + ((obj), E_TYPE_MEETING_ATTENDEE, EMeetingAttendeePrivate)) + struct _EMeetingAttendeePrivate { gchar *address; gchar *member; @@ -72,25 +76,6 @@ static void e_meeting_attendee_finalize (GObject *obj); G_DEFINE_TYPE (EMeetingAttendee, e_meeting_attendee, G_TYPE_OBJECT) -static void -e_meeting_attendee_class_init (EMeetingAttendeeClass *klass) -{ - GObjectClass *object_class; - - object_class = G_OBJECT_CLASS (klass); - - signals[CHANGED] = - g_signal_new ("changed", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (EMeetingAttendeeClass, changed), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, 0); - - object_class->finalize = e_meeting_attendee_finalize; -} - static gchar * string_test (gchar *string) { @@ -113,76 +98,89 @@ notify_changed (EMeetingAttendee *ia) } static void -e_meeting_attendee_init (EMeetingAttendee *ia) +e_meeting_attendee_finalize (GObject *object) { EMeetingAttendeePrivate *priv; - priv = g_new0 (EMeetingAttendeePrivate, 1); + priv = E_MEETING_ATTENDEE_GET_PRIVATE (object); - ia->priv = priv; + g_free (priv->address); + g_free (priv->member); + g_free (priv->fburi); - priv->address = string_test (NULL); - priv->member = string_test (NULL); + g_free (priv->delto); + g_free (priv->delfrom); - priv->cutype = ICAL_CUTYPE_NONE; - priv->role = ICAL_ROLE_NONE; + g_free (priv->sentby); + g_free (priv->cn); + g_free (priv->language); - priv->rsvp = FALSE; + g_array_free (priv->busy_periods, TRUE); - priv->delto = string_test (NULL); - priv->delfrom = string_test (NULL); + /* Chain up to parent's finalize() method. */ + G_OBJECT_CLASS (e_meeting_attendee_parent_class)->finalize (object); +} - priv->status = ICAL_PARTSTAT_NONE; +static void +e_meeting_attendee_class_init (EMeetingAttendeeClass *class) +{ + GObjectClass *object_class; - priv->sentby = string_test (NULL); - priv->cn = string_test (NULL); - priv->language = string_test (NULL); + g_type_class_add_private (class, sizeof (EMeetingAttendeePrivate)); - priv->edit_level = E_MEETING_ATTENDEE_EDIT_FULL; - priv->has_calendar_info = FALSE; + object_class = G_OBJECT_CLASS (class); + object_class->finalize = e_meeting_attendee_finalize; - priv->busy_periods = g_array_new (FALSE, FALSE, sizeof (EMeetingFreeBusyPeriod)); - priv->busy_periods_sorted = FALSE; + signals[CHANGED] = g_signal_new ( + "changed", + G_TYPE_FROM_CLASS (class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (EMeetingAttendeeClass, changed), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); +} - g_date_clear (&priv->busy_periods_start.date, 1); - priv->busy_periods_start.hour = 0; - priv->busy_periods_start.minute = 0; +static void +e_meeting_attendee_init (EMeetingAttendee *ia) +{ + ia->priv = E_MEETING_ATTENDEE_GET_PRIVATE (ia); - g_date_clear (&priv->busy_periods_end.date, 1); - priv->busy_periods_end.hour = 0; - priv->busy_periods_end.minute = 0; + ia->priv->address = string_test (NULL); + ia->priv->member = string_test (NULL); - priv->start_busy_range_set = FALSE; - priv->end_busy_range_set = FALSE; + ia->priv->cutype = ICAL_CUTYPE_NONE; + ia->priv->role = ICAL_ROLE_NONE; - priv->longest_period_in_days = 0; -} + ia->priv->rsvp = FALSE; -static void -e_meeting_attendee_finalize (GObject *obj) -{ - EMeetingAttendee *ia = E_MEETING_ATTENDEE (obj); - EMeetingAttendeePrivate *priv; + ia->priv->delto = string_test (NULL); + ia->priv->delfrom = string_test (NULL); - priv = ia->priv; + ia->priv->status = ICAL_PARTSTAT_NONE; - g_free (priv->address); - g_free (priv->member); - g_free (priv->fburi); + ia->priv->sentby = string_test (NULL); + ia->priv->cn = string_test (NULL); + ia->priv->language = string_test (NULL); - g_free (priv->delto); - g_free (priv->delfrom); + ia->priv->edit_level = E_MEETING_ATTENDEE_EDIT_FULL; + ia->priv->has_calendar_info = FALSE; - g_free (priv->sentby); - g_free (priv->cn); - g_free (priv->language); + ia->priv->busy_periods = g_array_new (FALSE, FALSE, sizeof (EMeetingFreeBusyPeriod)); + ia->priv->busy_periods_sorted = FALSE; - g_array_free (priv->busy_periods, TRUE); + g_date_clear (&ia->priv->busy_periods_start.date, 1); + ia->priv->busy_periods_start.hour = 0; + ia->priv->busy_periods_start.minute = 0; - g_free (priv); + g_date_clear (&ia->priv->busy_periods_end.date, 1); + ia->priv->busy_periods_end.hour = 0; + ia->priv->busy_periods_end.minute = 0; - /* Chain up to parent's finalize() method. */ - G_OBJECT_CLASS (e_meeting_attendee_parent_class)->finalize (obj); + ia->priv->start_busy_range_set = FALSE; + ia->priv->end_busy_range_set = FALSE; + + ia->priv->longest_period_in_days = 0; } GObject * @@ -899,7 +897,13 @@ e_meeting_attendee_add_busy_period (EMeetingAttendee *ia, priv->busy_periods_end.hour = period.end.hour; priv->busy_periods_end.minute = period.end.minute; } else { - switch (g_date_compare (&period.end.date, &priv->busy_periods_end.date)) { + gint compare; + + compare = g_date_compare ( + &period.end.date, + &priv->busy_periods_end.date); + + switch (compare) { case 0: if (period.end.hour > priv->busy_periods_end.hour || (period.end.hour == priv->busy_periods_end.hour |