Fix miscellaneous issues causing warnings in Evolution.

6 files changed, 4 insertions, 12 deletions

diff --git a/servers/google/libgdata/gdata-entry.h b/servers/google/libgdata/gdata-entry.h
index 8d8941ed5..df958ee31 100644
--- a/servers/google/libgdata/gdata-entry.h
+++ b/servers/google/libgdata/gdata-entry.h
@@ -238,8 +238,6 @@ void  gdata_entry_set_im_addresses (GDataEntry *entry, GSList *ims);
 
 void  gdata_entry_set_organizations (GDataEntry *entry, GSList *orgs);
 
-void  gdata_entry_set_phone_numbers (GDataEntry *entry, GSList *numbers);
-
 void  gdata_entry_set_postal_addresses (GDataEntry *entry, GSList *pas);
 
 void gdata_entry_set_attendee_list (GDataEntry *entry, GSList *attendee);
@@ -256,8 +254,6 @@ GSList * gdata_entry_get_phone_numbers (GDataEntry *entry);
 
 GSList * gdata_entry_get_postal_addresses (GDataEntry *entry);
 
-gboolean gdata_entry_is_deleted (GDataEntry *entry);
-
 GDataEntryEmailAddress * gdata_entry_get_primary_email_address (GDataEntry *entry);
 
 GDataEntryIMAddress * gdata_entry_get_primary_im_address (GDataEntry *entry);
diff --git a/servers/google/libgdata/gdata-feed.h b/servers/google/libgdata/gdata-feed.h
index c616a1d82..b2406d431 100644
--- a/servers/google/libgdata/gdata-feed.h
+++ b/servers/google/libgdata/gdata-feed.h
@@ -58,7 +58,6 @@ struct _GDataFeedClass {
 };
 
 GType gdata_feed_get_type(void);
-#endif
 
 /*** API ***/
 
@@ -73,3 +72,5 @@ gchar * gdata_feed_get_updated (GDataFeed *feed);
 GSList * gdata_feed_get_entries (GDataFeed *feed);
 
 const gchar *gdata_feed_get_timezone (GDataFeed *feed);
+
+#endif
diff --git a/servers/groupwise/e-gw-connection.h b/servers/groupwise/e-gw-connection.h
index 6a92039b1..c9ef3b07a 100644
--- a/servers/groupwise/e-gw-connection.h
+++ b/servers/groupwise/e-gw-connection.h
@@ -162,8 +162,6 @@ EGwConnectionStatus e_gw_connection_move_item (EGwConnection *cnc, const char *i
 EGwConnectionStatus e_gw_connection_rename_folder (EGwConnection *cnc, const char *id ,const char *new_name) ;
 EGwConnectionStatus e_gw_connection_get_settings (EGwConnection *cnc, EGwSendOptions **opts);
 EGwConnectionStatus e_gw_connection_modify_settings (EGwConnection *cnc, EGwSendOptions *opts);
-EGwConnectionStatus e_gw_connection_add_items (EGwConnection *cnc, const char *container, GList *item_ids) ;
-EGwConnectionStatus e_gw_connection_rename_folder (EGwConnection *cnc, const char *id ,const char *new_name) ;
 EGwConnectionStatus e_gw_connection_share_folder (EGwConnection *cnc, gchar *id, GList *new_list, const char *sub, const char *mesg ,int flag);
 EGwConnectionStatus e_gw_connection_accept_shared_folder (EGwConnection *cnc, gchar *folder_name, gchar *container_id, gchar *item_id, gchar *desc);
 EGwConnectionStatus e_gw_connection_purge_deleted_items (EGwConnection *cnc);
diff --git a/servers/groupwise/e-gw-item.h b/servers/groupwise/e-gw-item.h
index f40441e30..2c91cf272 100644
--- a/servers/groupwise/e-gw-item.h
+++ b/servers/groupwise/e-gw-item.h
@@ -295,9 +295,6 @@ EGwItemRecurrenceRule *e_gw_item_get_rrule (EGwItem *item);
 int e_gw_item_get_recurrence_key (EGwItem *item);
 void e_gw_item_set_recurrence_key (EGwItem *item, int recurrence_key);
 
-GSList * e_gw_item_get_attach_id_list (EGwItem *item) ;
-void e_gw_item_set_attach_id_list (EGwItem *item, GSList *attach_list) ;
-
 void e_gw_item_set_source (EGwItem *item, char *source) ;
 
 int e_gw_item_get_trigger (EGwItem *item);
diff --git a/servers/groupwise/e-gw-sendoptions.c b/servers/groupwise/e-gw-sendoptions.c
index b9af1ed8a..572ea64fb 100644
--- a/servers/groupwise/e-gw-sendoptions.c
+++ b/servers/groupwise/e-gw-sendoptions.c
@@ -53,7 +53,7 @@ e_gw_sendoptions_get_general_options (EGwSendOptions *opts)
 }
 
 EGwSendOptionsStatusTracking*
-e_gw_sendoptions_get_status_tracking_options (EGwSendOptions *opts, char *type)
+e_gw_sendoptions_get_status_tracking_options (EGwSendOptions *opts, const gchar *type)
 {
 	g_return_val_if_fail (opts != NULL || E_IS_GW_SENDOPTIONS (opts), NULL);
 	g_return_val_if_fail (type != NULL, NULL);
diff --git a/servers/groupwise/e-gw-sendoptions.h b/servers/groupwise/e-gw-sendoptions.h
index b5b62be27..cbb016fd0 100644
--- a/servers/groupwise/e-gw-sendoptions.h
+++ b/servers/groupwise/e-gw-sendoptions.h
@@ -97,7 +97,7 @@ typedef struct {
 GType e_gw_sendoptions_get_type (void);
 EGwSendOptions* e_gw_sendoptions_new_from_soap_parameter (SoupSoapParameter *param);
 EGwSendOptionsGeneral* e_gw_sendoptions_get_general_options (EGwSendOptions *opts);
-EGwSendOptionsStatusTracking* e_gw_sendoptions_get_status_tracking_options (EGwSendOptions *opts, char *type);
+EGwSendOptionsStatusTracking* e_gw_sendoptions_get_status_tracking_options (EGwSendOptions *opts, const gchar *type);
 gboolean e_gw_sendoptions_form_message_to_modify (SoupSoapMessage *msg, EGwSendOptions *n_opts, EGwSendOptions *o_opts);
 EGwSendOptions * e_gw_sendoptions_new (void);