Remove "display_name" arg from update methods. It was only there to do the

	* Evolution-Storage.idl: Remove "display_name" arg from update
	methods. It was only there to do the "Inbox (5)" hack, which is
	supported directly now.

	* evolution-storage.c (impl_Storage_updateFolder): no longer takes
	display_name.
	(evolution_storage_update_folder,
	evolution_storage_update_folder_by_uri): Likewise.
	(class_init): Update signal signature.

	* evolution-storage-listener.c
	(impl_GNOME_Evolution_StorageListener_notifyFolderUpdated): No
	longer takes display_name, but make it pass the unread_count along
	in the signal it emits.
	(class_init): Update signal signature.

	* e-local-storage.c (bonobo_interface_update_folder_cb):
	* e-corba-storage.c (impl_StorageListener_notifyFolderUpdated): No
	longer take display_name.

svn path=/trunk/; revision=13587

8 files changed, 33 insertions, 30 deletions

diff --git a/shell/ChangeLog b/shell/ChangeLog
index fdfb18f911..529af3fa3c 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,24 @@
+2001-10-11  Dan Winship  <danw@ximian.com>
+
+	* evolution-storage.c (impl_Storage_updateFolder): no longer takes
+	display_name.
+	(evolution_storage_update_folder,
+	evolution_storage_update_folder_by_uri): Likewise.
+	(class_init): Update signal signature.
+
+	* evolution-storage-listener.c
+	(impl_GNOME_Evolution_StorageListener_notifyFolderUpdated): No
+	longer takes display_name, but make it pass the unread_count along
+	in the signal it emits.
+	(class_init): Update signal signature.
+
+	* e-local-storage.c (bonobo_interface_update_folder_cb): 
+	* e-corba-storage.c (impl_StorageListener_notifyFolderUpdated): No
+	longer take display_name.
+
+	* Evolution-Storage.idl: Remove "display_name" arg from update
+	methods.
+
 2001-10-10  Ettore Perazzoli  <ettore@ximian.com>
 
 	* e-storage-set-view.c (handle_evolution_path_drag_motion): Ooops,
diff --git a/shell/Evolution-Storage.idl b/shell/Evolution-Storage.idl
index 6d648b2938..d5fd5e2d0d 100644
--- a/shell/Evolution-Storage.idl
+++ b/shell/Evolution-Storage.idl
@@ -55,7 +55,6 @@ module Evolution {
 				      in Bonobo::Listener listener);
 
 		void updateFolder (in string path,
-				   in string display_name,
 				   in long unread_count);
 
 		void addListener       (in StorageListener listener)
@@ -78,7 +77,6 @@ module Evolution {
 			raises (Exists);
 		
 		void notifyFolderUpdated (in string  path,
-					  in string  display_name,
 					  in long    unread_count)
 			raises (NotFound);
 
diff --git a/shell/e-corba-storage.c b/shell/e-corba-storage.c
index 03fa1dd4a9..e4ceaa8c3e 100644
--- a/shell/e-corba-storage.c
+++ b/shell/e-corba-storage.c
@@ -126,7 +126,6 @@ impl_StorageListener_notifyFolderCreated (PortableServer_Servant servant,
 static void
 impl_StorageListener_notifyFolderUpdated (PortableServer_Servant servant,
 					  const CORBA_char *path,
-					  const CORBA_char *display_name,
 					  CORBA_long unread_count,
 					  CORBA_Environment *ev)
 {
@@ -146,7 +145,6 @@ impl_StorageListener_notifyFolderUpdated (PortableServer_Servant servant,
 		return;
 	}
 
-	e_folder_set_name (e_folder, display_name);
 	e_folder_set_unread_count (e_folder, unread_count);
 }
 
diff --git a/shell/e-local-storage.c b/shell/e-local-storage.c
index c7fcf730d7..3389a0be30 100644
--- a/shell/e-local-storage.c
+++ b/shell/e-local-storage.c
@@ -951,7 +951,6 @@ bonobo_interface_remove_folder_cb (EvolutionStorage *storage,
 static void
 bonobo_interface_update_folder_cb (EvolutionStorage *storage,
 				   const char *path,
-				   const char *display_name,
 				   int unread_count,
 				   void *data)
 {
@@ -964,9 +963,7 @@ bonobo_interface_update_folder_cb (EvolutionStorage *storage,
 	if (folder == NULL)
 		return;
 
-	/* e_folder_set_name (folder, display_name); */
 	e_folder_set_unread_count (folder, unread_count);
-
 	return;
 }
 
diff --git a/shell/evolution-storage-listener.c b/shell/evolution-storage-listener.c
index e5ac390f4a..857adbca51 100644
--- a/shell/evolution-storage-listener.c
+++ b/shell/evolution-storage-listener.c
@@ -95,7 +95,6 @@ impl_GNOME_Evolution_StorageListener_notifyFolderCreated (PortableServer_Servant
 static void
 impl_GNOME_Evolution_StorageListener_notifyFolderUpdated (PortableServer_Servant servant,
 							  const CORBA_char *path,
-							  const CORBA_char *display_name,
 							  CORBA_long unread_count,
 							  CORBA_Environment *ev)
 {
@@ -106,7 +105,7 @@ impl_GNOME_Evolution_StorageListener_notifyFolderUpdated (PortableServer_Servant
 	priv = listener->priv;
 
 	gtk_signal_emit (GTK_OBJECT (listener), signals[UPDATE_FOLDER], path,
-			 display_name);
+			 unread_count);
 }
 
 static void
@@ -262,10 +261,10 @@ class_init (EvolutionStorageListenerClass *klass)
 						  GTK_RUN_FIRST,
 						  object_class->type,
 						  GTK_SIGNAL_OFFSET (EvolutionStorageListenerClass, update_folder),
-						  gtk_marshal_NONE__POINTER_POINTER,
+						  gtk_marshal_NONE__POINTER_INT,
 						  GTK_TYPE_NONE, 2,
 						  GTK_TYPE_STRING,
-						  GTK_TYPE_STRING);
+						  GTK_TYPE_INT);
 
 	signals[REMOVED_FOLDER] = gtk_signal_new ("removed_folder",
 						  GTK_RUN_FIRST,
diff --git a/shell/evolution-storage-listener.h b/shell/evolution-storage-listener.h
index 5d813af408..d10fd61704 100644
--- a/shell/evolution-storage-listener.h
+++ b/shell/evolution-storage-listener.h
@@ -59,7 +59,7 @@ struct _EvolutionStorageListenerClass {
 				  const GNOME_Evolution_Folder *folder);
 	void (* update_folder)   (EvolutionStorageListener *storage_listener,
 				  const char *path,
-				  const char *display_name);
+				  int unread_count);
 	void (* removed_folder)  (EvolutionStorageListener *storage_listener,
 				  const char *path);
 };
diff --git a/shell/evolution-storage.c b/shell/evolution-storage.c
index b4af27ec5b..68c2bfd079 100644
--- a/shell/evolution-storage.c
+++ b/shell/evolution-storage.c
@@ -319,7 +319,6 @@ impl_Storage_async_xfer_folder (PortableServer_Servant servant,
 static void
 impl_Storage_updateFolder (PortableServer_Servant servant,
 			   const CORBA_char *path,
-			   const CORBA_char *display_name,
 			   CORBA_long unread_count,
 			   CORBA_Environment *ev)
 {
@@ -332,7 +331,7 @@ impl_Storage_updateFolder (PortableServer_Servant servant,
 	storage = EVOLUTION_STORAGE (bonobo_object);
 
 	gtk_signal_emit (GTK_OBJECT (storage), signals[UPDATE_FOLDER],
-			 path, display_name, unread_count);
+			 path, unread_count);
 
 	priv = storage->priv;
 
@@ -347,7 +346,6 @@ impl_Storage_updateFolder (PortableServer_Servant servant,
 		listener = p->data;
 		GNOME_Evolution_StorageListener_notifyFolderUpdated (listener,
 								     path,
-								     display_name,
 								     unread_count,
 								     ev);
 
@@ -544,9 +542,8 @@ class_init (EvolutionStorageClass *klass)
 						 object_class->type,
 						 GTK_SIGNAL_OFFSET (EvolutionStorageClass,
 								    update_folder),
-						 e_marshal_NONE__POINTER_POINTER_INT,
-						 GTK_TYPE_NONE, 3,
-						 GTK_TYPE_STRING,
+						 gtk_marshal_NONE__POINTER_INT,
+						 GTK_TYPE_NONE, 2,
 						 GTK_TYPE_STRING,
 						 GTK_TYPE_INT);
 
@@ -859,7 +856,6 @@ evolution_storage_new_folder (EvolutionStorage *evolution_storage,
 EvolutionStorageResult
 evolution_storage_update_folder (EvolutionStorage *evolution_storage,
 				 const char       *path,
-				 const char       *display_name,
 				 int               unread_count)
 {
 	EvolutionStorageResult result;
@@ -878,7 +874,7 @@ evolution_storage_update_folder (EvolutionStorage *evolution_storage,
 	priv = evolution_storage->priv;
 
 	gtk_signal_emit (GTK_OBJECT (evolution_storage), signals[UPDATE_FOLDER],
-			 path, display_name, unread_count);
+			 path, unread_count);
 
 	if (priv->corba_storage_listeners == NULL)
 		return EVOLUTION_STORAGE_ERROR_NOTREGISTERED;
@@ -891,7 +887,7 @@ evolution_storage_update_folder (EvolutionStorage *evolution_storage,
 		GNOME_Evolution_StorageListener listener;
 
 		listener = p->data;
-		GNOME_Evolution_StorageListener_notifyFolderUpdated (listener, path, display_name, unread_count, &ev);
+		GNOME_Evolution_StorageListener_notifyFolderUpdated (listener, path, unread_count, &ev);
 
 		if (ev._major != CORBA_NO_EXCEPTION)
 			continue;
@@ -910,11 +906,9 @@ evolution_storage_update_folder (EvolutionStorage *evolution_storage,
 
 	if (result == EVOLUTION_STORAGE_OK) {
 		corba_folder = e_folder_tree_get_folder (priv->folder_tree, path);
-		if (corba_folder != NULL) {
-			CORBA_free (corba_folder->displayName);
-			corba_folder->displayName = CORBA_string_dup (display_name);
+		if (corba_folder != NULL)
 			corba_folder->unreadCount = unread_count;
-		} else
+		else
 			result = EVOLUTION_STORAGE_ERROR_NOTFOUND;
 	}
 
@@ -924,7 +918,6 @@ evolution_storage_update_folder (EvolutionStorage *evolution_storage,
 EvolutionStorageResult
 evolution_storage_update_folder_by_uri (EvolutionStorage *evolution_storage,
 					const char       *physical_uri,
-					const char       *display_name,
 					int               unread_count)
 {
 	EvolutionStoragePrivate *priv;
@@ -939,7 +932,7 @@ evolution_storage_update_folder_by_uri (EvolutionStorage *evolution_storage,
 	priv = evolution_storage->priv;
 
 	path = g_hash_table_lookup (priv->uri_to_path, physical_uri);
-	return evolution_storage_update_folder (evolution_storage, path, display_name, unread_count);
+	return evolution_storage_update_folder (evolution_storage, path, unread_count);
 }
 
 EvolutionStorageResult
diff --git a/shell/evolution-storage.h b/shell/evolution-storage.h
index f9c90b212c..73759612ee 100644
--- a/shell/evolution-storage.h
+++ b/shell/evolution-storage.h
@@ -96,7 +96,6 @@ struct _EvolutionStorageClass {
 
 	void (*update_folder) (EvolutionStorage *storage,
 			       const char *path,
-			       const char *display_name,
 			       int unread_count);
 };
 
@@ -131,11 +130,9 @@ EvolutionStorageResult  evolution_storage_new_folder           (EvolutionStorage
 								int                              unread_count);
 EvolutionStorageResult  evolution_storage_update_folder        (EvolutionStorage                *evolution_storage,
 								const char                      *path,
-								const char                      *display_name,
 								int                              unread_count);
 EvolutionStorageResult  evolution_storage_update_folder_by_uri (EvolutionStorage                *evolution_storage,
 								const char                      *physical_uri,
-								const char                      *display_name,
 								int                              unread_count);
 EvolutionStorageResult  evolution_storage_removed_folder       (EvolutionStorage                *evolution_storage,
 								const char                      *path);