[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, 16 insertions, 18 deletions

diff --git a/shell/e-corba-storage.c b/shell/e-corba-storage.c
index b642848107..0805ccbff0 100644
--- a/shell/e-corba-storage.c
+++ b/shell/e-corba-storage.c
@@ -93,10 +93,10 @@ impl_StorageListener_destroy (PortableServer_Servant servant,
 #endif
 
 static void
-impl_StorageListener_new_folder (PortableServer_Servant servant,
-				 const CORBA_char *path,
-				 const GNOME_Evolution_Folder *folder,
-				 CORBA_Environment *ev)
+impl_StorageListener_notifyFolderCreated (PortableServer_Servant servant,
+					  const CORBA_char *path,
+					  const GNOME_Evolution_Folder *folder,
+					  CORBA_Environment *ev)
 {
 	StorageListenerServant *storage_listener_servant;
 	EStorage *storage;
@@ -110,7 +110,6 @@ impl_StorageListener_new_folder (PortableServer_Servant servant,
 				 folder->description);
 
 	e_folder_set_physical_uri (e_folder, folder->physical_uri);
-	e_folder_set_highlighted (e_folder, folder->highlighted);
 
 	if (! e_storage_new_folder (storage, path, e_folder)) {
 		g_print ("Cannot register folder -- %s %s\n", path, folder->display_name);
@@ -126,11 +125,11 @@ impl_StorageListener_new_folder (PortableServer_Servant servant,
 }
 
 static void
-impl_StorageListener_update_folder (PortableServer_Servant servant,
-				    const CORBA_char *path,
-				    const CORBA_char *display_name,
-				    CORBA_boolean highlighted,
-				    CORBA_Environment *ev)
+impl_StorageListener_notifyFolderUpdated (PortableServer_Servant servant,
+					  const CORBA_char *path,
+					  const CORBA_char *display_name,
+					  CORBA_long unread_count,
+					  CORBA_Environment *ev)
 {
 	StorageListenerServant *storage_listener_servant;
 	EStorage *storage;
@@ -149,13 +148,13 @@ impl_StorageListener_update_folder (PortableServer_Servant servant,
 	}
 
 	e_folder_set_name (e_folder, display_name);
-	e_folder_set_highlighted (e_folder, highlighted);
+	e_folder_set_unread_count (e_folder, unread_count);
 }
 
 static void
-impl_StorageListener_removed_folder (PortableServer_Servant servant,
-				     const CORBA_char *path,
-				     CORBA_Environment *ev)
+impl_StorageListener_notifyFolderRemoved (PortableServer_Servant servant,
+					  const CORBA_char *path,
+					  CORBA_Environment *ev)
 {
 	StorageListenerServant *storage_listener_servant;
 	EStorage *storage;
@@ -266,7 +265,6 @@ get_name (EStorage *storage)
 
 	return priv->name;
 }
-
 static const char *
 get_display_name (EStorage *storage)
 {
@@ -434,9 +432,9 @@ corba_class_init (void)
 	base_epv->default_POA = NULL;
 
 	epv = g_new0 (POA_GNOME_Evolution_StorageListener__epv, 1);
-	epv->notifyFolderCreated = impl_StorageListener_new_folder;
-	epv->notifyFolderUpdated = impl_StorageListener_update_folder;
-	epv->notifyFolderRemoved = impl_StorageListener_removed_folder;
+	epv->notifyFolderCreated = impl_StorageListener_notifyFolderCreated;
+	epv->notifyFolderUpdated = impl_StorageListener_notifyFolderUpdated;
+	epv->notifyFolderRemoved = impl_StorageListener_notifyFolderRemoved;
 
 	vepv = &storage_listener_vepv;
 	vepv->_base_epv                     = base_epv;