File versioning.patch of Package evolution-data-server

Overview Repositories Revisions Requests Users Attributes Meta

File versioning.patch of Package evolution-data-server

===================================================================
RCS file: /cvs/gnome/evolution-data-server/servers/groupwise/e-gw-connection.c,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- servers/groupwise/e-gw-connection.c	2006/11/20 12:46:20	1.146
+++ servers/groupwise/e-gw-connection.c	2006/12/04 08:56:47	1.147
@@ -33,6 +33,7 @@
 #include "e-gw-connection.h"
 #include "e-gw-message.h"
 #include "e-gw-filter.h"
+#include "build-timestamp.h"
 
 /* For soup sync session timeout */
 #define GW_SOUP_SESSION_TIMEOUT 30
@@ -221,8 +222,7 @@
 {
 	EGwConnection *cnc = (EGwConnection *) object;
 	EGwConnectionPrivate *priv;
-	char *hash_key;
-	gpointer orig_key, orig_value;
+	char *hash_key, permissions_key;
 	
 	g_return_if_fail (E_IS_GW_CONNECTION (cnc));
 	
@@ -235,14 +235,10 @@
 					    priv->username ? priv->username : "",
 					    priv->password ? priv->password : "",
 					    priv->uri ? priv->uri : "");
-		if (g_hash_table_lookup_extended (loaded_connections_permissions, hash_key, &orig_key, &orig_value)) {
-			g_hash_table_remove (loaded_connections_permissions, hash_key);
-			if (g_hash_table_size (loaded_connections_permissions) == 0) {
-				g_hash_table_destroy (loaded_connections_permissions);
-				loaded_connections_permissions = NULL;
-			}
-
-			g_free (orig_key);
+		g_hash_table_remove (loaded_connections_permissions, hash_key);
+		if (g_hash_table_size (loaded_connections_permissions) == 0) {
+			g_hash_table_destroy (loaded_connections_permissions);
+			loaded_connections_permissions = NULL;
 		}
 		g_free (hash_key);
 	}
@@ -411,6 +407,7 @@
 	SoupSoapMessage *msg;
 	/* build the SOAP message */
 	msg = e_gw_message_new_with_header (uri, NULL, "loginRequest");
+	e_gw_message_write_string_parameter (msg, "application", "types", build_timestamp);
 	soup_soap_message_start_element (msg, "auth", "types", NULL);
 	soup_soap_message_add_attribute (msg, "type", "types:PlainText", "xsi",
 					 "http://www.w3.org/2001/XMLSchema-instance");
@@ -553,7 +550,8 @@
 				    cnc->priv->password ? cnc->priv->password : "",
 				    cnc->priv->uri);
 	if (loaded_connections_permissions == NULL)
-		loaded_connections_permissions = g_hash_table_new (g_str_hash, g_str_equal);
+		loaded_connections_permissions = g_hash_table_new_full (g_str_hash, g_str_equal,
+				g_free, NULL);
 	g_hash_table_insert (loaded_connections_permissions, hash_key, cnc);
 
 	/* free memory */
@@ -3948,11 +3946,12 @@
 				parent_cnc->priv->uri);
 		cnc = g_hash_table_lookup (loaded_connections_permissions, hash_key);
 		permissions_key = g_strdup_printf ("%s:permissions", hash_key);
-		g_free (hash_key);
 
 		if (E_IS_GW_CONNECTION (cnc)) {
 			*permissions = GPOINTER_TO_INT (g_hash_table_lookup (loaded_connections_permissions, permissions_key));
 			g_free (permissions_key);
+			g_free (name);
+			g_free (hash_key);
 			g_object_ref (cnc);
 			g_static_mutex_unlock (&connecting);
 			return cnc;
@@ -4043,6 +4042,7 @@
 	/* free memory */
 	g_object_unref (response);
 	g_object_unref (msg);
+	g_free (name);
 	g_static_mutex_unlock (&connecting);
 	return cnc;
 }
===================================================================
RCS file: /cvs/gnome/evolution-data-server/servers/groupwise/Makefile.am,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- servers/groupwise/Makefile.am	2005/08/13 02:33:16	1.15
+++ servers/groupwise/Makefile.am	2006/12/04 08:56:47	1.16
@@ -20,6 +20,13 @@
 	libegroupwise-1.2.la				\
 	$(E_DATA_SERVER_LIBS) 
 
+build-timestamp.h : $(top_builddir)/config.h
+	echo "const char *build_timestamp = \"Evolution-Data-Server-@BASE_VERSION@-`date +%F`\";" > $@
+
+BUILT_SOURCES = build-timestamp.h
+NODIST_FILES = build-timestamp.h
+CLEANFILES = build-timestamp.h
+
 lib_LTLIBRARIES = libegroupwise-1.2.la
 
 libegroupwise_1_2_la_SOURCES =			\
@@ -38,7 +45,8 @@
 	e-gw-recur-utils.c                      \
 	e-gw-recur-utils.h			\
 	e-gw-proxy.h				\
-	e-gw-proxy.c				
+	e-gw-proxy.c				\
+	build-timestamp.h
 
 libegroupwise_1_2_la_LIBADD =						\
 	$(E_DATA_SERVER_LIBS)						\
@@ -68,3 +76,4 @@
 EXTRA_DIST = $(pkgconfig_DATA:-$(API_VERSION).pc=.pc.in)
 
 DISTCLEANFILES = $(pkgconfig_DATA)
+

Places

File versioning.patch of Package evolution-data-server

Places