diff options
| -rw-r--r-- | wombat/ChangeLog | 10 | ||||
| -rw-r--r-- | wombat/wombat.c | 18 |
2 files changed, 26 insertions, 2 deletions
diff --git a/wombat/ChangeLog b/wombat/ChangeLog index d9536c2e91..c614d6463d 100644 --- a/wombat/ChangeLog +++ b/wombat/ChangeLog @@ -1,3 +1,13 @@ +2002-11-06 Chris Toshok <toshok@ximian.com> + + * Makefile.am (wombat_LDADD): remove libcamel.la from the link for + the time being. + + * wombat.c: ifdef out (#ifdef PENDING_PORT_WORK) the calendar + stuff, since it doesn't link at the moment - undefined symbols in + pcs. Also, include gtk.h so the gtk_* in the calendar portions + will still work. + 2002-11-05 Chris Toshok <toshok@ximian.com> * Makefile.am: change over from .oaf files to .server files and diff --git a/wombat/wombat.c b/wombat/wombat.c index c2ae20afc9..d742b9d6ce 100644 --- a/wombat/wombat.c +++ b/wombat/wombat.c @@ -19,6 +19,7 @@ #endif #include <glib.h> +#include <gtk.h> /* XXX needed only until the calendar switches to straight GObject's for their backend */ #include <libgnome/gnome-init.h> #include <bonobo-activation/bonobo-activation.h> #include <libgnomevfs/gnome-vfs-init.h> @@ -28,8 +29,10 @@ #include "pas/pas-book-factory.h" #include "pas/pas-backend-file.h" +#ifdef PENDING_PORT_WORK #include "calendar/pcs/cal-factory.h" #include "calendar/pcs/cal-backend-file.h" +#endif #ifdef HAVE_LDAP #include "pas/pas-backend-ldap.h" @@ -40,7 +43,9 @@ /* The and addressbook calendar factories */ +#ifdef PENDING_PORT_WORK static CalFactory *cal_factory; +#endif static PASBookFactory *pas_book_factory; @@ -61,7 +66,9 @@ static gboolean termination_handler (gpointer data) { if ( +#ifdef PENDING_PORT_WORK cal_factory_get_n_backends (cal_factory) == 0 && +#endif pas_book_factory_get_n_backends (pas_book_factory) == 0) { fprintf (stderr, "termination_handler(): Terminating the Wombat. Have a nice day.\n"); gtk_main_quit (); @@ -111,7 +118,7 @@ setup_pas (int argc, char **argv) NULL); if (!pas_book_factory_activate (pas_book_factory, PAS_BOOK_FACTORY_OAF_ID)) { - bonboo_object_unref (BONOBO_OBJECT (pas_book_factory)); + bonobo_object_unref (BONOBO_OBJECT (pas_book_factory)); pas_book_factory = NULL; return FALSE; } @@ -121,6 +128,7 @@ setup_pas (int argc, char **argv) +#ifdef PENDING_PORT_WORK /* Personal calendar server */ /* Callback used when the calendar factory has no more running backends */ @@ -156,6 +164,7 @@ setup_pcs (int argc, char **argv) return TRUE; } +#endif @@ -197,7 +206,9 @@ main (int argc, char **argv) G_LOG_LEVEL_WARNING);*/ if (!( (did_pas = setup_pas (argc, argv)) +#ifdef PENDING_PORT_WORK && (did_pcs = setup_pcs (argc, argv)) +#endif )) { const gchar *failed = NULL; @@ -214,11 +225,12 @@ main (int argc, char **argv) pas_book_factory = NULL; } +#ifdef PENDING_PORT_WORK if (cal_factory) { bonobo_object_unref (BONOBO_OBJECT (cal_factory)); cal_factory = NULL; } - +#endif exit (EXIT_FAILURE); } @@ -226,8 +238,10 @@ main (int argc, char **argv) bonobo_main (); +#if PENDING_PORT_WORK bonobo_object_unref (BONOBO_OBJECT (cal_factory)); cal_factory = NULL; +#endif bonobo_object_unref (BONOBO_OBJECT (pas_book_factory)); pas_book_factory = NULL; |