aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--wombat/ChangeLog5
-rw-r--r--wombat/wombat.c22
2 files changed, 20 insertions, 7 deletions
diff --git a/wombat/ChangeLog b/wombat/ChangeLog
index 532d53489a..d1045a0f45 100644
--- a/wombat/ChangeLog
+++ b/wombat/ChangeLog
@@ -1,3 +1,8 @@
+2001-03-26 Kjartan Maraas <kmaraas@gnome.org>
+
+ * wombat.c: Replace <gnome.h> <and <bonobo.h> includes
+ and add <stdlib.h> to remove warnings from newer gcc.
+
2001-03-21 JP Rosevear <jpr@ximian.com>
* Makefile.am: add wombat-moniker.h as a source so it gets disted
diff --git a/wombat/wombat.c b/wombat/wombat.c
index f5baae4610..5c40b0530a 100644
--- a/wombat/wombat.c
+++ b/wombat/wombat.c
@@ -5,21 +5,29 @@
* Copyright 2000, Helix Code, Inc.
*/
+#ifdef HAVE_CONFIG_H
#include <config.h>
-#include <gnome.h>
-#include <bonobo.h>
+#endif
+
+#include <stdlib.h>
+#include <glib.h>
+#include <libgnome/gnome-defs.h>
+#include <libgnome/gnome-i18n.h>
+#include <libgnomeui/gnome-init.h>
#include <liboaf/liboaf.h>
-#include <pas/pas-book-factory.h>
-#include <pas/pas-backend-file.h>
#include <libgnomevfs/gnome-vfs-init.h>
+#include <bonobo/bonobo-main.h>
-#ifdef HAVE_LDAP
-#include <pas/pas-backend-ldap.h>
-#endif
+#include "pas/pas-book-factory.h"
+#include "pas/pas-backend-file.h"
#include "calendar/pcs/cal-factory.h"
#include "calendar/pcs/cal-backend-file.h"
+#ifdef HAVE_LDAP
+#include "pas/pas-backend-ldap.h"
+#endif
+
#include "wombat-moniker.h"
/* The and addressbook calendar factories */