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/alarm-notify/alarm-notify.c | 3 ++- calendar/gui/alarm-notify/alarm.c | 1 - calendar/gui/alarm-notify/alarm.h | 1 - calendar/gui/calendar-config.c | 2 +- calendar/gui/calendar-view-factory.c | 1 - calendar/gui/calendar-view.c | 1 - calendar/gui/comp-util.c | 1 - calendar/gui/dialogs/alarm-dialog.c | 1 - calendar/gui/dialogs/alarm-list-dialog.c | 1 - calendar/gui/dialogs/cancel-comp.c | 1 - calendar/gui/dialogs/changed-comp.c | 1 - calendar/gui/dialogs/comp-editor-util.c | 1 - calendar/gui/dialogs/delete-comp.c | 1 - calendar/gui/dialogs/delete-error.c | 1 - calendar/gui/dialogs/recur-comp.c | 1 - calendar/gui/dialogs/send-comp.c | 1 - calendar/gui/e-day-view-time-item.c | 2 +- calendar/gui/itip-utils.c | 10 +++++----- 18 files changed, 9 insertions(+), 22 deletions(-) (limited to 'calendar/gui') diff --git a/calendar/gui/alarm-notify/alarm-notify.c b/calendar/gui/alarm-notify/alarm-notify.c index 4f04974b33..eeca88e1b6 100644 --- a/calendar/gui/alarm-notify/alarm-notify.c +++ b/calendar/gui/alarm-notify/alarm-notify.c @@ -106,7 +106,8 @@ process_removal_in_hash (const gchar *uri, } static gint -find_slist_source_uri_cb (gconstpointer a, gconstpointer b) +find_slist_source_uri_cb (gconstpointer a, + gconstpointer b) { ESource *asource = (ESource *) a; const gchar *buri = b; diff --git a/calendar/gui/alarm-notify/alarm.c b/calendar/gui/alarm-notify/alarm.c index a05498532b..2797d44b0a 100644 --- a/calendar/gui/alarm-notify/alarm.c +++ b/calendar/gui/alarm-notify/alarm.c @@ -36,7 +36,6 @@ #include "alarm.h" #include "config-data.h" - /* Our glib timeout */ static guint timeout_id; diff --git a/calendar/gui/alarm-notify/alarm.h b/calendar/gui/alarm-notify/alarm.h index 54a6e4c720..d6e9ff4a4e 100644 --- a/calendar/gui/alarm-notify/alarm.h +++ b/calendar/gui/alarm-notify/alarm.h @@ -29,7 +29,6 @@ #include #include - typedef void (* AlarmFunction) (gpointer alarm_id, time_t trigger, gpointer data); typedef void (* AlarmDestroyNotify) (gpointer alarm_id, gpointer data); diff --git a/calendar/gui/calendar-config.c b/calendar/gui/calendar-config.c index 15df6920ae..39431549dd 100644 --- a/calendar/gui/calendar-config.c +++ b/calendar/gui/calendar-config.c @@ -62,7 +62,7 @@ calendar_config_init (void) void calendar_config_remove_notification (CalendarConfigChangedFunc func, - gpointer data) + gpointer data) { calendar_config_init (); diff --git a/calendar/gui/calendar-view-factory.c b/calendar/gui/calendar-view-factory.c index 4c92d6d8fc..8342475620 100644 --- a/calendar/gui/calendar-view-factory.c +++ b/calendar/gui/calendar-view-factory.c @@ -30,7 +30,6 @@ #include "calendar-view-factory.h" #include "calendar-view.h" - /* Private part of the CalendarViewFactory structure */ struct _CalendarViewFactoryPrivate { /* Type of views created by this factory */ diff --git a/calendar/gui/calendar-view.c b/calendar/gui/calendar-view.c index d238daf3df..6f9f2951f3 100644 --- a/calendar/gui/calendar-view.c +++ b/calendar/gui/calendar-view.c @@ -28,7 +28,6 @@ #include "calendar-view.h" - /* Private part of the CalendarView structure */ struct _CalendarViewPrivate { /* Type of the view */ diff --git a/calendar/gui/comp-util.c b/calendar/gui/comp-util.c index 8bb5500f23..f768335c3c 100644 --- a/calendar/gui/comp-util.c +++ b/calendar/gui/comp-util.c @@ -39,7 +39,6 @@ #include "shell/e-shell-window.h" #include "shell/e-shell-view.h" - /** * cal_comp_util_add_exdate: * @comp: A calendar component object. diff --git a/calendar/gui/dialogs/alarm-dialog.c b/calendar/gui/dialogs/alarm-dialog.c index 4576f3df6f..1c76c79d83 100644 --- a/calendar/gui/dialogs/alarm-dialog.c +++ b/calendar/gui/dialogs/alarm-dialog.c @@ -45,7 +45,6 @@ #include "comp-editor-util.h" #include "alarm-dialog.h" - typedef struct { GtkBuilder *builder; diff --git a/calendar/gui/dialogs/alarm-list-dialog.c b/calendar/gui/dialogs/alarm-list-dialog.c index 4fb5884026..065e865f92 100644 --- a/calendar/gui/dialogs/alarm-list-dialog.c +++ b/calendar/gui/dialogs/alarm-list-dialog.c @@ -42,7 +42,6 @@ #include "alarm-dialog.h" #include "alarm-list-dialog.h" - typedef struct { GtkBuilder *builder; diff --git a/calendar/gui/dialogs/cancel-comp.c b/calendar/gui/dialogs/cancel-comp.c index c5caa9371d..1bb37acf4b 100644 --- a/calendar/gui/dialogs/cancel-comp.c +++ b/calendar/gui/dialogs/cancel-comp.c @@ -31,7 +31,6 @@ #include "e-util/e-alert-dialog.h" #include "cancel-comp.h" - /* is_past_event: * * returns TRUE if @comp is in the past, FALSE otherwise. diff --git a/calendar/gui/dialogs/changed-comp.c b/calendar/gui/dialogs/changed-comp.c index bc25188f5d..f8a98c9908 100644 --- a/calendar/gui/dialogs/changed-comp.c +++ b/calendar/gui/dialogs/changed-comp.c @@ -29,7 +29,6 @@ #include #include "changed-comp.h" - /** * changed_component_dialog: * @parent: Parent window for the dialog. 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 diff --git a/calendar/gui/dialogs/delete-comp.c b/calendar/gui/dialogs/delete-comp.c index 44c133afbe..87330ed0dd 100644 --- a/calendar/gui/dialogs/delete-comp.c +++ b/calendar/gui/dialogs/delete-comp.c @@ -30,7 +30,6 @@ #include "e-util/e-alert-dialog.h" #include "delete-comp.h" - /** * delete_component_dialog: * @comp: A calendar component if a single component is to be deleted, or NULL diff --git a/calendar/gui/dialogs/delete-error.c b/calendar/gui/dialogs/delete-error.c index a68fed8e1d..7dc53253fa 100644 --- a/calendar/gui/dialogs/delete-error.c +++ b/calendar/gui/dialogs/delete-error.c @@ -30,7 +30,6 @@ #include #include "delete-error.h" - /** * delete_error_dialog: * diff --git a/calendar/gui/dialogs/recur-comp.c b/calendar/gui/dialogs/recur-comp.c index 9652553ee3..434d552a40 100644 --- a/calendar/gui/dialogs/recur-comp.c +++ b/calendar/gui/dialogs/recur-comp.c @@ -29,7 +29,6 @@ #include #include "recur-comp.h" - gboolean recur_component_dialog (ECalClient *client, ECalComponent *comp, diff --git a/calendar/gui/dialogs/send-comp.c b/calendar/gui/dialogs/send-comp.c index 524f4c8097..4e5e1668c1 100644 --- a/calendar/gui/dialogs/send-comp.c +++ b/calendar/gui/dialogs/send-comp.c @@ -30,7 +30,6 @@ #include "e-util/e-alert-dialog.h" #include "send-comp.h" - static gboolean component_has_new_attendees (ECalComponent *comp) { diff --git a/calendar/gui/e-day-view-time-item.c b/calendar/gui/e-day-view-time-item.c index c901b82013..9b61f11649 100644 --- a/calendar/gui/e-day-view-time-item.c +++ b/calendar/gui/e-day-view-time-item.c @@ -729,7 +729,7 @@ e_day_view_time_item_event (GnomeCanvasItem *item, static void edvti_second_zone_changed_cb (GSettings *settings, - const gchar *key, + const gchar *key, gpointer user_data) { EDayViewTimeItem *time_item = user_data; diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c index 187757cece..4b2a8d262d 100644 --- a/calendar/gui/itip-utils.c +++ b/calendar/gui/itip-utils.c @@ -577,11 +577,11 @@ comp_to_list (ECalComponentItipMethod method, ECalComponentAttendee *att = l->data; /* Bugfix: 688711 - Varadhan - Resource is also considered as a "attendee". If the respective backend - is able to successfully book resources automagically, it will appear - in the users list and thereby won't get added to the list of destinations - to send the meeting invite, otherwise, as a safety measure, a meeting - invite will be sent to the resources as well. */ + * Resource is also considered as a "attendee". If the respective backend + * is able to successfully book resources automagically, it will appear + * in the users list and thereby won't get added to the list of destinations + * to send the meeting invite, otherwise, as a safety measure, a meeting + * invite will be sent to the resources as well. */ if (att->cutype != ICAL_CUTYPE_INDIVIDUAL && att->cutype != ICAL_CUTYPE_GROUP && att->cutype != ICAL_CUTYPE_RESOURCE) -- cgit v1.2.3