aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Winship <danw@src.gnome.org>2002-03-07 07:33:35 +0800
committerDan Winship <danw@src.gnome.org>2002-03-07 07:33:35 +0800
commita3dfdc714c2d3b4663c1d7f2b07daf6e8a8940dc (patch)
tree8f53dd050288a3f5e814e4ac0de60cc30f9a3359
parent7324c70f4166344bf5dc071c3bc8bf3f76ded086 (diff)
downloadgsoc2013-evolution-a3dfdc714c2d3b4663c1d7f2b07daf6e8a8940dc.tar
gsoc2013-evolution-a3dfdc714c2d3b4663c1d7f2b07daf6e8a8940dc.tar.gz
gsoc2013-evolution-a3dfdc714c2d3b4663c1d7f2b07daf6e8a8940dc.tar.bz2
gsoc2013-evolution-a3dfdc714c2d3b4663c1d7f2b07daf6e8a8940dc.tar.lz
gsoc2013-evolution-a3dfdc714c2d3b4663c1d7f2b07daf6e8a8940dc.tar.xz
gsoc2013-evolution-a3dfdc714c2d3b4663c1d7f2b07daf6e8a8940dc.tar.zst
gsoc2013-evolution-a3dfdc714c2d3b4663c1d7f2b07daf6e8a8940dc.zip
Fix up GList/GSList confusion.
* e-corba-storage-registry.c (impl_StorageRegistry_removeListener): Fix up GList/GSList confusion. * e-shell-user-creatable-items-handler.c (get_default_action_for_view): Don't look into the types list if it's empty. svn path=/trunk/; revision=15954
-rw-r--r--shell/ChangeLog10
-rw-r--r--shell/e-corba-storage-registry.c4
-rw-r--r--shell/e-shell-user-creatable-items-handler.c3
3 files changed, 15 insertions, 2 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 4a952da502..e5f5f5983f 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,13 @@
+2002-03-06 Dan Winship <danw@ximian.com>
+
+ * e-corba-storage-registry.c
+ (impl_StorageRegistry_removeListener): Fix up GList/GSList
+ confusion.
+
+ * e-shell-user-creatable-items-handler.c
+ (get_default_action_for_view): Don't look into the types list if
+ it's empty.
+
2002-03-06 Ettore Perazzoli <ettore@ximian.com>
* e-shell-about-box.c: Reduce width of the copyright message so it
diff --git a/shell/e-corba-storage-registry.c b/shell/e-corba-storage-registry.c
index 4451f0751a..f528019f93 100644
--- a/shell/e-corba-storage-registry.c
+++ b/shell/e-corba-storage-registry.c
@@ -277,7 +277,7 @@ impl_StorageRegistry_removeListener (PortableServer_Servant servant,
ECorbaStorageRegistry *storage_registry;
ECorbaStorageRegistryPrivate *priv;
CORBA_Environment ev2;
- GList *p;
+ GSList *p;
bonobo_object = bonobo_object_from_servant (servant);
storage_registry = E_CORBA_STORAGE_REGISTRY (bonobo_object);
@@ -296,7 +296,7 @@ impl_StorageRegistry_removeListener (PortableServer_Servant servant,
CORBA_exception_free (&ev2);
priv->listeners = g_slist_remove_link (priv->listeners, p);
- g_list_free (p);
+ g_slist_free (p);
}
diff --git a/shell/e-shell-user-creatable-items-handler.c b/shell/e-shell-user-creatable-items-handler.c
index 1aa57ebcef..738475a06e 100644
--- a/shell/e-shell-user-creatable-items-handler.c
+++ b/shell/e-shell-user-creatable-items-handler.c
@@ -289,6 +289,9 @@ get_default_action_for_view (EShellUserCreatableItemsHandler *handler,
const char *component_id;
component = (const Component *) p->data;
+ if (component->type_list->_length == 0)
+ continue;
+
type = & component->type_list->_buffer[0];
component_id = evolution_shell_component_client_get_id (component->component_client);