[evolution-mapi] Compiler warning fixes.
- From: Johnny Jacob <jjohnny src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [evolution-mapi] Compiler warning fixes.
- Date: Fri, 28 Aug 2009 04:13:51 +0000 (UTC)
commit 72107ba563d10872a5688902225ec16a0face51b
Author: Johnny Jacob <jjohnny novell com>
Date: Wed Aug 26 18:12:57 2009 +0530
Compiler warning fixes.
src/libexchangemapi/exchange-mapi-cal-tz-utils.c | 2 +-
src/libexchangemapi/exchange-mapi-cal-utils.c | 4 ++--
src/libexchangemapi/exchange-mapi-connection.c | 9 +++++----
3 files changed, 8 insertions(+), 7 deletions(-)
---
diff --git a/src/libexchangemapi/exchange-mapi-cal-tz-utils.c b/src/libexchangemapi/exchange-mapi-cal-tz-utils.c
index 6d39730..31466e3 100644
--- a/src/libexchangemapi/exchange-mapi-cal-tz-utils.c
+++ b/src/libexchangemapi/exchange-mapi-cal-tz-utils.c
@@ -230,7 +230,7 @@ exchange_mapi_cal_tz_util_dump_ical_tzs ()
list_items = g_list_sort (list_items, (GCompareFunc) g_ascii_strcasecmp);
/* Put the "UTC" entry at the top of the combo's list. */
- list_items = g_list_prepend (list_items, "UTC");
+ list_items = g_list_prepend (list_items, (gpointer)"UTC");
for (l = list_items, i = 0; l != NULL; l = l->next, ++i)
g_print ("[%3d]\t%s\n", (i+1), (gchar *)(l->data));
diff --git a/src/libexchangemapi/exchange-mapi-cal-utils.c b/src/libexchangemapi/exchange-mapi-cal-utils.c
index c089c2e..322c4d4 100644
--- a/src/libexchangemapi/exchange-mapi-cal-utils.c
+++ b/src/libexchangemapi/exchange-mapi-cal-utils.c
@@ -1238,9 +1238,9 @@ check_server_for_object (struct mapi_SPropValue_array *properties, mapi_id_t *mi
if (ids && g_slist_length(ids) == 1) {
struct id_list *idlist = (struct id_list *)(ids->data);
*mid = idlist->id;
- } else
+ } else {
/* FIXME: what to do here? */
- ;
+ }
for (l = ids; l; l = l->next)
g_free(l->data);
diff --git a/src/libexchangemapi/exchange-mapi-connection.c b/src/libexchangemapi/exchange-mapi-connection.c
index 8dd8f5a..36e212f 100644
--- a/src/libexchangemapi/exchange-mapi-connection.c
+++ b/src/libexchangemapi/exchange-mapi-connection.c
@@ -70,6 +70,7 @@ mapi_profile_load (const char *profname, const char *password)
enum MAPISTATUS retval = MAPI_E_SUCCESS;
struct mapi_session *session = NULL;
gchar *profpath = NULL;
+ gchar *default_profile_name = NULL;
const char *profile = NULL;
guint32 debug_log_level = 0;
@@ -100,13 +101,13 @@ mapi_profile_load (const char *profname, const char *password)
if (profname)
profile = profname;
else {
- retval = GetDefaultProfile (&profile);
+ retval = GetDefaultProfile (&default_profile_name);
if (retval != MAPI_E_SUCCESS) {
mapi_errstr("GetDefaultProfile", GetLastError());
goto cleanup;
}
}
-
+ profile = default_profile_name;
g_print("\nLoading profile %s ", profile);
retval = MapiLogonEx(&session, profile, password);
@@ -719,6 +720,7 @@ mapidump_PAB_gal_entry (struct SRow *aRow)
const char *name;
const char *email;
const char *account;
+ ExchangeMAPIGALEntry *gal_entry;
addrtype = (const char *)find_SPropValue_data(aRow, PR_ADDRTYPE_UNICODE);
name = (const char *)find_SPropValue_data(aRow, PR_DISPLAY_NAME_UNICODE);
@@ -728,7 +730,7 @@ mapidump_PAB_gal_entry (struct SRow *aRow)
printf("[%s] %s:\n\tName: %-25s\n\tEmail: %-25s\n",
addrtype, account, name, email);
- ExchangeMAPIGALEntry *gal_entry = g_new0 (ExchangeMAPIGALEntry, 1);
+ gal_entry = g_new0 (ExchangeMAPIGALEntry, 1);
gal_entry->name = g_strdup (name);
gal_entry->email = g_strdup (email);
@@ -1215,7 +1217,6 @@ exchange_mapi_connection_fetch_items (mapi_id_t fid,
const bool *has_attach = NULL;
GSList *attach_list = NULL;
GSList *recip_list = NULL;
- GSList *gal_list = NULL;
GSList *stream_list = NULL;
gboolean cb_retval = false;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]