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/conduits/calendar/calendar-conduit.c | 13 ++++++++----- calendar/conduits/memo/memo-conduit.c | 13 ++++++++----- calendar/conduits/todo/todo-conduit.c | 10 ++++++---- 3 files changed, 22 insertions(+), 14 deletions(-) (limited to 'calendar/conduits') 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" )); -- cgit v1.2.3