Removed spurious calendar directories from the include path. Added

2000-04-16  Federico Mena Quintero  <federico@helixcode.com>

	* Makefile.am (INCLUDES): Removed spurious calendar directories
	from the include path.  Added "wombat" log domain for glib.
	(wombat_LDADD): Link libpcs.a instead of the old shared library.

	* wombat.c: cal-factory.h is an internal include file.  * wombat.c
	(setup_pcs): We should NOT share a CORBA_environment across all
	functions!  Use our own CORBA_environment.
	(init_bonobo): Use our own CORBA_environment.  Free the exception
	after initializing GOAD, and present some error messages if
	necessary.  (Should g_message()s for exceptional situations be
	marked for translation?).

svn path=/trunk/; revision=2462

3 files changed, 38 insertions, 14 deletions

diff --git a/wombat/ChangeLog b/wombat/ChangeLog
index a93b270091..3a0d938fb6 100644
--- a/wombat/ChangeLog
+++ b/wombat/ChangeLog
@@ -1,3 +1,17 @@
+2000-04-16  Federico Mena Quintero  <federico@helixcode.com>
+
+	* Makefile.am (INCLUDES): Removed spurious calendar directories
+	from the include path.  Added "wombat" log domain for glib.
+	(wombat_LDADD): Link libpcs.a instead of the old shared library.
+
+	* wombat.c: cal-factory.h is an internal include file.  * wombat.c
+	(setup_pcs): We should NOT share a CORBA_environment across all
+	functions!  Use our own CORBA_environment.
+	(init_bonobo): Use our own CORBA_environment.  Free the exception
+	after initializing GOAD, and present some error messages if
+	necessary.  (Should g_message()s for exceptional situations be
+	marked for translation?).
+
 2000-04-15  Ettore Perazzoli  <ettore@helixcode.com>
 
 	* Makefile.am (INCLUDES): Added
diff --git a/wombat/Makefile.am b/wombat/Makefile.am
index 2282981673..f4bbf1a87c 100644
--- a/wombat/Makefile.am
+++ b/wombat/Makefile.am
@@ -1,13 +1,12 @@
 INCLUDES =						\
 	$(EXTRA_GNOME_CFLAGS)				\
 	$(GNOME_INCLUDEDIR)				\
+	-DG_LOG_DOMAIN=\"wombat\"			\
 	-I$(top_srcdir)/e-util				\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/addressbook/backend/pas		\
 	-I$(top_builddir)/addressbook/backend/pas	\
-	-I$(top_srcdir)/calendar/pcs			\
-	-I$(top_builddir)/calendar/pcs			\
-	-I$(top_srcdir)/calendar/cal-util		\
+	-I$(top_srcdir)/calendar			\
 	-DEVOLUTION_VERSION=\""$(VERSION)"\"		\
 	-DEVOLUTION_LOCALEDIR=\""$(datadir)/locale"\"
 
@@ -22,9 +21,9 @@ wombat_LDADD =							\
 	$(BONOBO_VFS_GNOME_LIBS)				\
 	$(top_builddir)/addressbook/backend/pas/libpas.la	\
 	$(top_builddir)/addressbook/backend/ebook/libebook.la	\
-	$(top_builddir)/calendar/pcs/libpcs.la			\
+	$(top_builddir)/calendar/pcs/libpcs.a			\
 	$(top_builddir)/libical/src/libical/libical.la		\
-	$(top_builddir)/calendar/cal-util/libcalutil.la		\
+	$(top_builddir)/calendar/cal-util/libcal-util.la	\
 	$(top_builddir)/libversit/libversit.la			\
 	$(top_builddir)/e-util/libeutil.la			\
 	-lgnomevfs						\
diff --git a/wombat/wombat.c b/wombat/wombat.c
index 24cae9713c..1d703e3833 100644
--- a/wombat/wombat.c
+++ b/wombat/wombat.c
@@ -1,6 +1,6 @@
-/*
- * Author:
- *   Nat Friedman (nat@helixcode.com)
+/* Wombat personal information server - main file
+ *
+ * Author: Nat Friedman <nat@helixcode.com>
  *
  * Copyright 2000, Helix Code, Inc.
  */
@@ -14,10 +14,8 @@
 #endif
 #include <libgnomevfs/gnome-vfs-init.h>
 #include <libgnorba/gnorba.h>
-#include <cal-factory.h>
-#include <calobj.h>
+#include "calendar/pcs/cal-factory.h"
 
-CORBA_Environment ev;
 CORBA_ORB orb;
 
 static void
@@ -43,8 +41,9 @@ static void
 setup_pcs (int argc, char **argv)
 {
 	CalFactory *factory;
-	int result;
 	CORBA_Object object;
+	CORBA_Environment ev;
+	int result;
 
 	factory = cal_factory_new ();
 
@@ -103,16 +102,28 @@ setup_vfs (int argc, char **argv)
 static void
 init_bonobo (int argc, char **argv)
 {
+	CORBA_Environment ev;
+
 	CORBA_exception_init (&ev);
 
 	gnome_CORBA_init_with_popt_table (
 		"Personal Addressbook Server", "0.0",
 		&argc, argv, NULL, 0, NULL, GNORBA_INIT_SERVER_FUNC, &ev);
 
+	if (ev._major != CORBA_NO_EXCEPTION) {
+		g_message ("init_bonobo(): could not initialize GOAD");
+		CORBA_exception_free (&ev);
+		exit (1);
+	}
+
+	CORBA_exception_free (&ev);
+
 	orb = gnome_CORBA_ORB ();
 
-	if (bonobo_init (orb, NULL, NULL) == FALSE)
-		g_error (_("Could not initialize Bonobo"));
+	if (!bonobo_init (orb, NULL, NULL)) {
+		g_message ("init_bonobo(): could not initialize Bonobo");
+		exit (1);
+	}
 }
 
 int