[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, 27 insertions, 2 deletions

diff --git a/shell/e-storage-set-view.c b/shell/e-storage-set-view.c
index 1322cb60ef..9187e4bb81 100644
--- a/shell/e-storage-set-view.c
+++ b/shell/e-storage-set-view.c
@@ -1423,6 +1423,21 @@ etree_get_node_by_id (ETreeModel *etm, gchar *save_id, void *model_data)
 	return g_hash_table_lookup (storage_set_view->priv->path_to_etree_node, save_id);
 }
 
+GHashTable *folders_with_unread = NULL;
+
+static void
+update_folder_with_unread_hash (char *folder_name, int unread_count)
+{
+	if (!folders_with_unread)
+	        folders_with_unread = g_hash_table_new (g_str_hash, g_str_equal);
+
+	g_hash_table_insert (folders_with_unread,
+			     g_strdup (folder_name),
+			     g_strdup_printf ("%s (%d)",
+					      folder_name,
+					      unread_count));
+}
+
 static void *
 etree_value_at (ETreeModel *etree, ETreePath tree_path, int col, void *model_data)
 {
@@ -1439,8 +1454,18 @@ etree_value_at (ETreeModel *etree, ETreePath tree_path, int col, void *model_dat
 
 	folder = e_storage_set_get_folder (storage_set, path);
 	if (folder != NULL) {
+		char *folder_name = e_folder_get_name (folder);
+		int unread_count = e_folder_get_unread_count (folder);
+
+		update_folder_with_unread_hash (folder_name, unread_count);
+
 		if (col == 0)
-			return (void *) e_folder_get_name (folder);
+			if (unread_count > 0)
+				return (void *) g_hash_table_lookup (folders_with_unread,
+								     folder_name);
+			else
+				return (void *) folder_name;
+		
 		else
 			return (void *) e_folder_get_highlighted (folder);
 	}
@@ -1988,7 +2013,7 @@ e_storage_set_view_set_current_folder (EStorageSetView *storage_set_view,
 		return;
 	}
 
-	e_tree_show_node (E_TREE(storage_set_view), node);
+	e_tree_show_node (E_TREE (storage_set_view), node);
 	e_tree_set_cursor (E_TREE (storage_set_view), node);
 
 	gtk_signal_emit (GTK_OBJECT (storage_set_view), signals[FOLDER_SELECTED], path);