[evolution-patches] (groupwise provider)fix for bug 72965



hi,
the attached patch fixes bug 72965
thanks,
partha
Index: camel-groupwise-store.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/groupwise/camel-groupwise-store.c,v
retrieving revision 1.34
diff -u -p -r1.34 camel-groupwise-store.c
--- camel-groupwise-store.c	25 Feb 2005 06:31:31 -0000	1.34
+++ camel-groupwise-store.c	25 Feb 2005 08:42:33 -0000
@@ -806,11 +806,13 @@ groupwise_get_folder_info (CamelStore *s
 			temp_str++ ;
 			top_folder = g_hash_table_lookup (priv->name_hash, temp_str) ;	
 		} else
-			top_folder = g_hash_table_lookup (priv->name_hash, top) ;	
-
+			top_folder = g_hash_table_lookup (priv->name_hash, top) ;
+		/* 'top' is a valid path, but doesnt have a container id
+		 *  return NULL */
+		if (!top_folder)
+			return NULL ;
 	}
 
-	
 	status = e_gw_connection_get_container_list (priv->cnc, top_folder, &folder_list);
 	if (status != E_GW_CONNECTION_STATUS_OK ) {
 		CAMEL_SERVICE_UNLOCK (store, connect_lock);
@@ -1069,7 +1071,6 @@ groupwise_rename_folder(CamelStore *stor
 		camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot rename GroupWise folders in offline mode."));
 		return;
 	}
-	
 	CAMEL_SERVICE_LOCK (store, connect_lock) ;
 	temp_old = strrchr (old_name,'/') ;
 	if (temp_old) {
@@ -1084,7 +1085,7 @@ groupwise_rename_folder(CamelStore *stor
 	else
 		temp_new = (char *)new_name ;
 		
-	if (!container_id || e_gw_connection_rename_folder (priv->cnc, container_id , new_name) != E_GW_CONNECTION_STATUS_OK) {
+	if (!container_id || e_gw_connection_rename_folder (priv->cnc, container_id , temp_new) != E_GW_CONNECTION_STATUS_OK) {
 		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot rename Groupwise folder `%s' to `%s'"),
 				      old_name, new_name);
 		CAMEL_SERVICE_UNLOCK (store, connect_lock) ;
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/groupwise/ChangeLog,v
retrieving revision 1.27
diff -u -p -r1.27 ChangeLog
--- ChangeLog	25 Feb 2005 06:31:31 -0000	1.27
+++ ChangeLog	25 Feb 2005 08:42:33 -0000
@@ -1,3 +1,10 @@
+2005-02-25  Parthasarathi Susarla <sparthasarathi novell com>
+	
+	* camel-groupwise-store.c: 
+	  (groupwise_rename_folder),
+	  (groupwise_get_folder_info) : 
+	  Fixes bug #72965
+	  
 2005-02-25  Chenthill Palanisamy  <pchenthill novell com>
 
 	* camel-groupwise-folder.c: (groupwise_refresh_info):


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]