diff options
| author | Ettore Perazzoli <ettore@src.gnome.org> | 2001-04-04 01:23:17 +0800 |
|---|---|---|
| committer | Ettore Perazzoli <ettore@src.gnome.org> | 2001-04-04 01:23:17 +0800 |
| commit | 785567b9191e01e1875139c9d91a2c58f913af33 (patch) | |
| tree | f6c07a330b997c4540bfad77025a151b15c50872 | |
| parent | d5dc15ddf0ff2a0e5a08887f740d6e009de1024a (diff) | |
| download | gsoc2013-evolution-785567b9191e01e1875139c9d91a2c58f913af33.tar.gz gsoc2013-evolution-785567b9191e01e1875139c9d91a2c58f913af33.tar.zst gsoc2013-evolution-785567b9191e01e1875139c9d91a2c58f913af33.zip | |
Merge fix for #1117 (g-warning being emitted when clicking on storage
nodes) from evolution-0-10-branch.
svn path=/trunk/; revision=9135
| -rw-r--r-- | shell/ChangeLog | 9 | ||||
| -rw-r--r-- | shell/e-corba-storage-registry.c | 5 | ||||
| -rw-r--r-- | shell/e-shell-view.c | 2 |
3 files changed, 15 insertions, 1 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index bce6012b7d..e8272e2dfe 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,5 +1,14 @@ 2001-04-03 Ettore Perazzoli <ettore@ximian.com> + * e-shell-view.c (get_control_for_uri): Change `! folder_type' + with `folder_type == NULL'. + + * e-corba-storage-registry.c (impl_StorageRegistry_addStorage): If + the toplevel node URI or the toplevel node type are an empty + string, use NULL Instead. + +2001-04-03 Ettore Perazzoli <ettore@ximian.com> + * e-shell-view.c: Fix bug #1878 "folder sometimes fails to display?". Thanks to Dan for finding out an explanation for the problem. diff --git a/shell/e-corba-storage-registry.c b/shell/e-corba-storage-registry.c index c740bbe9b5..e25907df68 100644 --- a/shell/e-corba-storage-registry.c +++ b/shell/e-corba-storage-registry.c @@ -87,6 +87,11 @@ impl_StorageRegistry_addStorage (PortableServer_Servant servant, storage_registry = E_CORBA_STORAGE_REGISTRY (bonobo_object); priv = storage_registry->priv; + if (toplevel_node_uri[0] == '\0') + toplevel_node_uri = NULL; + if (toplevel_node_type[0] == '\0') + toplevel_node_type = NULL; + storage = e_corba_storage_new (toplevel_node_uri, toplevel_node_type, storage_interface, diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c index 28fc43a761..07703f315a 100644 --- a/shell/e-shell-view.c +++ b/shell/e-shell-view.c @@ -1372,7 +1372,7 @@ get_control_for_uri (EShellView *shell_view, folder_type = get_type_for_storage (shell_view, path + 1, &physical_uri); else folder_type = get_type_for_folder (shell_view, path, &physical_uri); - if (!folder_type) + if (folder_type == NULL) return NULL; folder_type_registry = e_shell_get_folder_type_registry (e_shell_view_get_shell (shell_view)); |