From b32649a94cd485f742d2ad5f1b76d7385393e137 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 10 Oct 2007 04:54:36 +0000 Subject: ** Fixes bug #437579 2007-10-09 Matthew Barnes ** Fixes bug #437579 * addressbook/conduit/address-conduit.c: * addressbook/gui/component/addressbook-config.c: * addressbook/gui/contact-editor/e-contact-editor.c: * addressbook/gui/widgets/eab-gui-util.c: * calendar/conduits/calendar/calendar-conduit.c: * calendar/conduits/memo/memo-conduit.c: * calendar/conduits/todo/todo-conduit.c: * calendar/gui/dialogs/alarm-dialog.c: * calendar/gui/dialogs/event-page.c: * calendar/gui/dialogs/memo-page.c: * calendar/gui/dialogs/task-page.c: * calendar/gui/e-day-view-layout.c: * calendar/gui/e-day-view-layout.h: * calendar/gui/print.c: * e-util/e-pilot-map.c: * e-util/e-plugin.c: * e-util/e-profile-event.c: * e-util/e-signature.c: * filter/filter-file.c: * mail/e-searching-tokenizer.c: * mail/em-folder-browser.c: * mail/em-format-html.c: * mail/em-format-view.c: * mail/em-format.c: * mail/em-mailer-prefs.c: * mail/em-mailer-prefs.h: * mail/mail-session.c: * mail/mail-session.h: * mail/mail-vfolder.c: * mail/message-list.c: * plugins/bbdb/bbdb.c: * plugins/bbdb/gaimbuddies.c: * plugins/calendar-http/calendar-http.c: * plugins/exchange-operations/exchange-user-dialog.c: * plugins/face/face.c: * shell/e-shell-window.c: * shell/e-shell.c: * smime/lib/e-cert-db.c: * tools/killev.c: * widgets/misc/e-cursors.c: * widgets/misc/e-spinner.c: * widgets/misc/e-unicode.c: * widgets/table/e-table-field-chooser-item.c: * widgets/table/e-table-header-item.c: * widgets/table/e-table-header-item.h: * widgets/table/e-table-header-utils.c: * widgets/table/e-table.c: * widgets/text/e-text.c: Fix various compiler warnings. Patch from Milan Crha. svn path=/trunk/; revision=34368 --- calendar/ChangeLog | 16 ++++++++++++++++ calendar/conduits/calendar/calendar-conduit.c | 13 ++++++++----- calendar/conduits/memo/memo-conduit.c | 13 ++++++++----- calendar/conduits/todo/todo-conduit.c | 10 ++++++---- calendar/gui/dialogs/alarm-dialog.c | 4 ++++ calendar/gui/dialogs/event-page.c | 2 +- calendar/gui/dialogs/memo-page.c | 2 +- calendar/gui/dialogs/task-page.c | 2 +- calendar/gui/e-day-view-layout.c | 14 +++++++------- calendar/gui/e-day-view-layout.h | 2 +- calendar/gui/print.c | 9 +++++++-- 11 files changed, 60 insertions(+), 27 deletions(-) (limited to 'calendar') diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 3ec4134432..00861a8ead 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,19 @@ +2007-10-09 Matthew Barnes + + ** Fixes part of bug #437579 + + * conduits/calendar/calendar-conduit.c: + * conduits/memo/memo-conduit.c: + * conduits/todo/todo-conduit.c: + * gui/dialogs/alarm-dialog.c: + * gui/dialogs/event-page.c: + * gui/dialogs/memo-page.c: + * gui/dialogs/task-page.c: + * gui/e-day-view-layout.c: + * gui/e-day-view-layout.h: + * gui/print.c: + Fix various compiler warnings. Patch from Milan Crha. + 2007-10-09 Milan Crha ** Fix for bug #324526 diff --git a/calendar/conduits/calendar/calendar-conduit.c b/calendar/conduits/calendar/calendar-conduit.c index f18480007c..f423b56254 100644 --- a/calendar/conduits/calendar/calendar-conduit.c +++ b/calendar/conduits/calendar/calendar-conduit.c @@ -834,9 +834,10 @@ local_record_to_pilot_record (ECalLocalRecord *local, ECalConduitContext *ctxt) { GnomePilotRecord p; - static char record[0xffff]; #ifdef PILOT_LINK_0_12 pi_buffer_t * buffer; +#else + static char record[0xffff]; #endif g_assert (local->comp != NULL); @@ -1729,6 +1730,7 @@ for_each (GnomePilotConduitSyncAbs *conduit, { static GList *comps, *iterator; static int count; + GList *unused; g_return_val_if_fail (local != NULL, -1); @@ -1747,7 +1749,7 @@ for_each (GnomePilotConduitSyncAbs *conduit, /* NOTE: ignore the return value, otherwise ctxt->locals * gets messed up. The calling function keeps track of * the *local variable */ - g_list_prepend (ctxt->locals, *local); + unused = g_list_prepend (ctxt->locals, *local); iterator = comps; } else { @@ -1766,7 +1768,7 @@ for_each (GnomePilotConduitSyncAbs *conduit, /* NOTE: ignore the return value, otherwise ctxt->locals * gets messed up. The calling function keeps track of * the *local variable */ - g_list_prepend (ctxt->locals, *local); + unused = g_list_prepend (ctxt->locals, *local); } else { LOG (g_message ( "for_each ending" )); @@ -1787,6 +1789,7 @@ for_each_modified (GnomePilotConduitSyncAbs *conduit, { static GList *iterator; static int count; + GList *unused; g_return_val_if_fail (local != NULL, -1); @@ -1809,7 +1812,7 @@ for_each_modified (GnomePilotConduitSyncAbs *conduit, /* NOTE: ignore the return value, otherwise ctxt->locals * gets messed up. The calling function keeps track of * the *local variable */ - g_list_prepend (ctxt->locals, *local); + unused = g_list_prepend (ctxt->locals, *local); } else { LOG (g_message ( "no events" )); @@ -1827,7 +1830,7 @@ for_each_modified (GnomePilotConduitSyncAbs *conduit, /* NOTE: ignore the return value, otherwise ctxt->locals * gets messed up. The calling function keeps track of * the *local variable */ - g_list_prepend (ctxt->locals, *local); + unused = g_list_prepend (ctxt->locals, *local); } else { LOG (g_message ( "for_each_modified ending" )); diff --git a/calendar/conduits/memo/memo-conduit.c b/calendar/conduits/memo/memo-conduit.c index 6c6fcaa120..8c43da6a38 100644 --- a/calendar/conduits/memo/memo-conduit.c +++ b/calendar/conduits/memo/memo-conduit.c @@ -467,9 +467,10 @@ local_record_to_pilot_record (EMemoLocalRecord *local, EMemoConduitContext *ctxt) { GnomePilotRecord p; - static char record[0xffff]; #ifdef PILOT_LINK_0_12 pi_buffer_t * buffer; +#else + static char record[0xffff]; #endif g_assert (local->comp != NULL); @@ -1020,6 +1021,7 @@ for_each (GnomePilotConduitSyncAbs *conduit, { static GList *comps, *iterator; static int count; + GList *unused; g_return_val_if_fail (local != NULL, -1); @@ -1038,7 +1040,7 @@ for_each (GnomePilotConduitSyncAbs *conduit, /* NOTE: ignore the return value, otherwise ctxt->locals * gets messed up. The calling function keeps track of * the *local variable */ - g_list_prepend (ctxt->locals, *local); + unused = g_list_prepend (ctxt->locals, *local); iterator = comps; } else { LOG (g_message ( "no events" )); @@ -1058,7 +1060,7 @@ for_each (GnomePilotConduitSyncAbs *conduit, /* NOTE: ignore the return value, otherwise ctxt->locals * gets messed up. The calling function keeps track of * the *local variable */ - g_list_prepend (ctxt->locals, *local); + unused = g_list_prepend (ctxt->locals, *local); } else { LOG (g_message ( "for_each ending" )); @@ -1079,6 +1081,7 @@ for_each_modified (GnomePilotConduitSyncAbs *conduit, { static GList *iterator; static int count; + GList *unused; g_return_val_if_fail (local != NULL, 0); @@ -1101,7 +1104,7 @@ for_each_modified (GnomePilotConduitSyncAbs *conduit, /* NOTE: ignore the return value, otherwise ctxt->locals * gets messed up. The calling function keeps track of * the *local variable */ - g_list_prepend (ctxt->locals, *local); + unused = g_list_prepend (ctxt->locals, *local); } else { LOG (g_message ( "no events" )); @@ -1120,7 +1123,7 @@ for_each_modified (GnomePilotConduitSyncAbs *conduit, /* NOTE: ignore the return value, otherwise ctxt->locals * gets messed up. The calling function keeps track of * the *local variable */ - g_list_prepend (ctxt->locals, *local); + unused = g_list_prepend (ctxt->locals, *local); } else { LOG (g_message ( "for_each_modified ending" )); diff --git a/calendar/conduits/todo/todo-conduit.c b/calendar/conduits/todo/todo-conduit.c index 315c59c064..7ae7b32d2f 100644 --- a/calendar/conduits/todo/todo-conduit.c +++ b/calendar/conduits/todo/todo-conduit.c @@ -1207,6 +1207,7 @@ for_each (GnomePilotConduitSyncAbs *conduit, { static GList *comps, *iterator; static int count; + GList *unused; g_return_val_if_fail (local != NULL, -1); @@ -1225,7 +1226,7 @@ for_each (GnomePilotConduitSyncAbs *conduit, /* NOTE: ignore the return value, otherwise ctxt->locals * gets messed up. The calling function keeps track of * the *local variable */ - g_list_prepend (ctxt->locals, *local); + unused = g_list_prepend (ctxt->locals, *local); iterator = comps; } else { @@ -1244,7 +1245,7 @@ for_each (GnomePilotConduitSyncAbs *conduit, /* NOTE: ignore the return value, otherwise ctxt->locals * gets messed up. The calling function keeps track of * the *local variable */ - g_list_prepend (ctxt->locals, *local); + unused = g_list_prepend (ctxt->locals, *local); } else { LOG (g_message ( "for_each ending" )); @@ -1265,6 +1266,7 @@ for_each_modified (GnomePilotConduitSyncAbs *conduit, { static GList *iterator; static int count; + GList *unused; g_return_val_if_fail (local != NULL, 0); @@ -1287,7 +1289,7 @@ for_each_modified (GnomePilotConduitSyncAbs *conduit, /* NOTE: ignore the return value, otherwise ctxt->locals * gets messed up. The calling function keeps track of * the *local variable */ - g_list_prepend (ctxt->locals, *local); + unused = g_list_prepend (ctxt->locals, *local); } else { LOG (g_message ( "no events" )); @@ -1305,7 +1307,7 @@ for_each_modified (GnomePilotConduitSyncAbs *conduit, /* NOTE: ignore the return value, otherwise ctxt->locals * gets messed up. The calling function keeps track of * the *local variable */ - g_list_prepend (ctxt->locals, *local); + unused = g_list_prepend (ctxt->locals, *local); } else { LOG (g_message ( "for_each_modified ending" )); diff --git a/calendar/gui/dialogs/alarm-dialog.c b/calendar/gui/dialogs/alarm-dialog.c index 7755cc3b17..34d5a8e3a2 100644 --- a/calendar/gui/dialogs/alarm-dialog.c +++ b/calendar/gui/dialogs/alarm-dialog.c @@ -624,6 +624,8 @@ populate_widgets_from_alarm (Dialog *dialog) case E_CAL_COMPONENT_ALARM_TRIGGER_RELATIVE_END: e_dialog_option_menu_set (dialog->time, E_CAL_COMPONENT_ALARM_TRIGGER_RELATIVE_END, time_map); break; + default: + g_warning ("%s: Unexpected alarm type (%d)", G_STRLOC, trigger->type); } switch ( trigger->u.rel_duration.is_neg ){ @@ -674,6 +676,8 @@ populate_widgets_from_alarm (Dialog *dialog) case E_CAL_COMPONENT_ALARM_PROCEDURE: alarm_to_palarm_widgets (dialog, dialog->alarm); break; + default: + g_warning ("%s: Unexpected alarm action (%d)", G_STRLOC, *action); } } diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c index 9562675f6a..f43640c264 100644 --- a/calendar/gui/dialogs/event-page.c +++ b/calendar/gui/dialogs/event-page.c @@ -3147,7 +3147,7 @@ event_page_select_organizer (EventPage *epage, const char *backend_address) EventPagePrivate *priv; GList *l; EAccount *def_account; - const char *def_address = NULL; + gchar *def_address = NULL; gboolean subscribed_cal = FALSE; ESource *source = NULL; const char *user_addr = NULL; diff --git a/calendar/gui/dialogs/memo-page.c b/calendar/gui/dialogs/memo-page.c index ac94a0ccf8..fb6ce991d1 100644 --- a/calendar/gui/dialogs/memo-page.c +++ b/calendar/gui/dialogs/memo-page.c @@ -1112,7 +1112,7 @@ memo_page_select_organizer (MemoPage *mpage, const char *backend_address) MemoPagePrivate *priv; GList *l; EAccount *def_account; - const char *def_address; + gchar *def_address; gboolean subscribed_cal = FALSE; ESource *source = NULL; const char *user_addr = NULL; diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c index 33a32bbd54..5a6d685524 100644 --- a/calendar/gui/dialogs/task-page.c +++ b/calendar/gui/dialogs/task-page.c @@ -1913,7 +1913,7 @@ task_page_select_organizer (TaskPage *tpage, const char *backend_address) TaskPagePrivate *priv; GList *l; EAccount *def_account; - const char *def_address = NULL; + gchar *def_address = NULL; gboolean subscribed_cal = FALSE; ESource *source = NULL; const char *user_addr = NULL; diff --git a/calendar/gui/e-day-view-layout.c b/calendar/gui/e-day-view-layout.c index 8182e74c0a..4536d67952 100644 --- a/calendar/gui/e-day-view-layout.c +++ b/calendar/gui/e-day-view-layout.c @@ -39,15 +39,15 @@ static void e_day_view_layout_long_event (EDayViewEvent *event, static void e_day_view_layout_day_event (EDayViewEvent *event, guint8 *grid, guint16 *group_starts, - gint8 *cols_per_row, + guint8 *cols_per_row, gint rows, gint mins_per_row); static void e_day_view_expand_day_event (EDayViewEvent *event, guint8 *grid, - gint8 *cols_per_row, + guint8 *cols_per_row, gint mins_per_row); static void e_day_view_recalc_cols_per_row (gint rows, - gint8 *cols_per_row, + guint8 *cols_per_row, guint16 *group_starts); @@ -131,7 +131,7 @@ void e_day_view_layout_day_events (GArray *events, gint rows, gint mins_per_row, - gint8 *cols_per_row) + guint8 *cols_per_row) { EDayViewEvent *event; gint row, event_num; @@ -192,7 +192,7 @@ static void e_day_view_layout_day_event (EDayViewEvent *event, guint8 *grid, guint16 *group_starts, - gint8 *cols_per_row, + guint8 *cols_per_row, gint rows, gint mins_per_row) { @@ -261,7 +261,7 @@ e_day_view_layout_day_event (EDayViewEvent *event, rows, and set the number of cols in each of the rows to that. */ static void e_day_view_recalc_cols_per_row (gint rows, - gint8 *cols_per_row, + guint8 *cols_per_row, guint16 *group_starts) { gint start_row = 0, row, next_start_row, max_events; @@ -285,7 +285,7 @@ e_day_view_recalc_cols_per_row (gint rows, static void e_day_view_expand_day_event (EDayViewEvent *event, guint8 *grid, - gint8 *cols_per_row, + guint8 *cols_per_row, gint mins_per_row) { gint start_row, end_row, col, row; diff --git a/calendar/gui/e-day-view-layout.h b/calendar/gui/e-day-view-layout.h index 42252d62b9..d5aa51ab8a 100644 --- a/calendar/gui/e-day-view-layout.h +++ b/calendar/gui/e-day-view-layout.h @@ -41,7 +41,7 @@ void e_day_view_layout_long_events (GArray *events, void e_day_view_layout_day_events (GArray *events, gint rows, gint mins_per_row, - gint8 *cols_per_row); + guint8 *cols_per_row); gboolean e_day_view_find_long_event_days (EDayViewEvent *event, gint days_shown, diff --git a/calendar/gui/print.c b/calendar/gui/print.c index 2f18c8e244..84b5931e47 100644 --- a/calendar/gui/print.c +++ b/calendar/gui/print.c @@ -180,7 +180,7 @@ struct pdinfo gint end_minute_offset; gint rows; gint mins_per_row; - gint8 cols_per_row[DAY_VIEW_ROWS]; + guint8 cols_per_row[DAY_VIEW_ROWS]; gboolean use_24_hour_format; }; @@ -1721,6 +1721,8 @@ print_week_summary (GtkPrintContext *context, GnomeCalendar *gcal, } +/* XXX Evolution doesn't have a "year" view. */ +#if 0 static void print_year_summary (GtkPrintContext *context, GnomeCalendar *gcal, time_t whence, double left, double right, double top, double bottom, @@ -1763,6 +1765,7 @@ print_year_summary (GtkPrintContext *context, GnomeCalendar *gcal, time_t whence } } } +#endif static void print_month_summary (GtkPrintContext *context, GnomeCalendar *gcal, time_t whence, @@ -2118,6 +2121,7 @@ print_month_view (GtkPrintContext *context, GnomeCalendar *gcal, time_t date) } /* XXX Evolution doesn't have a "year" view. */ +#if 0 static void print_year_view (GtkPrintContext *context, GnomeCalendar *gcal, time_t date) { @@ -2146,6 +2150,7 @@ print_year_view (GtkPrintContext *context, GnomeCalendar *gcal, time_t date) cr=gtk_print_context_get_cairo_context (context); cairo_show_page (cr); } +#endif static void write_label_piece (time_t t, char *buffer, int size, char *stext, char *etext) @@ -2576,7 +2581,7 @@ print_table_draw_page (GtkPrintOperation *operation, EPrintable *printable) { GtkPageSetup *setup; - gdouble width, height; + gdouble width; setup = gtk_print_context_get_page_setup (context); -- cgit v1.2.3