From 748c73de0f477c154d6c120d4d27e676ae887a03 Mon Sep 17 00:00:00 2001 From: Praveen Kumar Date: Wed, 24 Aug 2005 09:43:41 +0000 Subject: Removed the warning that are generated when compiled with GCC 4. 2005-08-24 Praveen Kumar * plugins/exchange-operations/exchange-account-setup.c: * plugins/exchange-operations/exchange-calendar.c: * plugins/exchange-operations/exchange-config-listener.c: * plugins/exchange-operations/exchange-contacts.c: * plugins/exchange-operations/exchange-delegates-user.c: * plugins/exchange-operations/exchange-folder-size-display.c: * plugins/exchange-operations/exchange-folder.c: * plugins/exchange-operations/exchange-operations.c: Removed the warning that are generated when compiled with GCC 4. * plugins/exchange-operations/exchange-calendar.c: Fixed a build break due to the modification of the 'source_type' field in the ECalConfigTargetSource class. svn path=/trunk/; revision=30237 --- plugins/exchange-operations/ChangeLog | 16 ++++++++++++++++ .../exchange-operations/exchange-account-setup.c | 17 ++++++++--------- plugins/exchange-operations/exchange-calendar.c | 22 ++++++++++++---------- .../exchange-operations/exchange-config-listener.c | 2 ++ plugins/exchange-operations/exchange-contacts.c | 10 ++++++---- .../exchange-operations/exchange-delegates-user.c | 8 ++++---- .../exchange-folder-size-display.c | 4 ++-- plugins/exchange-operations/exchange-folder.c | 2 ++ plugins/exchange-operations/exchange-operations.c | 2 +- 9 files changed, 53 insertions(+), 30 deletions(-) diff --git a/plugins/exchange-operations/ChangeLog b/plugins/exchange-operations/ChangeLog index b43e6407e7..1a7b806af0 100644 --- a/plugins/exchange-operations/ChangeLog +++ b/plugins/exchange-operations/ChangeLog @@ -1,3 +1,19 @@ +2005-08-24 Praveen Kumar + + * plugins/exchange-operations/exchange-account-setup.c: + * plugins/exchange-operations/exchange-calendar.c: + * plugins/exchange-operations/exchange-config-listener.c: + * plugins/exchange-operations/exchange-contacts.c: + * plugins/exchange-operations/exchange-delegates-user.c: + * plugins/exchange-operations/exchange-folder-size-display.c: + * plugins/exchange-operations/exchange-folder.c: + * plugins/exchange-operations/exchange-operations.c: + Removed the warning that are generated when compiled with GCC 4. + + * plugins/exchange-operations/exchange-calendar.c: + Fixed a build break due to the modification of the 'source_type' + field in the ECalConfigTargetSource class. + 2005-08-22 Sarfraaz Ahmed * exchange-account-setup.c (btn_fsize_clicked) diff --git a/plugins/exchange-operations/exchange-account-setup.c b/plugins/exchange-operations/exchange-account-setup.c index ae3f23fd16..505e4b0350 100644 --- a/plugins/exchange-operations/exchange-account-setup.c +++ b/plugins/exchange-operations/exchange-account-setup.c @@ -155,7 +155,6 @@ btn_fsize_clicked (GtkButton *button, gpointer data) { ExchangeAccount *account; GtkListStore *model; - GSList *acclist; account = exchange_operations_get_exchange_account (); @@ -902,7 +901,7 @@ org_gnome_exchange_show_folder_size_factory (EPlugin *epl, EConfigHookItemFactor GtkHBox *hbx_size; char *folder_name, *folder_size; - folder_name = camel_folder_get_name (cml_folder); + folder_name = (char*) camel_folder_get_name (cml_folder); if (!folder_name) folder_name = g_strdup ("name"); account = exchange_operations_get_exchange_account (); @@ -912,8 +911,8 @@ org_gnome_exchange_show_folder_size_factory (EPlugin *epl, EConfigHookItemFactor else folder_size = g_strdup ("0 KB"); - hbx_size = gtk_hbox_new (FALSE, 0); - vbx = (GtkVBox *)gtk_notebook_get_nth_page (data->parent, 0); + hbx_size = (GtkHBox*) gtk_hbox_new (FALSE, 0); + vbx = (GtkVBox *)gtk_notebook_get_nth_page (GTK_NOTEBOOK (data->parent), 0); lbl_size = gtk_label_new_with_mnemonic (_("Size:")); lbl_size_val = gtk_label_new_with_mnemonic (_(folder_size)); @@ -921,12 +920,12 @@ org_gnome_exchange_show_folder_size_factory (EPlugin *epl, EConfigHookItemFactor gtk_widget_show (lbl_size_val); gtk_misc_set_alignment (GTK_MISC (lbl_size), 0.0, 0.5); gtk_misc_set_alignment (GTK_MISC (lbl_size_val), 0.0, 0.5); - gtk_box_pack_start (hbx_size, lbl_size, FALSE, TRUE, 12); - gtk_box_pack_start (hbx_size, lbl_size_val, FALSE, TRUE, 10); - gtk_widget_show_all (hbx_size); + gtk_box_pack_start (GTK_BOX (hbx_size), lbl_size, FALSE, TRUE, 12); + gtk_box_pack_start (GTK_BOX (hbx_size), lbl_size_val, FALSE, TRUE, 10); + gtk_widget_show_all (GTK_WIDGET (hbx_size)); - gtk_box_pack_start (GTK_BOX (vbx), hbx_size, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (vbx), GTK_WIDGET (hbx_size), FALSE, FALSE, 0); g_free (folder_size); - return hbx_size; + return GTK_WIDGET (hbx_size); } diff --git a/plugins/exchange-operations/exchange-calendar.c b/plugins/exchange-operations/exchange-calendar.c index 0ed24770d0..351443d9f8 100644 --- a/plugins/exchange-operations/exchange-calendar.c +++ b/plugins/exchange-operations/exchange-calendar.c @@ -47,7 +47,7 @@ enum { gboolean calendar_src_exists = FALSE; gchar *calendar_old_source_uri = NULL; -GPtrArray *e_exchange_calendar_get_calendars (ECalSourceType *ftype); +GPtrArray *e_exchange_calendar_get_calendars (ECalSourceType ftype); void e_exchange_calendar_pcalendar_on_change (GtkTreeView *treeview, ESource *source); GtkWidget *e_exchange_calendar_pcalendar (EPlugin *epl, EConfigHookItemFactoryData *data); gboolean e_exchange_calendar_check (EPlugin *epl, EConfigHookPageCheckData *data); @@ -55,7 +55,7 @@ void e_exchange_calendar_commit (EPlugin *epl, EConfigTarget *target); /* FIXME: Reconsider the prototype of this function */ GPtrArray * -e_exchange_calendar_get_calendars (ECalSourceType *ftype) +e_exchange_calendar_get_calendars (ECalSourceType ftype) { ExchangeAccount *account; GPtrArray *folder_array; @@ -69,10 +69,10 @@ e_exchange_calendar_get_calendars (ECalSourceType *ftype) gchar *tstring; /* FIXME: Compiler warns here; review needed */ - if (GPOINTER_TO_INT (ftype) == E_CAL_SOURCE_TYPE_EVENT) { /* Calendars */ + if (ftype == E_CAL_SOURCE_TYPE_EVENT) { /* Calendars */ tstring = g_strdup ("calendar"); } - else if (GPOINTER_TO_INT (ftype) == E_CAL_SOURCE_TYPE_TODO) { /* Tasks */ + else if (ftype == E_CAL_SOURCE_TYPE_TODO) { /* Tasks */ tstring = g_strdup ("tasks"); } else { @@ -194,7 +194,7 @@ e_exchange_calendar_pcalendar (EPlugin *epl, EConfigHookItemFactoryData *data) account_name = account->account_name; if (calendar_src_exists) { - cal_name = e_source_peek_name (source); + cal_name = (gchar*) e_source_peek_name (source); model = exchange_account_folder_size_get_model (account); if (model) folder_size = g_strdup_printf ("%s KB", exchange_folder_size_get_val (model, cal_name)); @@ -252,7 +252,7 @@ e_exchange_calendar_pcalendar (EPlugin *epl, EConfigHookItemFactoryData *data) uri_prefix = g_strconcat (account->account_filename, "/", NULL); prefix_len = strlen (uri_prefix); - tmpruri = rel_uri; + tmpruri = (gchar*) rel_uri; if (g_str_has_prefix (tmpruri, uri_prefix)) { sruri = g_strdup (tmpruri+prefix_len); @@ -315,10 +315,10 @@ e_exchange_calendar_commit (EPlugin *epl, EConfigTarget *target) g_free (path_prefix); /* FIXME: Compiler gives a warning here; review needed */ - if (GPOINTER_TO_INT (t->source_type) == E_CAL_SOURCE_TYPE_EVENT) { + if (t->source_type == E_CAL_SOURCE_TYPE_EVENT) { ftype = g_strdup ("calendar"); } - else if (GPOINTER_TO_INT (t->source_type) == E_CAL_SOURCE_TYPE_TODO) { + else if (t->source_type == E_CAL_SOURCE_TYPE_TODO) { ftype = g_strdup ("tasks"); } else { @@ -341,7 +341,7 @@ e_exchange_calendar_commit (EPlugin *epl, EConfigTarget *target) } e_source_set_relative_uri (source, ruri); - path = g_strdup_printf ("/%s", ruri+prefix_len); + path = g_build_filename ("/", ruri+prefix_len, NULL); if (!calendar_src_exists) { /* Create the new folder */ @@ -349,7 +349,7 @@ e_exchange_calendar_commit (EPlugin *epl, EConfigTarget *target) } else if (gruri && strcmp (gruri, calendar_old_source_uri)) { /* Rename the folder */ - oldpath = g_strdup_printf ("/%s", calendar_old_source_uri+prefix_len); + oldpath = g_build_filename ("/", calendar_old_source_uri+prefix_len, NULL); result = exchange_account_xfer_folder (account, oldpath, path, TRUE); exchange_operations_update_child_esources (source, calendar_old_source_uri, @@ -382,6 +382,8 @@ e_exchange_calendar_commit (EPlugin *epl, EConfigTarget *target) case EXCHANGE_ACCOUNT_FOLDER_GENERIC_ERROR: e_error_run (NULL, ERROR_DOMAIN ":folder-generic-error", NULL); break; + default: + break; } g_free (uri_text); diff --git a/plugins/exchange-operations/exchange-config-listener.c b/plugins/exchange-operations/exchange-config-listener.c index c634ea25cd..6d234a6e8b 100644 --- a/plugins/exchange-operations/exchange-config-listener.c +++ b/plugins/exchange-operations/exchange-config-listener.c @@ -231,6 +231,7 @@ is_active_exchange_account (EAccount *account) return (strncmp (account->source->url, EXCHANGE_URI_PREFIX, 11) == 0); } +#if 0 /* Not using the following code anywhere for the moment */ static void add_account_esources (ExchangeAccount *account, GSList *folders) @@ -472,6 +473,7 @@ add_sources (ExchangeAccount *account) g_slist_free (folders); } } +#endif static void remove_account_esource (ExchangeAccount *account, diff --git a/plugins/exchange-operations/exchange-contacts.c b/plugins/exchange-operations/exchange-contacts.c index 6a5cb754ce..8457e3af61 100644 --- a/plugins/exchange-operations/exchange-contacts.c +++ b/plugins/exchange-operations/exchange-contacts.c @@ -165,7 +165,7 @@ e_exchange_contacts_pcontacts (EPlugin *epl, EConfigHookItemFactoryData *data) account_name = account->account_name; hbx_size = NULL; if (contacts_src_exists) { - abook_name = e_source_peek_name (source); + abook_name = (char*)e_source_peek_name (source); model = exchange_account_folder_size_get_model (account); if (model) folder_size = g_strdup_printf ("%s KB", exchange_folder_size_get_val (model, abook_name)); @@ -176,8 +176,8 @@ e_exchange_contacts_pcontacts (EPlugin *epl, EConfigHookItemFactoryData *data) lbl_size = gtk_label_new_with_mnemonic (_("Size:")); lbl_size_val = gtk_label_new_with_mnemonic (_(folder_size)); hbx_size = gtk_hbox_new (FALSE, 0); - gtk_box_pack_start (hbx_size, lbl_size, FALSE, TRUE, 0); - gtk_box_pack_start (hbx_size, lbl_size_val, FALSE, TRUE, 10); + gtk_box_pack_start (GTK_BOX (hbx_size), lbl_size, FALSE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (hbx_size), lbl_size_val, FALSE, TRUE, 10); gtk_widget_show (lbl_size); gtk_widget_show (lbl_size_val); gtk_misc_set_alignment (GTK_MISC (lbl_size), 0.0, 0.5); @@ -228,7 +228,7 @@ e_exchange_contacts_pcontacts (EPlugin *epl, EConfigHookItemFactoryData *data) int prefix_len; GtkTreeSelection *selection; - tmpruri = rel_uri; + tmpruri = (gchar*) rel_uri; uri_prefix = g_strconcat (account->account_filename, "/", NULL); prefix_len = strlen (uri_prefix); @@ -354,6 +354,8 @@ e_exchange_contacts_commit (EPlugin *epl, EConfigTarget *target) case EXCHANGE_ACCOUNT_FOLDER_GENERIC_ERROR: e_error_run (NULL, ERROR_DOMAIN ":folder-generic-error", NULL); break; + default: + break; } g_free (ruri); g_free (path); diff --git a/plugins/exchange-operations/exchange-delegates-user.c b/plugins/exchange-operations/exchange-delegates-user.c index 38f82563e5..4b0913045c 100644 --- a/plugins/exchange-operations/exchange-delegates-user.c +++ b/plugins/exchange-operations/exchange-delegates-user.c @@ -215,11 +215,11 @@ exchange_delegates_user_edit (ExchangeDelegatesUser *user, g_object_weak_ref (G_OBJECT (parent_window), parent_window_destroyed, dialog); g_object_add_weak_pointer (G_OBJECT (parent_window), - (void **)&parent_window); + (gpointer*)&parent_window); button = gtk_dialog_run (GTK_DIALOG (dialog)); if (parent_window) { g_object_remove_weak_pointer (G_OBJECT (parent_window), - (void **)&parent_window); + (gpointer *)&parent_window); g_object_weak_unref (G_OBJECT (parent_window), parent_window_destroyed, dialog); } @@ -324,9 +324,9 @@ exchange_delegates_user_new_from_gc (E2kGlobalCatalog *gc, p--; g_byte_array_append (user->entryid, creator_entryid->data, p - creator_entryid->data + 1); - g_byte_array_append (user->entryid, entry->legacy_exchange_dn, + g_byte_array_append (user->entryid, (guint8*)entry->legacy_exchange_dn, strlen (entry->legacy_exchange_dn)); - g_byte_array_append (user->entryid, "", 1); + g_byte_array_append (user->entryid, (guint8*)"", 1); return user; } diff --git a/plugins/exchange-operations/exchange-folder-size-display.c b/plugins/exchange-operations/exchange-folder-size-display.c index 5473196446..494fe5ef7c 100644 --- a/plugins/exchange-operations/exchange-folder-size-display.c +++ b/plugins/exchange-operations/exchange-folder-size-display.c @@ -68,9 +68,9 @@ char * exchange_folder_size_get_val (GtkListStore *model, const char *folder_name) { GHashTable *finfo = g_hash_table_new (g_str_hash, g_str_equal); - char *col_name, *folder_size, *fsize; + char *folder_size, *fsize; - gtk_tree_model_foreach (model, get_folder_size_func, finfo); + gtk_tree_model_foreach (GTK_TREE_MODEL (model), get_folder_size_func, finfo); if ((fsize = g_hash_table_lookup (finfo, folder_name)) != NULL) folder_size = g_strdup (fsize); diff --git a/plugins/exchange-operations/exchange-folder.c b/plugins/exchange-operations/exchange-folder.c index d3e8639af0..c4fb6dd9e5 100644 --- a/plugins/exchange-operations/exchange-folder.c +++ b/plugins/exchange-operations/exchange-folder.c @@ -475,6 +475,8 @@ org_gnome_exchange_folder_subscription (EPlugin *ep, EMMenuTargetSelect *target) case EXCHANGE_ACCOUNT_FOLDER_GENERIC_ERROR: e_error_run (NULL, ERROR_DOMAIN ":folder-generic-error", NULL); return; + default: + break; } } diff --git a/plugins/exchange-operations/exchange-operations.c b/plugins/exchange-operations/exchange-operations.c index b7b8b436e5..64d3d8da09 100644 --- a/plugins/exchange-operations/exchange-operations.c +++ b/plugins/exchange-operations/exchange-operations.c @@ -252,7 +252,7 @@ void exchange_operations_update_child_esources (ESource *source, const gchar *ol sources = e_source_group_peek_sources (group); for (tsource = sources; tsource != NULL; tsource = tsource->next) { gchar *ruri; - ruri = e_source_peek_relative_uri (tsource->data); + ruri = (gchar*) e_source_peek_relative_uri (tsource->data); if (g_strrstr (ruri, old_path)) { /* This ESource points to one of the child folders */ gchar **tmpv, *truri; -- cgit v1.2.3