From 385ba85d425e59a0a254abef620a90bd563cdeb8 Mon Sep 17 00:00:00 2001 From: Jason Leach Date: Fri, 3 Aug 2001 23:08:38 +0000 Subject: [Removing Evolution::LocalStorage interface, abstracting the unread counts 2001-08-03 Jason Leach [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 * 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 --- shell/e-shortcuts-view.c | 48 +++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 45 insertions(+), 3 deletions(-) (limited to 'shell/e-shortcuts-view.c') diff --git a/shell/e-shortcuts-view.c b/shell/e-shortcuts-view.c index ecc2b1487e..a1de0689ce 100644 --- a/shell/e-shortcuts-view.c +++ b/shell/e-shortcuts-view.c @@ -103,7 +103,6 @@ icon_callback (EShortcutBar *shortcut_bar, storage_set = e_shortcuts_get_storage_set (shortcuts); folder_type_registry = e_storage_set_get_folder_type_registry (storage_set); - folder = e_storage_set_get_folder (storage_set, get_storage_set_path_from_uri (uri)); @@ -461,8 +460,9 @@ rename_shortcut_cb (GtkWidget *widget, if (new_name == NULL) return; + e_shortcuts_update_shortcut (shortcuts, menu_data->group_num, menu_data->item_num, - shortcut_item->uri, new_name, shortcut_item->type); + shortcut_item->uri, new_name, shortcut_item->unread_count, shortcut_item->type); g_free (new_name); } @@ -560,6 +560,24 @@ item_selected (EShortcutBar *shortcut_bar, shortcuts, shortcut_item->uri, FALSE); } +static EFolder * +get_efolder_from_shortcut (EShortcuts *shortcuts, + char *item_url) +{ + EFolderTypeRegistry *folder_type_registry; + EStorageSet *storage_set; + EFolder *folder; + char *path; + + path = strchr (item_url, G_DIR_SEPARATOR); + storage_set = e_shortcuts_get_storage_set (shortcuts); + folder_type_registry = e_storage_set_get_folder_type_registry (storage_set); + + folder = e_storage_set_get_folder (storage_set, path); + + return folder; +} + static void impl_shortcut_dropped (EShortcutBar *shortcut_bar, int group_num, @@ -569,11 +587,35 @@ impl_shortcut_dropped (EShortcutBar *shortcut_bar, { EShortcutsView *shortcuts_view; EShortcutsViewPrivate *priv; + EFolder *folder; + int unread_count; + const char *type; + char *tmp; + char *tp; + char *name_without_unread; shortcuts_view = E_SHORTCUTS_VIEW (shortcut_bar); priv = shortcuts_view->priv; - e_shortcuts_add_shortcut (priv->shortcuts, group_num, position, item_url, NULL, NULL); + folder = get_efolder_from_shortcut (priv->shortcuts, item_url); + + unread_count = e_folder_get_unread_count (folder); + type = e_folder_get_type_string (folder); + + /* Looks funny, but keeps it from adding the unread count + repeatedly when dragging folders around */ + tmp = g_strdup_printf (" (%d)", unread_count); + if ((tp = strstr (item_name, tmp)) != NULL) + name_without_unread = g_strndup (item_name, strlen (item_name) - strlen (tp)); + else + name_without_unread = g_strdup (item_name); + + e_shortcuts_add_shortcut (priv->shortcuts, + group_num, position, + item_url, name_without_unread, unread_count, type); + + g_free (tmp); + g_free (name_without_unread); } static void -- cgit v1.2.3