diff options
| -rw-r--r-- | wombat/ChangeLog | 4 | ||||
| -rw-r--r-- | wombat/wombat.c | 23 |
2 files changed, 8 insertions, 19 deletions
diff --git a/wombat/ChangeLog b/wombat/ChangeLog index c614d6463d..0cfe6e58e5 100644 --- a/wombat/ChangeLog +++ b/wombat/ChangeLog @@ -1,3 +1,7 @@ +2002-11-07 Rodrigo Moya <rodrigo@ximian.com> + + * wombat.c: re-enabled calendar parts. + 2002-11-06 Chris Toshok <toshok@ximian.com> * Makefile.am (wombat_LDADD): remove libcamel.la from the link for diff --git a/wombat/wombat.c b/wombat/wombat.c index d742b9d6ce..e1fd04e130 100644 --- a/wombat/wombat.c +++ b/wombat/wombat.c @@ -19,7 +19,6 @@ #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> @@ -29,10 +28,8 @@ #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" @@ -43,9 +40,7 @@ /* The and addressbook calendar factories */ -#ifdef PENDING_PORT_WORK static CalFactory *cal_factory; -#endif static PASBookFactory *pas_book_factory; @@ -66,9 +61,7 @@ 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 (); @@ -128,7 +121,6 @@ setup_pas (int argc, char **argv) -#ifdef PENDING_PORT_WORK /* Personal calendar server */ /* Callback used when the calendar factory has no more running backends */ @@ -157,14 +149,13 @@ setup_pcs (int argc, char **argv) return FALSE; } - gtk_signal_connect (GTK_OBJECT (cal_factory), - "last_calendar_gone", - GTK_SIGNAL_FUNC (last_calendar_gone_cb), - NULL); + g_signal_connect (G_OBJECT (cal_factory), + "last_calendar_gone", + G_CALLBACK (last_calendar_gone_cb), + NULL); return TRUE; } -#endif @@ -206,9 +197,7 @@ 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; @@ -225,12 +214,10 @@ 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); } @@ -238,10 +225,8 @@ 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; |