From e4c6ad873bd50f7ad99fb8e9bbf5dd6c78ac76ed Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 26 May 2009 08:24:35 -0400 Subject: Fix compiler warnings in calendar. --- calendar/gui/dialogs/cal-prefs-dialog.c | 22 +++++++-------- calendar/gui/dialogs/calendar-setup.c | 42 ++++++++++++++--------------- calendar/gui/dialogs/comp-editor-util.c | 8 ++++-- calendar/gui/dialogs/e-send-options-utils.c | 2 +- calendar/gui/dialogs/e-send-options-utils.h | 2 +- calendar/gui/dialogs/event-page.c | 16 +++++------ calendar/gui/dialogs/task-page.c | 4 +-- 7 files changed, 50 insertions(+), 46 deletions(-) (limited to 'calendar/gui/dialogs') diff --git a/calendar/gui/dialogs/cal-prefs-dialog.c b/calendar/gui/dialogs/cal-prefs-dialog.c index 0e1f0f05d1..b2763ca479 100644 --- a/calendar/gui/dialogs/cal-prefs-dialog.c +++ b/calendar/gui/dialogs/cal-prefs-dialog.c @@ -739,17 +739,17 @@ show_config (CalendarPrefsDialog *prefs) /* plugin meta-data */ static ECalConfigItem eccp_items[] = { - { E_CONFIG_BOOK, "", "toplevel-notebook", eccp_widget_glade }, - { E_CONFIG_PAGE, "00.general", "general", eccp_widget_glade }, - { E_CONFIG_SECTION_TABLE, "00.general/00.time", "time", eccp_widget_glade }, - { E_CONFIG_SECTION_TABLE, "00.general/10.workWeek", "workWeek", eccp_widget_glade }, - { E_CONFIG_SECTION, "00.general/20.alerts", "alerts", eccp_widget_glade }, - { E_CONFIG_PAGE, "10.display", "display", eccp_widget_glade }, - { E_CONFIG_SECTION, "10.display/00.general", "displayGeneral", eccp_widget_glade }, - { E_CONFIG_SECTION, "10.display/10.taskList", "taskList", eccp_widget_glade }, - { E_CONFIG_PAGE, "15.alarms", "alarms", eccp_widget_glade }, - { E_CONFIG_PAGE, "20.freeBusy", "freebusy", eccp_widget_glade }, - { E_CONFIG_SECTION, "20.freeBusy/00.defaultServer", "defaultFBServer", eccp_widget_glade }, + { E_CONFIG_BOOK, (gchar *) "", (gchar *) "toplevel-notebook", eccp_widget_glade }, + { E_CONFIG_PAGE, (gchar *) "00.general", (gchar *) "general", eccp_widget_glade }, + { E_CONFIG_SECTION_TABLE, (gchar *) "00.general/00.time", (gchar *) "time", eccp_widget_glade }, + { E_CONFIG_SECTION_TABLE, (gchar *) "00.general/10.workWeek", (gchar *) "workWeek", eccp_widget_glade }, + { E_CONFIG_SECTION, (gchar *) "00.general/20.alerts", (gchar *) "alerts", eccp_widget_glade }, + { E_CONFIG_PAGE, (gchar *) "10.display", (gchar *) "display", eccp_widget_glade }, + { E_CONFIG_SECTION, (gchar *) "10.display/00.general", (gchar *) "displayGeneral", eccp_widget_glade }, + { E_CONFIG_SECTION, (gchar *) "10.display/10.taskList", (gchar *) "taskList", eccp_widget_glade }, + { E_CONFIG_PAGE, (gchar *) "15.alarms", (gchar *) "alarms", eccp_widget_glade }, + { E_CONFIG_PAGE, (gchar *) "20.freeBusy", (gchar *) "freebusy", eccp_widget_glade }, + { E_CONFIG_SECTION, (gchar *) "20.freeBusy/00.defaultServer", (gchar *) "defaultFBServer", eccp_widget_glade }, }; static void diff --git a/calendar/gui/dialogs/calendar-setup.c b/calendar/gui/dialogs/calendar-setup.c index b182f9cc78..3ee589406b 100644 --- a/calendar/gui/dialogs/calendar-setup.c +++ b/calendar/gui/dialogs/calendar-setup.c @@ -363,35 +363,35 @@ eccp_get_source_color (EConfig *ec, EConfigItem *item, struct _GtkWidget *parent } static ECalConfigItem eccp_items[] = { - { E_CONFIG_BOOK, "", NULL }, - { E_CONFIG_PAGE, "00.general", N_("General") }, - { E_CONFIG_SECTION_TABLE, "00.general/00.source", N_("Calendar") }, - { E_CONFIG_ITEM_TABLE, "00.general/00.source/00.type", NULL, eccp_get_source_type }, - { E_CONFIG_ITEM_TABLE, "00.general/00.source/10.name", NULL, eccp_get_source_name }, - { E_CONFIG_ITEM_TABLE, "00.general/00.source/20.color", NULL, eccp_get_source_color }, - { E_CONFIG_ITEM_TABLE, "00.general/00.source/30.offline", NULL, eccp_general_offline }, + { E_CONFIG_BOOK, (gchar *) "", NULL }, + { E_CONFIG_PAGE, (gchar *) "00.general", (gchar *) N_("General") }, + { E_CONFIG_SECTION_TABLE, (gchar *) "00.general/00.source", (gchar *) N_("Calendar") }, + { E_CONFIG_ITEM_TABLE, (gchar *) "00.general/00.source/00.type", NULL, eccp_get_source_type }, + { E_CONFIG_ITEM_TABLE, (gchar *) "00.general/00.source/10.name", NULL, eccp_get_source_name }, + { E_CONFIG_ITEM_TABLE, (gchar *) "00.general/00.source/20.color", NULL, eccp_get_source_color }, + { E_CONFIG_ITEM_TABLE, (gchar *) "00.general/00.source/30.offline", NULL, eccp_general_offline }, { 0 }, }; static ECalConfigItem ectp_items[] = { - { E_CONFIG_BOOK, "", NULL }, - { E_CONFIG_PAGE, "00.general", N_("General") }, - { E_CONFIG_SECTION_TABLE, "00.general/00.source", N_("Task List") }, - { E_CONFIG_ITEM_TABLE, "00.general/00.source/00.type", NULL, eccp_get_source_type }, - { E_CONFIG_ITEM_TABLE, "00.general/00.source/10.name", NULL, eccp_get_source_name }, - { E_CONFIG_ITEM_TABLE, "00.general/00.source/20.color", NULL, eccp_get_source_color }, - { E_CONFIG_ITEM_TABLE, "00.general/00.source/30.offline", NULL, eccp_general_offline }, + { E_CONFIG_BOOK, (gchar *) "", NULL }, + { E_CONFIG_PAGE, (gchar *) "00.general", (gchar *) N_("General") }, + { E_CONFIG_SECTION_TABLE, (gchar *) "00.general/00.source", (gchar *) N_("Task List") }, + { E_CONFIG_ITEM_TABLE, (gchar *) "00.general/00.source/00.type", NULL, eccp_get_source_type }, + { E_CONFIG_ITEM_TABLE, (gchar *) "00.general/00.source/10.name", NULL, eccp_get_source_name }, + { E_CONFIG_ITEM_TABLE, (gchar *) "00.general/00.source/20.color", NULL, eccp_get_source_color }, + { E_CONFIG_ITEM_TABLE, (gchar *) "00.general/00.source/30.offline", NULL, eccp_general_offline }, { 0 }, }; static ECalConfigItem ecmp_items[] = { - { E_CONFIG_BOOK, "", NULL }, - { E_CONFIG_PAGE, "00.general", N_("General") }, - { E_CONFIG_SECTION_TABLE, "00.general/00.source", N_("Memo List") }, - { E_CONFIG_ITEM_TABLE, "00.general/00.source/00.type", NULL, eccp_get_source_type }, - { E_CONFIG_ITEM_TABLE, "00.general/00.source/10.name", NULL, eccp_get_source_name }, - { E_CONFIG_ITEM_TABLE, "00.general/00.source/20.color", NULL, eccp_get_source_color }, - { E_CONFIG_ITEM_TABLE, "00.general/00.source/30.offline", NULL, eccp_general_offline }, + { E_CONFIG_BOOK, (gchar *) "", NULL }, + { E_CONFIG_PAGE, (gchar *) "00.general", (gchar *) N_("General") }, + { E_CONFIG_SECTION_TABLE, (gchar *) "00.general/00.source", (gchar *) N_("Memo List") }, + { E_CONFIG_ITEM_TABLE, (gchar *) "00.general/00.source/00.type", NULL, eccp_get_source_type }, + { E_CONFIG_ITEM_TABLE, (gchar *) "00.general/00.source/10.name", NULL, eccp_get_source_name }, + { E_CONFIG_ITEM_TABLE, (gchar *) "00.general/00.source/20.color", NULL, eccp_get_source_color }, + { E_CONFIG_ITEM_TABLE, (gchar *) "00.general/00.source/30.offline", NULL, eccp_general_offline }, { 0 }, }; diff --git a/calendar/gui/dialogs/comp-editor-util.c b/calendar/gui/dialogs/comp-editor-util.c index 6547731776..f09024eba0 100644 --- a/calendar/gui/dialogs/comp-editor-util.c +++ b/calendar/gui/dialogs/comp-editor-util.c @@ -112,8 +112,12 @@ comp_editor_free_dates (CompEditorPageDates *dates) /* dtstart is only passed in if tt is the dtend. */ static void -write_label_piece (struct icaltimetype *tt, char *buffer, int size, - char *stext, char *etext, struct icaltimetype *dtstart) +write_label_piece (struct icaltimetype *tt, + gchar *buffer, + gint size, + gchar *stext, + const gchar *etext, + struct icaltimetype *dtstart) { struct tm tmp_tm = { 0 }; struct icaltimetype tt_copy = *tt; diff --git a/calendar/gui/dialogs/e-send-options-utils.c b/calendar/gui/dialogs/e-send-options-utils.c index 52f73aed02..d9a55ac47a 100644 --- a/calendar/gui/dialogs/e-send-options-utils.c +++ b/calendar/gui/dialogs/e-send-options-utils.c @@ -28,7 +28,7 @@ #include void -e_sendoptions_utils_set_default_data (ESendOptionsDialog *sod, ESource *source, char * type) +e_sendoptions_utils_set_default_data (ESendOptionsDialog *sod, ESource *source, const gchar *type) { ESendOptionsGeneral *gopts = NULL; ESendOptionsStatusTracking *sopts; diff --git a/calendar/gui/dialogs/e-send-options-utils.h b/calendar/gui/dialogs/e-send-options-utils.h index cae3131c00..568ef5be3b 100644 --- a/calendar/gui/dialogs/e-send-options-utils.h +++ b/calendar/gui/dialogs/e-send-options-utils.h @@ -29,6 +29,6 @@ #include #include -void e_sendoptions_utils_set_default_data (ESendOptionsDialog *sod, ESource *source, char* type); +void e_sendoptions_utils_set_default_data (ESendOptionsDialog *sod, ESource *source, const gchar *type); void e_sendoptions_utils_fill_component (ESendOptionsDialog *sod, ECalComponent *comp); #endif diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c index cd54c65c08..b225cdd6bd 100644 --- a/calendar/gui/dialogs/event-page.c +++ b/calendar/gui/dialogs/event-page.c @@ -1584,20 +1584,20 @@ void update_end_time_combo (EventPage *epage) gtk_spin_button_set_value (GTK_SPIN_BUTTON (priv->minute_selector), minutes); } -void -static hour_sel_changed (GtkSpinButton *widget, EventPage *epage) +static void +hour_sel_changed (GtkSpinButton *widget, EventPage *epage) { hour_minute_changed (epage); } -void -static minute_sel_changed (GtkSpinButton *widget, EventPage *epage) +static void +minute_sel_changed (GtkSpinButton *widget, EventPage *epage) { hour_minute_changed (epage); } -void -static hour_minute_changed ( EventPage *epage) +static void +hour_minute_changed (EventPage *epage) { EventPagePrivate *priv; gint for_hours, for_minutes; @@ -1889,8 +1889,8 @@ enum { }; static EPopupItem context_menu_items[] = { - { E_POPUP_ITEM, "10.delete", N_("_Remove"), popup_delete_cb, NULL, GTK_STOCK_REMOVE, ATTENDEE_CAN_DELETE }, - { E_POPUP_ITEM, "15.add", N_("_Add "), popup_add_cb, NULL, GTK_STOCK_ADD, ATTENDEE_CAN_ADD }, + { E_POPUP_ITEM, (gchar *) "10.delete", (gchar *) N_("_Remove"), popup_delete_cb, NULL, (gchar *) GTK_STOCK_REMOVE, ATTENDEE_CAN_DELETE }, + { E_POPUP_ITEM, (gchar *) "15.add", (gchar *) N_("_Add "), popup_add_cb, NULL, (gchar *) GTK_STOCK_ADD, ATTENDEE_CAN_ADD }, }; static void diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c index fc0c2330bf..f371e60cdb 100644 --- a/calendar/gui/dialogs/task-page.c +++ b/calendar/gui/dialogs/task-page.c @@ -1199,8 +1199,8 @@ enum { }; static EPopupItem context_menu_items[] = { - { E_POPUP_ITEM, "10.delete", N_("_Remove"), popup_delete_cb, NULL, GTK_STOCK_REMOVE, ATTENDEE_CAN_DELETE }, - { E_POPUP_ITEM, "15.add", N_("_Add "), popup_add_cb, NULL, GTK_STOCK_ADD, ATTENDEE_CAN_ADD }, + { E_POPUP_ITEM, (gchar *) "10.delete", (gchar *) N_("_Remove"), popup_delete_cb, NULL, (gchar *) GTK_STOCK_REMOVE, ATTENDEE_CAN_DELETE }, + { E_POPUP_ITEM, (gchar *) "15.add", (gchar *) N_("_Add "), popup_add_cb, NULL, (gchar *) GTK_STOCK_ADD, ATTENDEE_CAN_ADD }, }; static void -- cgit v1.2.3