[Removing Evolution::LocalStorage interface, abstracting the unread counts

2001-08-03  Jason Leach  <jleach@ximian.com>

        [Removing Evolution::LocalStorage interface, abstracting the
        unread counts from a folder's name, also abstract unread counts
        from a shortcut's name.  Fixes #4489 and #5497]

        * e-shortcuts.c (shortcut_item_new): Take an unread_count argument
        now.
        (shortcut_item_update): Ditto.

        * e-shortcuts-view-model.c (get_name_with_unread): Get a string
        containing a shortcut name and it's unread, because these are
        abstracted now.
        (load_group_into_model): Use the above function to make shortcuts
        that have unread counts.

        * e-storage-set-view.c (update_folder_with_unread_hash): Keep a
        hash of folder names with unread counts, because the folder name
        and it's unread count are to be separated, only the ETree is
        supposed to present it as one string.

        * e-shell-view.c: Renamed EShellView::view_title_bar to
        folder_title_bar, to closer match the

        * e-shell-view-menu.c (new_shortcut_dialog_folder_selected_cb):
        Make a shortcut with the unread count.

        * e-shell-folder-commands.c (e_shell_command_add_to_shortcut_bar):
        Make a shortcut with the unread count.

        * e-local-storage.c: Updated for API changes.

        * e-folder.c (e_folder_get_unread_count): New function, does what
        it says.
        (e_folder_set_unread_count): Ditto.

        * e-corba-storage.c (impl_StorageListener_new_folder): Renamed to
        match the IDL function name.
        (impl_StorageListener_update_folder): Ditto.
        (impl_StorageListener_removed_folder): Ditto.

        * Evolution-Storage.idl (struct Folder): Replace the boolean
        highlighted with a long unread_count.
        (updateFolder): Brought in from the now dead
        Evolution::LocalStorage.

        * Evolution-Shell.idl (getLocalStorage): Return a Storage instead
        of a LocalStorage.

        * Evolution-LocalStorage.idl: Removed, no longer needed, only used
        function, updateFolder, has been moved into Evolution::Storage
        interface.

        * evolution-local-storage.[ch]: Ditto.

        * evolution-storage.c (impl_Storage_updateFolder): Implementation
        of the updateFolder taken from ::LocalStorage.
        (class_init): New "update_folder" signal, taken from
        evolution-local-storage.c too.
        (evolution_storage_update_folder): Take an @unread_count int
        instead of a @highlighted boolean.
        (evolution_storage_new_folder): Same for here.
        (evolution_storage_update_folder_by_uri): And here.

        * evolution-storage-listener.h: "update_folder" signal no longer
        sends a @highlighted boolean.

2001-08-03  Jason Leach  <jleach@ximian.com>

        * e-shell-view-menu.c (update_offline_menu_item): Use Jakub's new
        "Work Online" icon and fix a typo.

svn path=/trunk/; revision=11633

1 files changed, 11 insertions, 13 deletions

diff --git a/shell/e-local-storage.c b/shell/e-local-storage.c
index cc92c43329..61bd85777e 100644
--- a/shell/e-local-storage.c
+++ b/shell/e-local-storage.c
@@ -28,9 +28,6 @@
  *   - If the LocalStorage is destroyed and an async operation on a shell component is
  *     pending, we get a callback on a bogus object.  We need support for cancelling
  *     operations on the shell component.
- *
- *   - The tree is kept both in the EStorage and the EvolutionStorage.  Very
- *     bad design.
  */
 
 #ifdef HAVE_CONFIG_H
@@ -53,7 +50,7 @@
 #include "e-util/e-path.h"
 #include "e-local-folder.h"
 
-#include "evolution-local-storage.h"
+#include "evolution-storage.h"
 
 #include "e-local-storage.h"
 
@@ -64,7 +61,7 @@ static EStorageClass *parent_class = NULL;
 struct _ELocalStoragePrivate {
 	EFolderTypeRegistry *folder_type_registry;
 	char *base_path;
-	EvolutionLocalStorage *bonobo_interface;
+	EvolutionStorage *bonobo_interface;
 };
 
 
@@ -146,7 +143,7 @@ new_folder (ELocalStorage *local_storage,
 				      e_folder_get_type_string (folder),
 				      e_folder_get_physical_uri (folder),
 				      e_folder_get_description (folder),
-				      e_folder_get_highlighted (folder));
+				      e_folder_get_unread_count (folder));
 }
 
 static gboolean
@@ -842,7 +839,7 @@ impl_async_xfer_folder (EStorage *storage,
 }
 
 
-/* Callbacks for the `Evolution::LocalStorage' interface we are exposing to the outside world.  */
+/* Callbacks for the `Evolution::Storage' interface we are exposing to the outside world.  */
 static int
 bonobo_interface_create_folder_cb (EvolutionStorage *storage,
 				   const char *path,
@@ -872,10 +869,10 @@ bonobo_interface_remove_folder_cb (EvolutionStorage *storage,
 }
 
 static void
-bonobo_interface_update_folder_cb (EvolutionLocalStorage *bonobo_local_storage,
+bonobo_interface_update_folder_cb (EvolutionStorage *storage,
 				   const char *path,
 				   const char *display_name,
-				   gboolean highlighted,
+				   int unread_count,
 				   void *data)
 {
 	ELocalStorage *local_storage;
@@ -888,7 +885,7 @@ bonobo_interface_update_folder_cb (EvolutionLocalStorage *bonobo_local_storage,
 		return;
 
 	e_folder_set_name (folder, display_name);
-	e_folder_set_highlighted (folder, highlighted);
+	e_folder_set_unread_count (folder, unread_count);
 
 	return;
 }
@@ -956,7 +953,8 @@ construct (ELocalStorage *local_storage,
 	priv->base_path = g_strndup (base_path, base_path_len);
 
 	g_assert (priv->bonobo_interface == NULL);
-	priv->bonobo_interface = evolution_local_storage_new (E_LOCAL_STORAGE_NAME);
+	priv->bonobo_interface = evolution_storage_new (E_LOCAL_STORAGE_NAME,
+							NULL, NULL);
 
 	gtk_signal_connect (GTK_OBJECT (priv->bonobo_interface), "create_folder",
 			    GTK_SIGNAL_FUNC (bonobo_interface_create_folder_cb), 
@@ -1001,11 +999,11 @@ e_local_storage_get_base_path (ELocalStorage *local_storage)
 }
 
 
-const GNOME_Evolution_LocalStorage
+const GNOME_Evolution_Storage
 e_local_storage_get_corba_interface (ELocalStorage *local_storage)
 {
 	ELocalStoragePrivate *priv;
-	GNOME_Evolution_LocalStorage corba_interface;
+	GNOME_Evolution_Storage corba_interface;
 
 	g_return_val_if_fail (local_storage != NULL, NULL);
 	g_return_val_if_fail (E_IS_LOCAL_STORAGE (local_storage), NULL);