[evolution-patches] Cleanups for evolution-data-server

[Kjartan Maraas <kmaraas broadpark no>]

This patch fixes some issues noted by gcc warnings etc.

Cheers
Kjartan

? depcomp
? evolution-data-server-zip
? gtk-doc.make
? iconv-detect.h
? warnings
? addressbook/warnings
? calendar/config.guess
? calendar/config.sub
? calendar/depcomp
? calendar/install-sh
? calendar/ltmain.sh
? calendar/missing
? calendar/warnings
? calendar/ylwrap
? calendar/tests/ecal/test-recur
? camel/camel-mime-tables.c
? camel/warnings
? camel/providers/hula/Makefile
? camel/providers/hula/Makefile.in
? libedataserverui/test-contact-store
? libedataserverui/test-name-selector
? po/stamp-it
? servers/warnings
? servers/exchange/Makefile
? servers/exchange/Makefile.in
? servers/exchange/lib/Makefile
? servers/exchange/lib/Makefile.in
? servers/exchange/lib/e2k-marshal.c
? servers/exchange/lib/e2k-marshal.h
? servers/exchange/lib/e2k-propnames.c
? servers/exchange/lib/e2k-propnames.h
? servers/exchange/lib/e2k-proptags.h
? servers/exchange/storage/Makefile
? servers/exchange/storage/Makefile.in
? servers/exchange/storage/e-shell-marshal.c
? servers/exchange/storage/e-shell-marshal.h
? servers/exchange/storage/libexchange-storage-1.2.pc
? servers/exchange/storage/libexchange-storage.pc
? servers/exchange/xntlm/Makefile
? servers/exchange/xntlm/Makefile.in
? src/GNOME_Evolution_DataServer_1.2.server
? win32/Makefile
? win32/Makefile.in
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution-data-server/ChangeLog,v
retrieving revision 1.351
diff -u -p -r1.351 ChangeLog
--- ChangeLog	2 Jan 2006 15:19:14 -0000	1.351
+++ ChangeLog	4 Jan 2006 22:43:55 -0000
@@ -1,3 +1,27 @@
+2006-01-04  Kjartan Maraas,,23491770  <kmaraas gnome org>
+
+	* calendar/backends/http/e-cal-backend-http.c:
+	(webcal_to_http_method): Remove unused var.
+	* calendar/libecal/e-cal-component.c: (e_cal_component_get_id):
+	Make sure to return stuff from this function.
+	* calendar/libecal/e-cal-view-listener.c: (build_id_list):
+	Use correct type in the function argument.
+	* calendar/tests/ecal/test-ecal.c: (all_tests): #if 0 out some unused
+	stuff.
+	* calendar/tests/ecal/test-recur.c: (main): Remove unused vars.
+	* camel/camel-session.c: (camel_session_get_network_state):
+	Return something here too.
+	* camel/providers/imap4/camel-imap4-store.c: (connect_to_server):
+	Move some vars inside #ifdef HAVE_SSL
+	* camel/providers/local/camel-local-store.c: (xrename):
+	Terminate g_strconcat() calls with NULL, not 0
+	* libedataserverui/e-name-selector.c: Remove unused function.
+	* servers/groupwise/e-gw-connection.c:
+	(e_gw_connection_add_members), (e_gw_connection_remove_members):
+	Remove dubious duplicated assignments causing warnings.
+	* servers/groupwise/e-gw-filter.c: (e_gw_filter_finalize):
+	Same as above.
+
 2006-01-02  Harish Krishnaswamy  <kharish novell com>
 
 	* NEWS, configure.in: Release updates, bump version
Index: calendar/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution-data-server/calendar/ChangeLog,v
retrieving revision 1.540
diff -u -p -r1.540 ChangeLog
--- calendar/ChangeLog	21 Dec 2005 13:42:04 -0000	1.540
+++ calendar/ChangeLog	4 Jan 2006 22:43:55 -0000
@@ -1,3 +1,10 @@
+2006-01-02  Chenthill Palanisamy  <pchenthill novell com>
+
+	Fixes #325498
+	* backends/http/e-cal-backend-http.c:
+	(e_cal_backend_http_finalize): Remove the source
+	from the timeout loop. 
+
 2005-12-21  Chenthill Palanisamy  <pchenthill novell com>
 
 	Fixes #305006
Index: calendar/backends/http/e-cal-backend-http.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/calendar/backends/http/e-cal-backend-http.c,v
retrieving revision 1.45
diff -u -p -r1.45 e-cal-backend-http.c
--- calendar/backends/http/e-cal-backend-http.c	2 Jan 2006 11:58:47 -0000	1.45
+++ calendar/backends/http/e-cal-backend-http.c	4 Jan 2006 22:43:56 -0000
@@ -205,7 +205,6 @@ webcal_to_http_method (const gchar *webc
 static gboolean
 notify_and_remove_from_cache (gpointer key, gpointer value, gpointer user_data)
 {
-	const char *uid = key;
 	const char *calobj = value;
 	ECalBackendHttp *cbhttp = E_CAL_BACKEND_HTTP (user_data);
 	ECalComponent *comp = e_cal_component_new_from_string (calobj);
Index: calendar/libecal/e-cal-component.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/calendar/libecal/e-cal-component.c,v
retrieving revision 1.22
diff -u -p -r1.22 e-cal-component.c
--- calendar/libecal/e-cal-component.c	16 Dec 2005 10:30:43 -0000	1.22
+++ calendar/libecal/e-cal-component.c	4 Jan 2006 22:43:56 -0000
@@ -1429,11 +1429,11 @@ e_cal_component_get_id (ECalComponent *c
 	ECalComponentPrivate *priv;
 	ECalComponentId *id = NULL;
 
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (E_IS_CAL_COMPONENT (comp));
+	g_return_val_if_fail (comp != NULL, NULL);
+	g_return_val_if_fail (E_IS_CAL_COMPONENT (comp), NULL);
 
 	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
+	g_return_val_if_fail (priv->icalcomp != NULL, NULL);
 	
 	id = g_new0 (ECalComponentId, 1);
 	id->uid = g_strdup (icalproperty_get_uid (priv->uid));
Index: calendar/libecal/e-cal-view-listener.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/calendar/libecal/e-cal-view-listener.c,v
retrieving revision 1.10
diff -u -p -r1.10 e-cal-view-listener.c
--- calendar/libecal/e-cal-view-listener.c	11 Oct 2005 07:56:20 -0000	1.10
+++ calendar/libecal/e-cal-view-listener.c	4 Jan 2006 22:43:56 -0000
@@ -97,7 +97,7 @@ build_object_list (const GNOME_Evolution
 }
 
 static GList *
-build_id_list (const GNOME_Evolution_Calendar_CalObjUIDSeq *seq)
+build_id_list (const GNOME_Evolution_Calendar_CalObjIDSeq *seq)
 {
 	GList *list;
 	int i;
Index: calendar/tests/ecal/test-ecal.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/calendar/tests/ecal/test-ecal.c,v
retrieving revision 1.6
diff -u -p -r1.6 test-ecal.c
--- calendar/tests/ecal/test-ecal.c	19 Oct 2005 09:59:50 -0000	1.6
+++ calendar/tests/ecal/test-ecal.c	4 Jan 2006 22:44:02 -0000
@@ -259,6 +259,7 @@ test_object_modification (ECal *client, 
 	return NULL;
 }
 
+#if 0
 static char *
 test_object_removal (ECal *client)
 {
@@ -297,6 +298,7 @@ test_object_removal (ECal *client)
 	mu_assert ("Test object removal - Failed\n", compare);	
 	return NULL;
 }
+#endif
 
 static char *
 test_get_alarms_in_range (ECal *client)
@@ -385,6 +387,7 @@ test_query (ECal *client, const char *qu
 	return NULL;
 }
 
+#if 0
 static char *
 test_e_cal_new (ECal **cal, const char *uri)
 {
@@ -439,6 +442,7 @@ test_e_cal_remove (ECal *ecal, const cha
 	
 	return NULL;
 } 
+#endif
 
 static char *
 test_new_system_calendar()
@@ -620,8 +624,7 @@ test_timezones (ECal *client)
 static char *
 all_tests(ECal *client, const gchar *uri) 
 {
-	ECal *ecal;
-	char *tmp, *uid;
+	char *uid;
 		
 	mu_run_test (test_new_system_calendar ());
 	mu_run_test (test_new_system_tasks ());
Index: calendar/tests/ecal/test-recur.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/calendar/tests/ecal/test-recur.c,v
retrieving revision 1.3
diff -u -p -r1.3 test-recur.c
--- calendar/tests/ecal/test-recur.c	24 Feb 2005 10:58:59 -0000	1.3
+++ calendar/tests/ecal/test-recur.c	4 Jan 2006 22:44:02 -0000
@@ -8,7 +8,6 @@ int
 main (int argc, char **argv)
 {
 	ECal *ecal;
-	GList *l, *objects;
 
 	if (bonobo_init (&argc, argv) == FALSE)
 		g_error ("Could not initialize Bonobo");
Index: camel/camel-session.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-session.c,v
retrieving revision 1.115
diff -u -p -r1.115 camel-session.c
--- camel/camel-session.c	22 Dec 2005 01:48:30 -0000	1.115
+++ camel/camel-session.c	4 Jan 2006 22:44:05 -0000
@@ -684,7 +684,7 @@ camel_session_set_check_junk (CamelSessi
 gboolean
 camel_session_get_network_state (CamelSession *session)
 {
-	g_return_if_fail (CAMEL_IS_SESSION(session));
+	g_return_val_if_fail (CAMEL_IS_SESSION(session), FALSE);
 	
 	return session->network_state;
 }
Index: camel/providers/imap4/camel-imap4-store.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/imap4/camel-imap4-store.c,v
retrieving revision 1.55
diff -u -p -r1.55 camel-imap4-store.c
--- camel/providers/imap4/camel-imap4-store.c	8 Dec 2005 11:09:12 -0000	1.55
+++ camel/providers/imap4/camel-imap4-store.c	4 Jan 2006 22:44:05 -0000
@@ -311,8 +311,11 @@ connect_to_server (CamelIMAP4Engine *eng
 {
 	CamelService *service = engine->service;
 	CamelStream *tcp_stream;
+#ifdef HAVE_SSL
 	CamelIMAP4Command *ic;
-	int id, ret;
+	int id;
+#endif
+	int ret;
 	
 	if (ssl_mode != MODE_CLEAR) {
 #ifdef HAVE_SSL
Index: camel/providers/local/camel-local-store.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/local/camel-local-store.c,v
retrieving revision 1.40
diff -u -p -r1.40 camel-local-store.c
--- camel/providers/local/camel-local-store.c	8 Dec 2005 11:28:47 -0000	1.40
+++ camel/providers/local/camel-local-store.c	4 Jan 2006 22:44:05 -0000
@@ -305,8 +305,8 @@ create_folder(CamelStore *store, const c
 static int xrename(const char *oldp, const char *newp, const char *prefix, const char *suffix, int missingok, CamelException *ex)
 {
 	struct stat st;
-	char *old = g_strconcat(prefix, oldp, suffix, 0);
-	char *new = g_strconcat(prefix, newp, suffix, 0);
+	char *old = g_strconcat(prefix, oldp, suffix, NULL);
+	char *new = g_strconcat(prefix, newp, suffix, NULL);
 	int ret = -1;
 	int err = 0;
 
Index: libedataserverui/e-name-selector.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/libedataserverui/e-name-selector.c,v
retrieving revision 1.8
diff -u -p -r1.8 e-name-selector.c
--- libedataserverui/e-name-selector.c	31 Aug 2005 04:26:10 -0000	1.8
+++ libedataserverui/e-name-selector.c	4 Jan 2006 22:44:08 -0000
@@ -180,21 +180,6 @@ add_section (ENameSelector *name_selecto
 	return name_selector->sections->len - 1;
 }
 
-static void
-free_section (ENameSelector *name_selector, gint n)
-{
-	Section *section;
-
-	g_assert (n >= 0);
-	g_assert (n < name_selector->sections->len);
-
-	section = &g_array_index (name_selector->sections, Section, n);
-
-	g_free (section->name);
-	if (section->entry)
-		g_object_unref (section->entry);
-}
-
 static gint
 find_section_by_name (ENameSelector *name_selector, const gchar *name)
 {
Index: servers/groupwise/e-gw-connection.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/servers/groupwise/e-gw-connection.c,v
retrieving revision 1.136
diff -u -p -r1.136 e-gw-connection.c
--- servers/groupwise/e-gw-connection.c	20 Dec 2005 08:37:20 -0000	1.136
+++ servers/groupwise/e-gw-connection.c	4 Jan 2006 22:44:08 -0000
@@ -2089,7 +2089,7 @@ e_gw_connection_add_members (EGwConnecti
 	e_gw_message_write_string_parameter (msg, "container", NULL, group_id);
 	soup_soap_message_start_element (msg, "members", NULL, NULL);
 
-	for (; member_ids != NULL; member_ids = member_ids = g_list_next (member_ids)) {
+	for (; member_ids != NULL; member_ids = g_list_next (member_ids)) {
 		soup_soap_message_start_element (msg, "member", NULL, NULL);
 		e_gw_message_write_string_parameter (msg, "id", NULL, member_ids->data);
 		soup_soap_message_end_element(msg);
@@ -2133,7 +2133,7 @@ e_gw_connection_remove_members (EGwConne
 	e_gw_message_write_string_parameter (msg, "container", NULL, group_id);
 	soup_soap_message_start_element (msg, "members", NULL, NULL);
 
-	for (; member_ids != NULL; member_ids = member_ids = g_list_next (member_ids)) {
+	for (; member_ids != NULL; member_ids = g_list_next (member_ids)) {
 		soup_soap_message_start_element (msg, "member", NULL, NULL);
 		e_gw_message_write_string_parameter (msg, "id", NULL, member_ids->data);
 		soup_soap_message_end_element(msg);
Index: servers/groupwise/e-gw-filter.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/servers/groupwise/e-gw-filter.c,v
retrieving revision 1.4
diff -u -p -r1.4 e-gw-filter.c
--- servers/groupwise/e-gw-filter.c	31 Aug 2005 04:26:07 -0000	1.4
+++ servers/groupwise/e-gw-filter.c	4 Jan 2006 22:44:08 -0000
@@ -214,7 +214,7 @@ e_gw_filter_finalize (GObject *object)
 	filter = E_GW_FILTER (object);
 	priv = filter->priv;
 	filter_components = priv->component_list;
-	for (; filter_components != NULL; filter_components = filter_components = g_slist_next (filter_components)) {
+	for (; filter_components != NULL; filter_components = g_slist_next (filter_components)) {
 		component = filter_components->data;
 		g_free (component->field_name);
 		g_free (component->field_value);