[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, 15 insertions, 6 deletions

diff --git a/shell/e-folder.c b/shell/e-folder.c
index 86d2cf90f7..f582c9e40b 100644
--- a/shell/e-folder.c
+++ b/shell/e-folder.c
@@ -43,6 +43,7 @@ struct _EFolderPrivate {
 	char *physical_uri;
 	gboolean self_highlight;
 	int child_highlight;
+	int unread_count;
 };
 
 #define EF_CLASS(obj) \
@@ -149,6 +150,7 @@ init (EFolder *folder)
 	priv->physical_uri    = NULL;
 	priv->self_highlight  = FALSE;
 	priv->child_highlight = 0;
+	priv->unread_count    = 0;
 
 	folder->priv = priv;
 }
@@ -231,13 +233,22 @@ e_folder_get_physical_uri (EFolder *folder)
 	return folder->priv->physical_uri;
 }
 
+int
+e_folder_get_unread_count (EFolder *folder)
+{
+	g_return_val_if_fail (folder != NULL, FALSE);
+	g_return_val_if_fail (E_IS_FOLDER (folder), FALSE);
+
+	return folder->priv->unread_count;
+}
+
 gboolean
 e_folder_get_highlighted (EFolder *folder)
 {
 	g_return_val_if_fail (folder != NULL, FALSE);
 	g_return_val_if_fail (E_IS_FOLDER (folder), FALSE);
 
-	return folder->priv->self_highlight || folder->priv->child_highlight;
+	return folder->priv->child_highlight || folder->priv->unread_count;
 }
 
 
@@ -298,13 +309,13 @@ e_folder_set_physical_uri (EFolder *folder,
 }
 
 void
-e_folder_set_highlighted (EFolder *folder,
-			  gboolean highlighted)
+e_folder_set_unread_count (EFolder *folder,
+			   gint unread_count)
 {
 	g_return_if_fail (folder != NULL);
 	g_return_if_fail (E_IS_FOLDER (folder));
 
-	folder->priv->self_highlight = highlighted;
+	folder->priv->unread_count = unread_count;
 
 	gtk_signal_emit (GTK_OBJECT (folder), signals[CHANGED]);
 }
@@ -320,8 +331,6 @@ e_folder_set_child_highlight (EFolder *folder,
 		folder->priv->child_highlight++;
 	else
 		folder->priv->child_highlight--;
-
-	gtk_signal_emit (GTK_OBJECT (folder), signals[CHANGED]);
 }