From 96538878911586a9e9ca26b81e1916c04e538980 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 25 May 2010 10:15:32 -0400 Subject: Coding style and whitespace cleanup. --- calendar/gui/alarm-notify/alarm-queue.c | 8 ++++---- calendar/gui/dialogs/cal-prefs-dialog.c | 2 +- calendar/gui/dialogs/comp-editor-util.c | 20 +++++++++++++++----- calendar/gui/dialogs/comp-editor.c | 2 +- calendar/gui/dialogs/event-editor.c | 2 +- calendar/gui/dialogs/event-page.c | 9 +++------ calendar/gui/dialogs/event-page.h | 4 ++-- calendar/gui/gnome-cal.c | 2 -- 8 files changed, 27 insertions(+), 22 deletions(-) (limited to 'calendar/gui') diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c index ae6eb3e172..ffa3d4b1f2 100644 --- a/calendar/gui/alarm-notify/alarm-queue.c +++ b/calendar/gui/alarm-notify/alarm-queue.c @@ -187,12 +187,12 @@ message_push (Message *msg) * use a static ring-buffer so we can call this twice * in a printf without getting nonsense results. */ -static const char * +static const gchar * e_ctime (const time_t *timep) { - static char *buffer[4] = { 0, }; - static int next = 0; - const char *ret; + static gchar *buffer[4] = { 0, }; + static gint next = 0; + const gchar *ret; g_free (buffer[next]); ret = buffer[next++] = g_strdup (ctime (timep)); diff --git a/calendar/gui/dialogs/cal-prefs-dialog.c b/calendar/gui/dialogs/cal-prefs-dialog.c index e925838e58..f6ba176d00 100644 --- a/calendar/gui/dialogs/cal-prefs-dialog.c +++ b/calendar/gui/dialogs/cal-prefs-dialog.c @@ -806,7 +806,7 @@ calendar_prefs_dialog_construct (CalendarPrefsDialog *prefs, } /* Hook up and add the toplevel widget */ - + target = e_cal_config_target_new_prefs (ec, prefs->gconf); e_config_set_target ((EConfig *)ec, (EConfigTarget *) target); toplevel = e_config_create_widget ((EConfig *)ec); diff --git a/calendar/gui/dialogs/comp-editor-util.c b/calendar/gui/dialogs/comp-editor-util.c index cd16b46974..9f96011eda 100644 --- a/calendar/gui/dialogs/comp-editor-util.c +++ b/calendar/gui/dialogs/comp-editor-util.c @@ -390,7 +390,9 @@ free_slist_strs (gpointer data) * @note The list is just string of emails separated by ';' **/ void -comp_editor_manage_new_attendees (ECalComponent *comp, EMeetingAttendee *ma, gboolean add) +comp_editor_manage_new_attendees (ECalComponent *comp, + EMeetingAttendee *ma, + gboolean add) { const gchar *eml; @@ -402,7 +404,11 @@ comp_editor_manage_new_attendees (ECalComponent *comp, EMeetingAttendee *ma, gbo eml = itip_strip_mailto (eml); g_return_if_fail (eml != NULL); - g_object_set_data_full (G_OBJECT (comp), "new-attendees", manage_new_attendees (g_object_get_data (G_OBJECT (comp), "new-attendees"), eml, add), free_slist_strs); + g_object_set_data_full ( + G_OBJECT (comp), "new-attendees", + manage_new_attendees ( + g_object_get_data (G_OBJECT (comp), "new-attendees"), + eml, add), free_slist_strs); } /** @@ -445,15 +451,19 @@ comp_editor_have_in_new_attendees (ECalComponent *comp, EMeetingAttendee *ma) eml = itip_strip_mailto (eml); g_return_val_if_fail (eml != NULL, FALSE); - return comp_editor_have_in_new_attendees_lst (g_object_get_data (G_OBJECT (comp), "new-attendees"), eml); + return comp_editor_have_in_new_attendees_lst ( + g_object_get_data (G_OBJECT (comp), "new-attendees"), eml); } /** * comp_editor_have_in_new_attendees_lst: - * Same as @ref comp_editor_have_in_new_attendees only parameters are direct GSList and string. + * + * Same as comp_editor_have_in_new_attendees() only parameters are + * direct GSList and string. **/ gboolean -comp_editor_have_in_new_attendees_lst (const GSList *new_attendees, const gchar *eml) +comp_editor_have_in_new_attendees_lst (const GSList *new_attendees, + const gchar *eml) { const GSList *l; diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c index 91d9f1e202..062e483562 100644 --- a/calendar/gui/dialogs/comp-editor.c +++ b/calendar/gui/dialogs/comp-editor.c @@ -2314,7 +2314,7 @@ comp_editor_append_widget (CompEditor *editor, gtk_notebook_append_page (priv->notebook, page, label_widget); /* Listen for when the page is mapped/unmapped so we can - install/uninstall the appropriate GtkAccelGroup. + install/uninstall the appropriate GtkAccelGroup. g_signal_connect ( page, "map", G_CALLBACK (page_mapped_cb), page); diff --git a/calendar/gui/dialogs/event-editor.c b/calendar/gui/dialogs/event-editor.c index 1ae9595c02..7184a63d9e 100644 --- a/calendar/gui/dialogs/event-editor.c +++ b/calendar/gui/dialogs/event-editor.c @@ -345,7 +345,7 @@ event_editor_constructor (GType type, alarm_page = event_page_get_alarm_page (priv->event_page); comp_editor_append_widget (editor, alarm_page, _("_Alarm"), TRUE); g_object_unref(alarm_page); - + } if (is_meeting) { diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c index 74d6af4c4b..f37861827d 100644 --- a/calendar/gui/dialogs/event-page.c +++ b/calendar/gui/dialogs/event-page.c @@ -2238,7 +2238,6 @@ get_widgets (EventPage *epage) priv->source_selector = GW ("source"); - e_util_set_source_combo_box_list (priv->source_selector, "/apps/evolution/calendar/sources"); completion = e_category_completion_new (); @@ -3257,7 +3256,6 @@ event_page_remove_all_attendees (EventPage *epage) e_meeting_list_view_remove_all_attendees_from_name_selector (E_MEETING_LIST_VIEW (priv->list_view)); } - GtkWidget * event_page_get_alarm_page (EventPage *epage) { @@ -3275,7 +3273,7 @@ event_page_get_alarm_page (EventPage *epage) gtk_container_remove ((GtkContainer *)tmp, alarm_page); return alarm_page; -} +} GtkWidget * event_page_get_attendee_page (EventPage *epage) @@ -3287,14 +3285,13 @@ event_page_get_attendee_page (EventPage *epage) g_return_val_if_fail (IS_EVENT_PAGE (epage), NULL); priv = epage->priv; - + apage = priv->list_box; g_object_ref(apage); gtk_container_remove ((GtkContainer *)gtk_widget_get_parent(apage), apage); gtk_widget_hide (priv->attendee_box); return apage; -} - +} #undef GW diff --git a/calendar/gui/dialogs/event-page.h b/calendar/gui/dialogs/event-page.h index a4513e4c68..afa191e9c1 100644 --- a/calendar/gui/dialogs/event-page.h +++ b/calendar/gui/dialogs/event-page.h @@ -109,8 +109,8 @@ ENameSelector * event_page_get_name_selector (EventPage *epage); void event_page_add_attendee (EventPage *epage, EMeetingAttendee *attendee); void event_page_remove_all_attendees (EventPage *epage); -GtkWidget * event_page_get_alarm_page (EventPage *epage); -GtkWidget * event_page_get_attendee_page (EventPage *epage); +GtkWidget * event_page_get_alarm_page (EventPage *epage); +GtkWidget * event_page_get_attendee_page (EventPage *epage); G_END_DECLS diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c index aa64c74564..f22e70efc7 100644 --- a/calendar/gui/gnome-cal.c +++ b/calendar/gui/gnome-cal.c @@ -1005,7 +1005,6 @@ struct _date_query_msg { GnomeCalendar *gcal; }; - static void free_dn_queries (GnomeCalendar *gcal) { @@ -1453,7 +1452,6 @@ gnome_calendar_do_dispose (GObject *object) gcal = GNOME_CALENDAR (object); priv = gcal->priv; - if (priv->model != NULL) { g_signal_handlers_disconnect_by_func ( priv->model, view_progress_cb, gcal); -- cgit v1.2.3