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.c | 48 ++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 38 insertions(+), 10 deletions(-) (limited to 'shell/e-shortcuts.c') diff --git a/shell/e-shortcuts.c b/shell/e-shortcuts.c index 1aaf8edd52..04899064f2 100644 --- a/shell/e-shortcuts.c +++ b/shell/e-shortcuts.c @@ -126,6 +126,7 @@ static void make_dirty (EShortcuts *shortcuts); static EShortcutItem * shortcut_item_new (const char *uri, const char *name, + int unread_count, const char *type) { EShortcutItem *new; @@ -137,6 +138,7 @@ shortcut_item_new (const char *uri, new->uri = g_strdup (uri); new->name = g_strdup (name); new->type = g_strdup (type); + new->unread_count = unread_count; return new; } @@ -145,6 +147,7 @@ static gboolean shortcut_item_update (EShortcutItem *shortcut_item, const char *uri, const char *name, + int unread_count, const char *type) { gboolean changed = FALSE; @@ -166,6 +169,11 @@ shortcut_item_update (EShortcutItem *shortcut_item, changed = TRUE; } + if (shortcut_item->unread_count != unread_count) { + shortcut_item->unread_count = unread_count; + changed = FALSE; + } + if (shortcut_item->type == NULL || type == NULL || strcmp (shortcut_item->type, type) != 0) { g_free (shortcut_item->type); @@ -222,12 +230,24 @@ update_shortcut_and_emit_signal (EShortcuts *shortcuts, int num, const char *uri, const char *name, + int unread_count, const char *type) { - if (shortcut_item_update (shortcut_item, uri, name, type)) { + /* Only thing that changed was the unread count */ + if (shortcut_item->unread_count != unread_count + && !shortcut_item_update (shortcut_item, uri, name, unread_count, type)) { + gtk_signal_emit (GTK_OBJECT (shortcuts), signals[UPDATE_SHORTCUT], group_num, num); + return FALSE; + } + + /* Unread count is the same, but other stuff changed */ + else if (shortcut_item_update (shortcut_item, uri, name, unread_count, type)) { gtk_signal_emit (GTK_OBJECT (shortcuts), signals[UPDATE_SHORTCUT], group_num, num); return TRUE; - } else + } + + /* Nothing at all changed, return false only */ + else return FALSE; } @@ -311,7 +331,7 @@ load_shortcuts (EShortcuts *shortcuts, name = xmlGetProp (q, "name"); type = xmlGetProp (q, "type"); - shortcut_item = shortcut_item_new (uri, name, type); + shortcut_item = shortcut_item_new (uri, name, 0, type); shortcut_group->shortcuts = g_slist_prepend (shortcut_group->shortcuts, shortcut_item); @@ -376,8 +396,10 @@ save_shortcuts (EShortcuts *shortcuts, if (shortcut->name != NULL) xmlSetProp (shortcut_node, (xmlChar *) "name", shortcut->name); + if (shortcut->type != NULL) xmlSetProp (shortcut_node, (xmlChar *) "type", shortcut->type); + } } @@ -466,14 +488,16 @@ update_shortcuts_by_path (EShortcuts *shortcuts, shortcut_item = (EShortcutItem *) q->data; - if (strcmp (shortcut_item->uri, evolution_uri) == 0) + if (strcmp (shortcut_item->uri, evolution_uri) == 0) { changed = update_shortcut_and_emit_signal (shortcuts, shortcut_item, group_num, num, evolution_uri, shortcut_item->name, + e_folder_get_unread_count (folder), e_folder_get_type_string (folder)); + } } } @@ -923,6 +947,7 @@ e_shortcuts_add_shortcut (EShortcuts *shortcuts, int num, const char *uri, const char *name, + int unread_count, const char *type) { EShortcutsPrivate *priv; @@ -943,7 +968,7 @@ e_shortcuts_add_shortcut (EShortcuts *shortcuts, if (num == -1) num = g_slist_length (group->shortcuts); - item = shortcut_item_new (uri, name, type); + item = shortcut_item_new (uri, name, unread_count, type); group->shortcuts = g_slist_insert (group->shortcuts, item, num); @@ -958,6 +983,7 @@ e_shortcuts_update_shortcut (EShortcuts *shortcuts, int num, const char *uri, const char *name, + int unread_count, const char *type) { EShortcutItem *shortcut_item; @@ -967,7 +993,7 @@ e_shortcuts_update_shortcut (EShortcuts *shortcuts, shortcut_item = get_item (shortcuts, group_num, num); - update_shortcut_and_emit_signal (shortcuts, shortcut_item, group_num, num, uri, name, type); + update_shortcut_and_emit_signal (shortcuts, shortcut_item, group_num, num, uri, name, unread_count, type); make_dirty (shortcuts); } @@ -981,10 +1007,12 @@ e_shortcuts_add_default_group (EShortcuts *shortcuts) e_shortcuts_add_group (shortcuts, -1, _("Shortcuts")); - e_shortcuts_add_shortcut (shortcuts, 0, -1, "evolution:/local/Inbox", _("Inbox"), "mail"); - e_shortcuts_add_shortcut (shortcuts, 0, -1, "evolution:/local/Calendar", _("Calendar"), "calendar"); - e_shortcuts_add_shortcut (shortcuts, 0, -1, "evolution:/local/Tasks", _("Tasks"), "tasks"); - e_shortcuts_add_shortcut (shortcuts, 0, -1, "evolution:/local/Contacts", _("Contacts"), "contacts"); + /* FIXME: Inbox shortcut should point to something else for + people who won't care about using /Local Folders/Inbox */ + e_shortcuts_add_shortcut (shortcuts, 0, -1, "evolution:/local/Inbox", _("Inbox"), 0, "mail"); + e_shortcuts_add_shortcut (shortcuts, 0, -1, "evolution:/local/Calendar", _("Calendar"), 0, "calendar"); + e_shortcuts_add_shortcut (shortcuts, 0, -1, "evolution:/local/Tasks", _("Tasks"), 0, "tasks"); + e_shortcuts_add_shortcut (shortcuts, 0, -1, "evolution:/local/Contacts", _("Contacts"), 0, "contacts"); } void -- cgit v1.2.3