aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Winship <danw@src.gnome.org>2002-03-25 23:40:15 +0800
committerDan Winship <danw@src.gnome.org>2002-03-25 23:40:15 +0800
commit8e70cce274c49ff3b60050cf2fd94d9a01a1bbd6 (patch)
tree553aed72d067abf12d28ba6be2ed45e82e7081b6
parent60bccda4394c4163e10a97dfd6037e7b4468ee3f (diff)
downloadgsoc2013-evolution-8e70cce274c49ff3b60050cf2fd94d9a01a1bbd6.tar.gz
gsoc2013-evolution-8e70cce274c49ff3b60050cf2fd94d9a01a1bbd6.tar.zst
gsoc2013-evolution-8e70cce274c49ff3b60050cf2fd94d9a01a1bbd6.zip
Register a "working" folder type with the hourglass icon. (Would
* e-shell.c (e_shell_construct): Register a "working" folder type with the hourglass icon. (Would eventually like an animated gif, when ETable supports that.) * e-storage.c (e_storage_has_subfolders): Use "working" rather than "noselect" as the folder type. * e-shell-view.c (get_view_for_uri): Simplify a bit. svn path=/trunk/; revision=16244
-rw-r--r--shell/ChangeLog11
-rw-r--r--shell/e-shell-view.c2
-rw-r--r--shell/e-shell.c4
-rw-r--r--shell/e-storage.c2
4 files changed, 17 insertions, 2 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 670a27ac4b..50f2629688 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,14 @@
+2002-03-25 Dan Winship <danw@ximian.com>
+
+ * e-shell.c (e_shell_construct): Register a "working" folder type
+ with the hourglass icon. (Would eventually like an animated gif,
+ when ETable supports that.)
+
+ * e-storage.c (e_storage_has_subfolders): Use "working" rather
+ than "noselect" as the folder type.
+
+ * e-shell-view.c (get_view_for_uri): Simplify a bit.
+
2002-03-22 Ettore Perazzoli <ettore@ximian.com>
* e-shell-settings-dialog.c (get_language_list): Removed.
diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c
index c7e68613eb..165c9800b2 100644
--- a/shell/e-shell-view.c
+++ b/shell/e-shell-view.c
@@ -2069,7 +2069,7 @@ get_view_for_uri (EShellView *shell_view,
return NULL;
folder_type = get_type_for_folder (shell_view, path, &physical_uri);
- if (folder_type == NULL || strcmp (folder_type, "noselect") == 0)
+ if (folder_type == NULL || physical_uri == NULL)
return NULL;
folder_type_registry = e_shell_get_folder_type_registry (e_shell_view_get_shell (shell_view));
diff --git a/shell/e-shell.c b/shell/e-shell.c
index 8330566b4b..8b1763f437 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -1101,6 +1101,10 @@ e_shell_construct (EShell *shell,
"noselect", "empty.gif",
"noselect", "", FALSE,
0, NULL, 0, NULL);
+ e_folder_type_registry_register_type (priv->folder_type_registry,
+ "working", "working-16.png",
+ "working", "", FALSE,
+ 0, NULL, 0, NULL);
/* CORBA storages must be set up before the components, because otherwise components
cannot register their own storages. */
diff --git a/shell/e-storage.c b/shell/e-storage.c
index fa32203d7f..7dbe977352 100644
--- a/shell/e-storage.c
+++ b/shell/e-storage.c
@@ -663,7 +663,7 @@ e_storage_has_subfolders (EStorage *storage,
/* FIXME: close parent */
}
- pseudofolder = e_folder_new (message, "noselect", "");
+ pseudofolder = e_folder_new (message, "working", "");
if (strcmp (path, "/") == 0)
pseudofolder_path = g_strdup_printf ("/%s", message);
else