Replaced g_error with g_warning when registry activation fails.

Bug #346393.

git-svn-id: http://svn.gnome.org/svn/at-spi/trunk@837 e2bd861d-eb25-0410-b326-f6ed22b6b98c

diff --git a/ChangeLog b/ChangeLog
index de07fdf..c96820d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-07-13  Bill Haneman <billh@gnome.org> modifications to patch from
+
+       * cspi/bonobo/cspi-bonobo.c:
+       (cspi_init): Replace g_error with g_warning, prevent
+       SEGV if the registry cannot be activated. Bug #346393.
+       
 2006-07-12  Bill Haneman <billh@gnome.org> modifications to patch from
 
        * po/LINGUAS: put LINGUAS where it belongs. Fixes i18n.

diff --git a/cspi/bonobo/cspi-bonobo.c b/cspi/bonobo/cspi-bonobo.c
index 573d957..d4029f9 100644 (file)
--- a/cspi/bonobo/cspi-bonobo.c
+++ b/cspi/bonobo/cspi-bonobo.c
@@ -144,7 +144,7 @@ cspi_init (void)
 
   if (registry == CORBA_OBJECT_NIL)
     {
-      g_error ("Could not locate registry");
+      g_warning ("Could not locate registry");
     }
 
   bonobo_activate ();