diff options
| author | Peter Williams <peterw@ximian.com> | 2001-05-26 12:59:00 +0800 |
|---|---|---|
| committer | Peter Williams <peterw@src.gnome.org> | 2001-05-26 12:59:00 +0800 |
| commit | a58c7b50e9a4b2d03763eff154b47a47e3398d11 (patch) | |
| tree | 213b3dde4689c5aa95a2ba7d14e7a66ba90de62d /shell/evolution-storage.c | |
| parent | c6c02db6022e3a702c096d3f7cbc34af8cf68342 (diff) | |
| download | gsoc2013-evolution-a58c7b50e9a4b2d03763eff154b47a47e3398d11.tar gsoc2013-evolution-a58c7b50e9a4b2d03763eff154b47a47e3398d11.tar.gz gsoc2013-evolution-a58c7b50e9a4b2d03763eff154b47a47e3398d11.tar.bz2 gsoc2013-evolution-a58c7b50e9a4b2d03763eff154b47a47e3398d11.tar.lz gsoc2013-evolution-a58c7b50e9a4b2d03763eff154b47a47e3398d11.tar.xz gsoc2013-evolution-a58c7b50e9a4b2d03763eff154b47a47e3398d11.tar.zst gsoc2013-evolution-a58c7b50e9a4b2d03763eff154b47a47e3398d11.zip | |
Reference libeshell.la instead of libeshell.a.
2001-05-25 Peter Williams <peterw@ximian.com>
* gui/component/Makefile.am: Reference libeshell.la instead of libeshell.a.
2001-05-25 Peter Williams <peterw@ximian.com>
* gui/Makefile.am: Reference libeshell.la instead of libeshell.a.
2001-05-25 Peter Williams <peterw@ximian.com>
* component/Makefile.am: Reference libeshell.la instead of libeshell.a.
2001-05-25 Peter Williams <peterw@ximian.com>
* Makefile.am: Reference libeshell.la instead of libeshell.a.
2001-05-25 Peter Williams <peterw@ximian.com>
* Makefile.am: Change libeshell from a noinst_LIBRARIES to
a lib_LTLIBRARIES. Install its headers in
$includedir/evolution/shell.
* evolution-storage.c (safe_corba_string): New, copy of e_safe_corba_string
in libeutil. This way libeshell doesn't have a missing symbol when programs
that don't have libeutil link to it.
(evolution_storage_register): s,e_safe_corba_string,safe_corba_string,g.
svn path=/trunk/; revision=10007
Diffstat (limited to 'shell/evolution-storage.c')
| -rw-r--r-- | shell/evolution-storage.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/shell/evolution-storage.c b/shell/evolution-storage.c index 20b4372cd5..e965c71a2a 100644 --- a/shell/evolution-storage.c +++ b/shell/evolution-storage.c @@ -33,8 +33,6 @@ #include "Evolution.h" -#include "e-util/e-corba-utils.h" - #include "e-folder-tree.h" #include "evolution-storage.h" @@ -75,6 +73,15 @@ static guint signals[LAST_SIGNAL] = { 0 }; /* Utility functions. */ +static const CORBA_char * +safe_corba_string (const char *s) +{ + if (s == NULL) + return (CORBA_char *) ""; + + return s; +} + static void list_through_listener_foreach (EFolderTree *tree, const char *path, @@ -611,8 +618,8 @@ evolution_storage_register (EvolutionStorage *evolution_storage, corba_storage_listener = GNOME_Evolution_StorageRegistry_addStorage (corba_storage_registry, corba_storage, priv->name, - e_safe_corba_string (priv->toplevel_node_uri), - e_safe_corba_string (priv->toplevel_node_type), + safe_corba_string (priv->toplevel_node_uri), + safe_corba_string (priv->toplevel_node_type), &ev); if (ev._major == CORBA_NO_EXCEPTION) { |