From: Kjartan Maraas Date: Mon, 1 Oct 2007 11:47:08 +0000 (+0000) Subject: Use the right enum type. X-Git-Tag: upstream/3.7.4~5469 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e6184a780809a9f874673adc7c048cac0bf07d6f;p=platform%2Fupstream%2Fevolution-data-server.git Use the right enum type. 2007-09-29 Kjartan Maraas * camel-groupwise-folder.c: (gw_update_cache), (gw_update_summary), (groupwise_folder_item_to_msg): Use the right enum type. * camel-groupwise-journal.c: (camel_groupwise_journal_get_type), (groupwise_entry_play_append): * camel-groupwise-store.c: (groupwise_connect), (groupwise_get_folder), (gw_store_reload_folder), (groupwise_folders_sync): * camel-groupwise-utils.c: (camel_groupwise_util_item_from_message): NULL vs 0 fixes. svn path=/trunk/; revision=8097 --- diff --git a/camel/providers/groupwise/ChangeLog b/camel/providers/groupwise/ChangeLog index 0e4ec8f..62910b1 100644 --- a/camel/providers/groupwise/ChangeLog +++ b/camel/providers/groupwise/ChangeLog @@ -1,3 +1,15 @@ +2007-09-29 Kjartan Maraas + + * camel-groupwise-folder.c: (gw_update_cache), (gw_update_summary), + (groupwise_folder_item_to_msg): Use the right enum type. + * camel-groupwise-journal.c: (camel_groupwise_journal_get_type), + (groupwise_entry_play_append): + * camel-groupwise-store.c: (groupwise_connect), + (groupwise_get_folder), (gw_store_reload_folder), + (groupwise_folders_sync): + * camel-groupwise-utils.c: + (camel_groupwise_util_item_from_message): NULL vs 0 fixes. + 2007-09-27 Matthew Barnes ** Fixes part of bug #474000 diff --git a/camel/providers/groupwise/camel-groupwise-folder.c b/camel/providers/groupwise/camel-groupwise-folder.c index f87e935..dfbff35 100644 --- a/camel/providers/groupwise/camel-groupwise-folder.c +++ b/camel/providers/groupwise/camel-groupwise-folder.c @@ -1202,7 +1202,7 @@ gw_update_cache (CamelFolder *folder, GList *list, CamelException *ex, gboolean const char *priority = NULL; char *container_id = NULL; gboolean is_junk = FALSE; - EGwItemStatus status; + EGwConnectionStatus status; GList *item_list = list; int total_items = g_list_length (item_list), i=0; diff --git a/camel/providers/groupwise/camel-groupwise-journal.c b/camel/providers/groupwise/camel-groupwise-journal.c index 7661343..49dc5e0 100644 --- a/camel/providers/groupwise/camel-groupwise-journal.c +++ b/camel/providers/groupwise/camel-groupwise-journal.c @@ -65,7 +65,7 @@ static CamelOfflineJournalClass *parent_class = NULL; CamelType camel_groupwise_journal_get_type (void) { - static CamelType type = 0; + static CamelType type = NULL; if (!type) { type = camel_type_register (camel_offline_journal_get_type (), diff --git a/camel/providers/groupwise/camel-groupwise-store.c b/camel/providers/groupwise/camel-groupwise-store.c index 40ea1b0..a301e6b 100644 --- a/camel/providers/groupwise/camel-groupwise-store.c +++ b/camel/providers/groupwise/camel-groupwise-store.c @@ -315,7 +315,7 @@ groupwise_connect (CamelService *service, CamelException *ex) if (camel_store_summary_count ((CamelStoreSummary *)store->summary) == 0) { /*Settting the refresh stamp to the current time*/ - store->refresh_stamp = time (0); + store->refresh_stamp = time (NULL); } camel_store_summary_save ((CamelStoreSummary *) store->summary); diff --git a/camel/providers/groupwise/camel-groupwise-utils.c b/camel/providers/groupwise/camel-groupwise-utils.c index ee787ab..d7b4b29 100644 --- a/camel/providers/groupwise/camel-groupwise-utils.c +++ b/camel/providers/groupwise/camel-groupwise-utils.c @@ -417,7 +417,7 @@ camel_groupwise_util_item_from_message (EGwConnection *cnc, CamelMimeMessage *me if(!mp) { g_warning ("ERROR: Could not get content object"); camel_operation_end (NULL); - return FALSE; + return NULL; } if (CAMEL_IS_MULTIPART (mp)) {