GNOME.org
 

[gnome-pilot] 2009-08-20 Matt Davey <mcdavey mrao cam ac uk>

commit adef1b21554fa2b4397a5f0e9e2988ad4e9f2555
Author: Matt Davey <mcdavey mrao cam ac uk>
Date:   Thu Aug 20 22:24:17 2009 +0100

    2009-08-20  Matt Davey  <mcdavey mrao cam ac uk>
    	* Makefile.am: Remove obsolete references to compiler-flags.m4,
    		which used to be in the old gnome macros/ directory.
    		This is superceded by gnome-compiler-flags.m4 from
    		gnome-common.  This might be a problem for tarball
    		users, so we might need to copy the macro.
    	* Fix signedness compiler warnings, and remove blanket
    	     gnome/ includes.  #590215

 ChangeLog                                  |   55 +++
 Makefile.am                                |    1 -
 applet/pilot.c                             |   10 +-
 capplet/gnome-pilot-capplet.c              |    1 +
 capplet/gnome-pilot-capplet.h              |    1 -
 capplet/gnome-pilot-cdialog.h              |    6 +-
 capplet/gnome-pilot-ddialog.h              |    6 +-
 capplet/gnome-pilot-druid.c                |    3 +
 capplet/gnome-pilot-druid.h                |    1 -
 capplet/gnome-pilot-pdialog.h              |    6 +-
 capplet/gpilotd-control-applet.c           |    2 +-
 capplet/pilot.c                            |    3 +-
 capplet/util.c                             |    3 +-
 capplet/util.h                             |    1 -
 conduits/backup/backup_conduit.c           |    9 +-
 conduits/file/file_conduit.c               |    4 +-
 conduits/file/gpilot_install_file.c        |    4 +-
 conduits/test/test_conduit.c               |    2 -
 drafts/idl/main.c                          |    1 -
 drafts/idl/orbit-daemon-glue.c             |    2 +-
 drafts/idl/test_client.c                   |    2 +-
 gpilot-fileman/fileman.c                   |    1 -
 gpilot-fileman/gpilot-fileman.h            |    1 -
 gpilot-fileman/multifile.c                 |    1 -
 gpilot-fileman/preferences.c               |    1 -
 gpilotd/gnome-pilot-client.gob             |   10 +-
 gpilotd/gnome-pilot-conduit-backup.gob     |    2 -
 gpilotd/gnome-pilot-conduit-config.gob     |    1 +
 gpilotd/gnome-pilot-conduit-file.gob       |    2 -
 gpilotd/gnome-pilot-conduit-management.gob |   54 ++-
 gpilotd/gnome-pilot-conduit-standard-abs.c |    3 +-
 gpilotd/gnome-pilot-conduit-standard-abs.h |    1 -
 gpilotd/gnome-pilot-conduit-standard.gob   |    2 -
 gpilotd/gnome-pilot-conduit-sync-abs.c     |    2 +-
 gpilotd/gnome-pilot-conduit-sync-abs.h     |    1 -
 gpilotd/gnome-pilot-conduit.gob            |    3 +-
 gpilotd/gnome-pilot-structures.c           |   11 +-
 gpilotd/gpilot-gui.c                       |    4 +-
 gpilotd/gpilotd-conduit-mgmt.h             |    1 -
 gpilotd/gpilotd-session-wrapper.c          |    1 -
 gpilotd/gpilotd.c                          |   30 +-
 gpilotd/manager.c                          |    3 +-
 gpilotd/orbit_daemon_glue.c                |    4 +-
 gpilotd/queue_io.c                         |    3 +-
 po/cat-id-tbl.c                            |  702 ----------------------------
 utils/gpilotd-client.c                     |    2 +-
 utils/gpilotdcm-client.c                   |    3 +-
 utils/make-password.c                      |    2 +-
 48 files changed, 166 insertions(+), 808 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index a224baa..ffb29ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,58 @@
+2009-08-20  Matt Davey  <mcdavey mrao cam ac uk>
+	* Makefile.am: Remove obsolete references to compiler-flags.m4,
+		which used to be in the old gnome macros/ directory.
+		This is superceded by gnome-compiler-flags.m4 from
+		gnome-common.  This might be a problem for tarball
+		users, so we might need to copy the macro.
+	* Fix signedness compiler warnings, and remove blanket
+	     gnome/ includes.  #590215
+	* applet/pilot.c: ditto
+	* capplet/gnome-pilot-capplet.c: ditto
+	* capplet/gnome-pilot-capplet.h: ditto
+	* capplet/gnome-pilot-cdialog.h: ditto
+	* capplet/gnome-pilot-ddialog.h: ditto
+	* capplet/gnome-pilot-druid.c: ditto
+	* capplet/gnome-pilot-druid.h: ditto
+	* capplet/gnome-pilot-pdialog.h: ditto
+	* capplet/gpilotd-control-applet.c: ditto
+	* capplet/pilot.c: ditto
+	* capplet/util.c: ditto
+	* capplet/util.h: ditto
+	* conduits/backup/backup_conduit.c: ditto
+	* conduits/file/file_conduit.c: ditto
+	* conduits/file/gpilot_install_file.c: ditto
+	* conduits/test/test_conduit.c: ditto
+	* drafts/idl/main.c: ditto
+	* drafts/idl/orbit-daemon-glue.c: ditto
+	* drafts/idl/test_client.c: ditto
+	* gpilot-fileman/fileman.c: ditto
+	* gpilot-fileman/gpilot-fileman.h: ditto
+	* gpilot-fileman/multifile.c: ditto
+	* gpilot-fileman/preferences.c: ditto
+	* gpilotd/gnome-pilot-client.gob: ditto
+	* gpilotd/gnome-pilot-conduit-backup.gob: ditto
+	* gpilotd/gnome-pilot-conduit-config.gob: ditto
+	* gpilotd/gnome-pilot-conduit-file.gob: ditto
+	* gpilotd/gnome-pilot-conduit-management.gob: ditto
+	* gpilotd/gnome-pilot-conduit-standard-abs.c: ditto
+	* gpilotd/gnome-pilot-conduit-standard-abs.h: ditto
+	* gpilotd/gnome-pilot-conduit-standard.gob: ditto
+	* gpilotd/gnome-pilot-conduit-sync-abs.c: ditto
+	* gpilotd/gnome-pilot-conduit-sync-abs.h: ditto
+	* gpilotd/gnome-pilot-conduit.gob: ditto
+	* gpilotd/gnome-pilot-structures.c: ditto
+	* gpilotd/gpilot-gui.c: ditto
+	* gpilotd/gpilotd-conduit-mgmt.h: ditto
+	* gpilotd/gpilotd-session-wrapper.c: ditto
+	* gpilotd/gpilotd.c: ditto
+	* gpilotd/manager.c: ditto
+	* gpilotd/orbit_daemon_glue.c: ditto
+	* gpilotd/queue_io.c: ditto
+	* po/cat-id-tbl.c: ditto
+	* utils/gpilotd-client.c: ditto
+	* utils/gpilotdcm-client.c: ditto
+	* utils/make-password.c: ditto
+
 2009-08-06  Matt Davey  <mcdavey mrao cam ac uk>
 	* COPYING: Added a COPYING file for GPLv2 #590232
 	* .gitignore: Added .gitignore #590230
diff --git a/Makefile.am b/Makefile.am
index 1cd1c23..0e45b6f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,7 +31,6 @@ changelogs =				\
 
 EXTRA_DIST=			\
 	$(changelogs)		\
-	macros/compiler-flags.m4 \
 	macros/gob2.m4		\
 	conduit.mk		\
 	server.mk		\
diff --git a/applet/pilot.c b/applet/pilot.c
index d16d85f..42c2867 100644
--- a/applet/pilot.c
+++ b/applet/pilot.c
@@ -27,9 +27,13 @@
 #include <sys/types.h>
 #include <fcntl.h>
 #include <errno.h>
-#include <gnome.h>
 #include <glade/glade.h>
 #include <gtk/gtk.h>
+#include <libgnome/gnome-util.h>
+#include <libgnomeui/gnome-about.h>
+#include <libgnomeui/gnome-dialog.h>
+#include <libgnomeui/gnome-dialog-util.h>
+#include <libgnomeui/gnome-messagebox.h>
 #include <panel-applet-gconf.h>
 
 #include <signal.h>
@@ -628,7 +632,7 @@ restore_cb (BonoboUIComponent *uic, gpointer user_data, const gchar *verbname)
 	PilotApplet *applet = user_data;
 	int handle,i;
 	gchar *pilot_name;
-	gint pilot_id;
+	guint pilot_id;
 	GladeXML *xml;
 	GtkWidget *dir_entry, *id_entry,*frame;
 	GtkWidget *device_menu, *menu_item,*menu;
@@ -1302,7 +1306,7 @@ dnd_drop_internal (GtkWidget        *widget,
 	switch (info)
 	{
 	case TARGET_URI_LIST:
-		names = extract_uris (selection_data->data);
+		names = extract_uris ((gchar *) selection_data->data);
 		for (idx=0; names[idx]; idx++) {
 			/*
 			  if (strstr (file_type (ptr),"text")) {
diff --git a/capplet/gnome-pilot-capplet.c b/capplet/gnome-pilot-capplet.c
index 8f62ff8..6417f92 100644
--- a/capplet/gnome-pilot-capplet.c
+++ b/capplet/gnome-pilot-capplet.c
@@ -29,6 +29,7 @@
 
 #include <sys/stat.h>
 #include <glade/glade.h>
+#include <libgnomeui/gnome-app-helper.h>
 #include "pilot.h"
 #include "util.h"
 #include "gnome-pilot-pdialog.h"
diff --git a/capplet/gnome-pilot-capplet.h b/capplet/gnome-pilot-capplet.h
index c0902e2..372880f 100644
--- a/capplet/gnome-pilot-capplet.h
+++ b/capplet/gnome-pilot-capplet.h
@@ -30,7 +30,6 @@
 #ifndef _GNOME_PILOT_CAPPLET_H_
 #define _GNOME_PILOT_CAPPLET_H_
 
-#include <gnome.h>
 #include <gpilotd/gnome-pilot-client.h>
 
 #ifdef __cplusplus
diff --git a/capplet/gnome-pilot-cdialog.h b/capplet/gnome-pilot-cdialog.h
index 0129876..20f9a26 100644
--- a/capplet/gnome-pilot-cdialog.h
+++ b/capplet/gnome-pilot-cdialog.h
@@ -30,8 +30,6 @@
 #ifndef _GNOME_PILOT_CDIALOG_H_
 #define _GNOME_PILOT_CDIALOG_H_
 
-#include <gnome.h>
-
 G_BEGIN_DECLS
 
 #define GNOME_PILOT_TYPE_CDIALOG			(gnome_pilot_cdialog_get_type ())
@@ -40,7 +38,7 @@ G_BEGIN_DECLS
 #define GNOME_PILOT_IS_CDIALOG(obj)			(GTK_CHECK_TYPE ((obj), GNOME_PILOT_TYPE_CDIALOG))
 #define GNOME_PILOT_IS_CDIALOG_CLASS(klass)		(GTK_CHECK_CLASS_TYPE ((obj), GNOME_PILOT_TYPE_CDIALOG))
 
-
+
 typedef struct _GnomePilotCDialog        GnomePilotCDialog;
 typedef struct _GnomePilotCDialogPrivate GnomePilotCDialogPrivate;
 typedef struct _GnomePilotCDialogClass   GnomePilotCDialogClass;
@@ -55,7 +53,7 @@ struct _GnomePilotCDialogClass {
 	GtkObjectClass parent_class;
 };
 
-
+
 GtkType    gnome_pilot_cdialog_get_type (void);
 GtkObject *gnome_pilot_cdialog_new      (ConduitState *state);
 
diff --git a/capplet/gnome-pilot-ddialog.h b/capplet/gnome-pilot-ddialog.h
index e57b7b6..1ccc283 100644
--- a/capplet/gnome-pilot-ddialog.h
+++ b/capplet/gnome-pilot-ddialog.h
@@ -30,8 +30,6 @@
 #ifndef _GNOME_PILOT_DDIALOG_H_
 #define _GNOME_PILOT_DDIALOG_H_
 
-#include <gnome.h>
-
 G_BEGIN_DECLS
 
 #define GNOME_PILOT_TYPE_DDIALOG			(gnome_pilot_ddialog_get_type ())
@@ -40,7 +38,7 @@ G_BEGIN_DECLS
 #define GNOME_PILOT_IS_DDIALOG(obj)			(GTK_CHECK_TYPE ((obj), GNOME_PILOT_TYPE_DDIALOG))
 #define GNOME_PILOT_IS_DDIALOG_CLASS(klass)		(GTK_CHECK_CLASS_TYPE ((obj), GNOME_PILOT_TYPE_DDIALOG))
 
-
+
 typedef struct _GnomePilotDDialog        GnomePilotDDialog;
 typedef struct _GnomePilotDDialogPrivate GnomePilotDDialogPrivate;
 typedef struct _GnomePilotDDialogClass   GnomePilotDDialogClass;
@@ -55,7 +53,7 @@ struct _GnomePilotDDialogClass {
 	GtkObjectClass parent_class;
 };
 
-
+
 GtkType    gnome_pilot_ddialog_get_type (void);
 GtkObject *gnome_pilot_ddialog_new      (GPilotDevice *device);
 
diff --git a/capplet/gnome-pilot-druid.c b/capplet/gnome-pilot-druid.c
index e63904d..390cad8 100644
--- a/capplet/gnome-pilot-druid.c
+++ b/capplet/gnome-pilot-druid.c
@@ -32,6 +32,9 @@
 #endif
 
 #include <glade/glade.h>
+#include <libgnome/gnome-util.h>
+#include <libgnomeui/gnome-uidefs.h>
+#include <libgnomeui/gnome-druid.h>
 #include "pilot.h"
 #include "util.h"
 #include "gnome-pilot-druid.h"
diff --git a/capplet/gnome-pilot-druid.h b/capplet/gnome-pilot-druid.h
index 415303e..44b2f53 100644
--- a/capplet/gnome-pilot-druid.h
+++ b/capplet/gnome-pilot-druid.h
@@ -34,7 +34,6 @@
 #include <config.h>
 #endif
 
-#include <gnome.h>
 #include <gpilotd/gnome-pilot-client.h>
 
 #ifdef __cplusplus
diff --git a/capplet/gnome-pilot-pdialog.h b/capplet/gnome-pilot-pdialog.h
index c1d0039..d50c7f5 100644
--- a/capplet/gnome-pilot-pdialog.h
+++ b/capplet/gnome-pilot-pdialog.h
@@ -30,8 +30,6 @@
 #ifndef _GNOME_PILOT_PDIALOG_H_
 #define _GNOME_PILOT_PDIALOG_H_
 
-#include <gnome.h>
-
 G_BEGIN_DECLS
 
 #define GNOME_PILOT_TYPE_PDIALOG			(gnome_pilot_pdialog_get_type ())
@@ -40,7 +38,7 @@ G_BEGIN_DECLS
 #define GNOME_PILOT_IS_PDIALOG(obj)			(GTK_CHECK_TYPE ((obj), GNOME_PILOT_TYPE_PDIALOG))
 #define GNOME_PILOT_IS_PDIALOG_CLASS(klass)		(GTK_CHECK_CLASS_TYPE ((obj), GNOME_PILOT_TYPE_PDIALOG))
 
-
+
 typedef struct _GnomePilotPDialog        GnomePilotPDialog;
 typedef struct _GnomePilotPDialogPrivate GnomePilotPDialogPrivate;
 typedef struct _GnomePilotPDialogClass   GnomePilotPDialogClass;
@@ -55,7 +53,7 @@ struct _GnomePilotPDialogClass {
 	GtkObjectClass parent_class;
 };
 
-
+
 GtkType    gnome_pilot_pdialog_get_type (void);
 GtkObject *gnome_pilot_pdialog_new      (GnomePilotClient *gpc, PilotState *state, GPilotPilot *pilot);
 void gnome_pilot_pdialog_set_pilot (GtkObject *obj, GPilotPilot *pilot);
diff --git a/capplet/gpilotd-control-applet.c b/capplet/gpilotd-control-applet.c
index 683c349..d96fda2 100644
--- a/capplet/gpilotd-control-applet.c
+++ b/capplet/gpilotd-control-applet.c
@@ -29,10 +29,10 @@
 
 #include <config.h>
 #include <ctype.h>
-#include <gnome.h>
 #include <glade/glade.h>
 
 #include <libgnomeui/gnome-window-icon.h>
+#include <libgnomeui/gnome-ui-init.h>
 #include <gpilotd/gnome-pilot-client.h>
 
 #include "gnome-pilot-druid.h"
diff --git a/capplet/pilot.c b/capplet/pilot.c
index 03ac458..1e297ca 100644
--- a/capplet/pilot.c
+++ b/capplet/pilot.c
@@ -25,7 +25,8 @@
 /* handles pilot issues */
 
 #include <config.h>
-#include <gnome.h>
+#include <libgnome/gnome-config.h>
+#include <libgnome/gnome-util.h>
 #include <pi-util.h>
 
 #include "pilot.h"
diff --git a/capplet/util.c b/capplet/util.c
index 9be6f30..deaae1a 100644
--- a/capplet/util.c
+++ b/capplet/util.c
@@ -27,6 +27,7 @@
 #include <errno.h>
 #include <ctype.h>
 #include <glade/glade.h>
+#include <libgnome/gnome-util.h>
 #include <errno.h>
 #include "util.h"
 #include <iconv.h>
@@ -164,7 +165,7 @@ error_dialog (GtkWindow *parent, gchar *mesg, ...)
 	tmp = g_strdup_vprintf (mesg,ap);
 
 	dlg = gtk_message_dialog_new (parent, GTK_DIALOG_DESTROY_WITH_PARENT, 
-				      GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, tmp);
+	    GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "%s", tmp);
 	gtk_dialog_run (GTK_DIALOG (dlg));
 	gtk_widget_destroy (dlg);
 	
diff --git a/capplet/util.h b/capplet/util.h
index 21f438b..687f3c1 100644
--- a/capplet/util.h
+++ b/capplet/util.h
@@ -22,7 +22,6 @@
  *
  */
 
-#include <gnome.h>
 #include <gpilotd/gnome-pilot-client.h>
 #include "pilot.h"
 
diff --git a/conduits/backup/backup_conduit.c b/conduits/backup/backup_conduit.c
index 7c2c436..ec4b82e 100644
--- a/conduits/backup/backup_conduit.c
+++ b/conduits/backup/backup_conduit.c
@@ -28,7 +28,9 @@
 #endif
 
 #include <glib.h>
-#include <gnome.h>
+#include <glib/gi18n.h>
+#include <libgnome/gnome-config.h>
+#include <libgnomeui/gnome-uidefs.h>
 
 #include <pi-source.h>
 #include <pi-socket.h>
@@ -714,7 +716,8 @@ gnome_real_pilot_conduit_backup_restore (GnomePilotConduitBackup *conduit,
 	struct dirent *dirent;
 	file_db **db;
 	int dbcount = 0;
-	int i, j, size;
+	int i, j;
+	unsigned int size;
 	struct pi_file *file;
 	char *source;
 	int result = 0;
@@ -923,7 +926,7 @@ error_dialog (GtkWindow *parent, gchar *mesg, ...)
         tmp = g_strdup_vprintf (mesg,ap);
 
         dlg = gtk_message_dialog_new (parent, GTK_DIALOG_DESTROY_WITH_PARENT,
-                                      GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, tmp);
+	    GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "%s", tmp);
         gtk_dialog_run (GTK_DIALOG (dlg));
         gtk_widget_destroy (dlg);
 
diff --git a/conduits/file/file_conduit.c b/conduits/file/file_conduit.c
index 02f93c9..927be43 100644
--- a/conduits/file/file_conduit.c
+++ b/conduits/file/file_conduit.c
@@ -23,10 +23,10 @@
 /* $Id$ */
 
 #include <glib.h>
-#include <gnome.h>
-
+#include <glib/gi18n.h>
 #include <pi-source.h>
 #include <pi-socket.h>
+#include <stdio.h>
 #include <pi-file.h>
 #include <pi-dlp.h>
 #include <pi-version.h>
diff --git a/conduits/file/gpilot_install_file.c b/conduits/file/gpilot_install_file.c
index a34ce16..2fd0b01 100644
--- a/conduits/file/gpilot_install_file.c
+++ b/conduits/file/gpilot_install_file.c
@@ -20,7 +20,9 @@
  */
 
 #include "config.h"
-#include <gnome.h>
+#include <libgnomeui/gnome-dialog.h>
+#include <libgnomeui/gnome-messagebox.h>
+#include <libgnomeui/gnome-ui-init.h>
 #include <gpilotd/gnome-pilot-client.h>
 
 #include <bonobo.h>
diff --git a/conduits/test/test_conduit.c b/conduits/test/test_conduit.c
index d8dd954..e3c51c8 100644
--- a/conduits/test/test_conduit.c
+++ b/conduits/test/test_conduit.c
@@ -21,8 +21,6 @@
  * Author: JP Rosevear
  */
 
-#include <gnome.h>
-
 #include <gpilotd/gnome-pilot-conduit.h>
 #include <gpilotd/gnome-pilot-conduit-standard.h>
 
diff --git a/drafts/idl/main.c b/drafts/idl/main.c
index 97aba05..98e395f 100644
--- a/drafts/idl/main.c
+++ b/drafts/idl/main.c
@@ -7,7 +7,6 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include <gnome.h>
 #include <orb/orbit.h>
 #include "gpilotd-lib.h"
 #include "orbit-daemon-glue.h"
diff --git a/drafts/idl/orbit-daemon-glue.c b/drafts/idl/orbit-daemon-glue.c
index a32bf6b..8fcc3b7 100644
--- a/drafts/idl/orbit-daemon-glue.c
+++ b/drafts/idl/orbit-daemon-glue.c
@@ -1,4 +1,4 @@
-#include <gnome.h>
+#include <libgnome/gnome-config.h>
 #include <orb/orbit.h>
 #include "orbit-daemon-glue.h"
 #include "gpilotd-lib.h"
diff --git a/drafts/idl/test_client.c b/drafts/idl/test_client.c
index f86cb95..5d91edf 100644
--- a/drafts/idl/test_client.c
+++ b/drafts/idl/test_client.c
@@ -1,6 +1,6 @@
 #include "gpilotd-lib.h"
 #include <orb/orbit.h>
-#include <gnome.h>
+#include <libgnome/gnome-config.h>
 
 GPilotd_Daemon gpilotddaemon;
 GPilotd_Callback callback_obj;
diff --git a/gpilot-fileman/fileman.c b/gpilot-fileman/fileman.c
index 4c1a4fc..5d2c467 100644
--- a/gpilot-fileman/fileman.c
+++ b/gpilot-fileman/fileman.c
@@ -1,7 +1,6 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <glib.h>
-#include <gnome.h>
 #include <gtk/gtk.h>
 #include <sys/stat.h>
 #include <sys/types.h>
diff --git a/gpilot-fileman/gpilot-fileman.h b/gpilot-fileman/gpilot-fileman.h
index f332648..adb7718 100644
--- a/gpilot-fileman/gpilot-fileman.h
+++ b/gpilot-fileman/gpilot-fileman.h
@@ -3,7 +3,6 @@
 #include "config.h"
 #include <glib.h>
 #include <gtk/gtk.h>
-#include <gnome.h>
 
 
 #define GNOME_PILOT_FILEMAN_VERSION "0.1.0"
diff --git a/gpilot-fileman/multifile.c b/gpilot-fileman/multifile.c
index c1f8a6d..8b0ff77 100644
--- a/gpilot-fileman/multifile.c
+++ b/gpilot-fileman/multifile.c
@@ -1,6 +1,5 @@
 #include <gtk/gtk.h>
 #include <multifile.h> /* local, maybe move into gtk? */
-#include <gnome.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <sys/types.h>
diff --git a/gpilot-fileman/preferences.c b/gpilot-fileman/preferences.c
index 8a733aa..ae6f652 100644
--- a/gpilot-fileman/preferences.c
+++ b/gpilot-fileman/preferences.c
@@ -1,6 +1,5 @@
 #include <string.h>
 #include <gtk/gtk.h>
-#include <gnome.h>
 #include <glib.h>
 #include "gpilot-fileman.h"
 
diff --git a/gpilotd/gnome-pilot-client.gob b/gpilotd/gnome-pilot-client.gob
index a15ef3e..b39a4d7 100644
--- a/gpilotd/gnome-pilot-client.gob
+++ b/gpilotd/gnome-pilot-client.gob
@@ -675,7 +675,8 @@ class Gnome:Pilot:Client from Gtk:Object {
 
 			if (infile[0] != '/' && strncmp (infile, "file:/", 6)!=0) {
 				/* gnomevfs needs the file with path */
-				getcwd (pwd, 127);
+				if (getcwd (pwd, 127) == NULL)
+					goto error;
 				infile_with_path = g_strdup_printf ("%s/%s", pwd, infile);
 			} else {
 				infile_with_path = g_strdup (infile);
@@ -756,7 +757,7 @@ class Gnome:Pilot:Client from Gtk:Object {
 			g_free (queue);
 		}
 #endif /* WITH_VFS */
-		if (file_copied == FALSE) {
+error:		if (file_copied == FALSE) {
 #ifndef WITH_VFS
 			g_message ("File copy failed");
 #endif
@@ -1293,7 +1294,10 @@ gpilotd_get_pid (void)
 	if (!f) {
 		return -1;
 	} else {
-		fgets (pidstr, sizeof (pidstr), f);
+		if (fgets (pidstr, sizeof (pidstr), f) == NULL) {
+			fclose(f);
+			return -1;
+		}			
 		fclose (f);
 		pid = strtol (pidstr, NULL, 10);
 		if (pid == '\0')
diff --git a/gpilotd/gnome-pilot-conduit-backup.gob b/gpilotd/gnome-pilot-conduit-backup.gob
index 8965d52..bc1e6a7 100644
--- a/gpilotd/gnome-pilot-conduit-backup.gob
+++ b/gpilotd/gnome-pilot-conduit-backup.gob
@@ -22,7 +22,6 @@
  */
 
 %h{
-#include <gnome.h>
 #include "gnome-pilot-conduit.h"
 #include "gnome-pilot-conduit-file.h"
 #include "gnome-pilot-dbinfo.h"
@@ -32,7 +31,6 @@ typedef gint (*GnomePilotConduitBackupRestore) (gchar *filename, gint, gint, gpo
 %}
 
 %{
-#include <gnome.h>
 #include "gnome-pilot-conduit-backup.h"
 #include "gnome-pilot-conduit-backup-private.h"
 #include <sys/stat.h>
diff --git a/gpilotd/gnome-pilot-conduit-config.gob b/gpilotd/gnome-pilot-conduit-config.gob
index e5c4bc7..f3b2d34 100644
--- a/gpilotd/gnome-pilot-conduit-config.gob
+++ b/gpilotd/gnome-pilot-conduit-config.gob
@@ -25,6 +25,7 @@
 %h{
 #include <glib.h>
 #include <gtk/gtkobject.h>
+#include <libgnome/gnome-config.h>
 #include <gpilotd/gnome-pilot-conduit.h>
 #include <libgpilotdCM/gnome-pilot-conduit-management.h>
 #include <gmodule.h>
diff --git a/gpilotd/gnome-pilot-conduit-file.gob b/gpilotd/gnome-pilot-conduit-file.gob
index 6dc6ae0..12b361a 100644
--- a/gpilotd/gnome-pilot-conduit-file.gob
+++ b/gpilotd/gnome-pilot-conduit-file.gob
@@ -22,13 +22,11 @@
  */
 
 %h{
-#include <gnome.h>
 #include "gnome-pilot-conduit.h"
 #include "gnome-pilot-dbinfo.h"
 %}
 
 %{
-#include <gnome.h>
 #include "gnome-pilot-conduit-file.h"
 #include "gnome-pilot-conduit-file-private.h"
 #include <sys/stat.h>
diff --git a/gpilotd/gnome-pilot-conduit-management.gob b/gpilotd/gnome-pilot-conduit-management.gob
index d406aa1..78ee4b1 100644
--- a/gpilotd/gnome-pilot-conduit-management.gob
+++ b/gpilotd/gnome-pilot-conduit-management.gob
@@ -36,7 +36,9 @@
  */
 
 %h{
+#include <config.h>
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gtk/gtkobject.h>
 #include <gpilotd/gnome-pilot-conduit.h>
 #include <gmodule.h>
@@ -334,9 +336,9 @@ class Gnome:Pilot:Conduit:Management from Gtk:Object {
 		GnomePilotConduitMgmtData *ret;
 		xmlChar *version;
 		
-		version = xmlGetProp (root,"version");
+		version = xmlGetProp (root,(unsigned char *)"version");
 		/* g_message ("version = %s",version); */
-		if (version==NULL || g_strcasecmp (version,CONDUIT_XML_VERSION)!=0) {
+		if (version==NULL || g_strcasecmp ((char *) version, CONDUIT_XML_VERSION)!=0) {
 			g_warning ("incompatible version");
 			xmlFree (version);
 			return NULL;	
@@ -356,16 +358,16 @@ class Gnome:Pilot:Conduit:Management from Gtk:Object {
 
 		node = root->children;
 		/* until we find the "conduit" node */
-		while (node && g_strcasecmp (node->name,"conduit")!=0) {
+		while (node && g_strcasecmp ((char *) node->name,"conduit")!=0) {
 			node = node->next;
 		}
 		if (!node) {
 			g_warning ("error in XML, missing the \"conduit\" node");
 			return FALSE;
 		}
-		type = xmlGetProp (node,"type");
-		location = xmlGetProp (node,"location");
-		id_string = xmlGetProp (node,"id");
+		type = xmlGetProp (node,(unsigned char *) "type");
+		location = xmlGetProp (node,(unsigned char *) "location");
+		id_string = xmlGetProp (node,(unsigned char *) "id");
 
 		if (id_string==NULL) {
 			g_warning ("error in XML, missing id_string");
@@ -373,7 +375,7 @@ class Gnome:Pilot:Conduit:Management from Gtk:Object {
 			xmlFree (location);
 			return FALSE;
 		} else {
-			if (strchr (id_string,' ')) {
+			if (strchr ((char *)id_string,' ')) {
 				g_warning ("error in XML, id_string bad");
 				xmlFree (id_string);
 				xmlFree (type);
@@ -388,7 +390,7 @@ class Gnome:Pilot:Conduit:Management from Gtk:Object {
 			return FALSE;
 		}
 
-		if (type && g_strcasecmp (type,"shlib")==0) {
+		if (type && g_strcasecmp ((char *) type,"shlib")==0) {
 			obj->type = GNOME_PILOT_CONDUIT_TYPE_SHLIB;
 		} else {
 			g_warning ("Unknown conduit type");
@@ -397,8 +399,8 @@ class Gnome:Pilot:Conduit:Management from Gtk:Object {
 			xmlFree (location);
 			return FALSE;	
 		}
-		obj->location = g_strdup (location);
-		obj->id = g_strdup (id_string);
+		obj->location = g_strdup ((char *) location);
+		obj->id = g_strdup ((char *) id_string);
 		g_hash_table_insert (conduitid_to_datastruct,
 				    obj->id,
 				    obj);
@@ -427,19 +429,19 @@ class Gnome:Pilot:Conduit:Management from Gtk:Object {
 		node = root->children;
 		/* until we find a name node */
 		while (node) {
-			while (node && g_strcasecmp (node->name,"name")) {
+			while (node && g_strcasecmp ((char *) node->name,"name")) {
 				node = node->next;
 			}
 			if (node) {
-				value = xmlGetProp (node,"value");
-				lang = xmlGetProp (node,"lang");
+				value = xmlGetProp (node, (unsigned char *)"value");
+				lang = xmlGetProp (node,(unsigned char *)"lang");
 				/* if this is a default name, and there
 				   is no current_name, set it. If on the
 				   other hand there is a lang, and it's the current, set it*/
 				if ((!lang && !current_name) ||
-				    (lang && g_strcasecmp (lang, self_get_lang ())==0)) {
+				    (lang && g_strcasecmp ((char *) lang, self_get_lang ())==0)) {
 					if (current_name) g_free (current_name);
-					current_name = g_strdup (value);
+					current_name = g_strdup ((char *) value);
 				}
 				node = node->next;
 				xmlFree (value);
@@ -466,14 +468,14 @@ class Gnome:Pilot:Conduit:Management from Gtk:Object {
 
 		/* loop over the children */
 		for (node = root->children; node!=NULL; node=node->next) {
-			if (g_strcasecmp (node->name,"conduit-attribute")==0) {
+			if (g_strcasecmp ((char *) node->name,"conduit-attribute")==0) {
 				xmlChar *lang,*name,*type,*value;
 				gchar *attr_with_lang;
 				
-				lang = xmlGetProp (node,"lang");
-				name = xmlGetProp (node,"name");
-				type = xmlGetProp (node,"type");
-				value = xmlGetProp (node,"value");
+				lang = xmlGetProp (node,(unsigned char *)"lang");
+				name = xmlGetProp (node,(unsigned char *)"name");
+				type = xmlGetProp (node,(unsigned char *)"type");
+				value = xmlGetProp (node,(unsigned char *)"value");
 
 				if (value==NULL) {
 					g_warning ("attribute %s for %s(%s) has no value",
@@ -497,13 +499,13 @@ class Gnome:Pilot:Conduit:Management from Gtk:Object {
 					attr_with_lang = g_strdup_printf ("%s-%s",
 									 name, lang);
 				} else {
-					attr_with_lang = g_strdup (name);
+					attr_with_lang = g_strdup ((char *) name);
 				}
 				/* if no type, assume string */
-				if (type==NULL || g_strcasecmp (type,"string")==0) {
+				if (type==NULL || g_strcasecmp ((char *) type,"string")==0) {
 					g_hash_table_insert (obj->string_attributes,
 							     attr_with_lang,
-							     g_strdup (value));
+							     g_strdup ((char *) value));
 				} else {
 					g_warning ("Unknown type %s",type);
 				}
@@ -512,9 +514,9 @@ class Gnome:Pilot:Conduit:Management from Gtk:Object {
 				xmlFree (name);
 				xmlFree (type);
 				xmlFree (value);
-			} else if (g_strcasecmp (node->name, "text") == 0) {
+			} else if (g_strcasecmp ((char *) node->name, "text") == 0) {
 				/* ignore text */
-			} else if (!self_is_other_valid_tag (node->name)) { 
+			} else if (!self_is_other_valid_tag ((const gchar *)node->name)) { 
 				g_warning ("node->name = \"%s\", unhandled ",node->name);
 			} 
 		} 
@@ -540,7 +542,7 @@ class Gnome:Pilot:Conduit:Management from Gtk:Object {
 		root = xmlDocGetRootElement (doc);
 		if (!root ||
 		    !root->name ||
-		    g_strcasecmp (root->name,"gnome-pilot-conduit")!=0) {
+		    g_strcasecmp ((char *) root->name,"gnome-pilot-conduit")!=0) {
 			xmlFreeDoc (doc);
 			return NULL;
 		}      
diff --git a/gpilotd/gnome-pilot-conduit-standard-abs.c b/gpilotd/gnome-pilot-conduit-standard-abs.c
index 5280736..750b0ae 100644
--- a/gpilotd/gnome-pilot-conduit-standard-abs.c
+++ b/gpilotd/gnome-pilot-conduit-standard-abs.c
@@ -27,7 +27,8 @@
 #include <config.h>
 #endif
 
-#include <gnome.h>
+#include <glib/gi18n.h>
+
 #include <pi-source.h>
 #include <pi-socket.h>
 #include <pi-dlp.h>
diff --git a/gpilotd/gnome-pilot-conduit-standard-abs.h b/gpilotd/gnome-pilot-conduit-standard-abs.h
index 017f1e0..af59822 100644
--- a/gpilotd/gnome-pilot-conduit-standard-abs.h
+++ b/gpilotd/gnome-pilot-conduit-standard-abs.h
@@ -25,7 +25,6 @@
 #ifndef __GNOME_PILOT_CONDUIT_STANDARD_ABS_H__
 #define __GNOME_PILOT_CONDUIT_STANDARD_ABS_H__
 
-#include <gnome.h>
 #include "gnome-pilot-conduit-standard.h"
 
 #ifdef __cplusplus
diff --git a/gpilotd/gnome-pilot-conduit-standard.gob b/gpilotd/gnome-pilot-conduit-standard.gob
index ab60bed..f3e28cc 100644
--- a/gpilotd/gnome-pilot-conduit-standard.gob
+++ b/gpilotd/gnome-pilot-conduit-standard.gob
@@ -22,13 +22,11 @@
  */
 
 %h{
-#include <gnome.h>
 #include "gnome-pilot-conduit.h"
 #include "gnome-pilot-dbinfo.h"
 %}
 
 %{
-#include <gnome.h>
 #include "gnome-pilot-conduit-backup.h"
 #include "gnome-pilot-conduit-backup-private.h"
 #include <sys/stat.h>
diff --git a/gpilotd/gnome-pilot-conduit-sync-abs.c b/gpilotd/gnome-pilot-conduit-sync-abs.c
index 36aa57a..9337132 100644
--- a/gpilotd/gnome-pilot-conduit-sync-abs.c
+++ b/gpilotd/gnome-pilot-conduit-sync-abs.c
@@ -24,7 +24,7 @@
  *
  */
 
-#include <gnome.h>
+#include <glib/gi18n.h>
 #include <pi-source.h>
 #include <pi-socket.h>
 #include <pi-dlp.h>
diff --git a/gpilotd/gnome-pilot-conduit-sync-abs.h b/gpilotd/gnome-pilot-conduit-sync-abs.h
index 2265c7c..548c0d4 100644
--- a/gpilotd/gnome-pilot-conduit-sync-abs.h
+++ b/gpilotd/gnome-pilot-conduit-sync-abs.h
@@ -26,7 +26,6 @@
 #ifndef __GNOME_PILOT_CONDUIT_SYNC_ABS_H__
 #define __GNOME_PILOT_CONDUIT_SYNC_ABS_H__
 
-#include <gnome.h>
 #include <pi-sync.h>
 #include "gnome-pilot-conduit-standard.h"
 
diff --git a/gpilotd/gnome-pilot-conduit.gob b/gpilotd/gnome-pilot-conduit.gob
index 9b59539..4984309 100644
--- a/gpilotd/gnome-pilot-conduit.gob
+++ b/gpilotd/gnome-pilot-conduit.gob
@@ -22,13 +22,12 @@
  */
 
 %h{
-#include <gnome.h>
 #include "gnome-pilot-dbinfo.h"
 #include "gnome-pilot-structures.h"
+#include <gtk/gtk.h>
 %}
 
 %{
-#include <gnome.h>
 #include "gnome-pilot-conduit.h"
 #include "gnome-pilot-conduit-private.h"
 #include <sys/stat.h>
diff --git a/gpilotd/gnome-pilot-structures.c b/gpilotd/gnome-pilot-structures.c
index 9b0528f..a70c5b2 100644
--- a/gpilotd/gnome-pilot-structures.c
+++ b/gpilotd/gnome-pilot-structures.c
@@ -30,13 +30,14 @@
 #include <string.h>
 #include "gnome-pilot-structures.h"
 #include "gpilot-gui.h"
-#include <libgnome/libgnome.h>
+#include <glib/gi18n.h>
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <string.h>
 #include <fcntl.h>
 #include <signal.h>
+#include <libgnome/gnome-config.h>
 
 /* From pi-csd */
 #include <sys/socket.h>
@@ -242,9 +243,11 @@ gpilot_hdb_uucp_lock (GPilotDevice *device)
 	pid = getpid ();
 #ifndef LOCK_BINARY
 	snprintf(lock_buffer, 11, "%10d\n", pid);
-	write (fd, lock_buffer, 11);
+	if (write (fd, lock_buffer, 11) != 11)
+		g_warning("Failed to write to lock file");
 #else
-	write (fd, &pid, sizeof (pid));
+	if (write (fd, &pid, sizeof (pid)) != sizeof(pid))
+		g_warning("Failed to write to lock file");
 #endif
 	close (fd);
 	return 1;
@@ -460,7 +463,7 @@ gpilot_network_device_init (GPilotDevice *device)
 				"bind socket: err %d"),
 			    device->name, pi_net, ret);
 		}
-		g_warning(line);
+		g_warning("%s", line);
 		return -1;
 	}
 
diff --git a/gpilotd/gpilot-gui.c b/gpilotd/gpilot-gui.c
index ae431c2..32667c9 100644
--- a/gpilotd/gpilot-gui.c
+++ b/gpilotd/gpilot-gui.c
@@ -21,7 +21,9 @@
  */
 
 #include "gpilot-gui.h"
-#include <gnome.h>
+#include <string.h>
+#include <stdlib.h>
+#include <libgnomeui/gnome-dialog-util.h>
 
 static void gpilot_gui_run_dialog(gchar *type, gchar *mesg, va_list ap);
 
diff --git a/gpilotd/gpilotd-conduit-mgmt.h b/gpilotd/gpilotd-conduit-mgmt.h
index d98bbaa..aff541c 100644
--- a/gpilotd/gpilotd-conduit-mgmt.h
+++ b/gpilotd/gpilotd-conduit-mgmt.h
@@ -24,7 +24,6 @@
 #ifndef __GPILOTD_CONDUIT_MGMT_H
 #define __GPILOTD_CONDUIT_MGMT_H
 
-#include <gnome.h>
 #include <gmodule.h>
 #include "gnome-pilot-conduit.h"
 /*#include "gpilot-structures.h"*/
diff --git a/gpilotd/gpilotd-session-wrapper.c b/gpilotd/gpilotd-session-wrapper.c
index b8c4770..15a8623 100644
--- a/gpilotd/gpilotd-session-wrapper.c
+++ b/gpilotd/gpilotd-session-wrapper.c
@@ -21,7 +21,6 @@
  */
 
 #include <stdio.h>
-#include <gnome.h>
 
 
 int main(int argc, char *argv[])
diff --git a/gpilotd/gpilotd.c b/gpilotd/gpilotd.c
index 4eb2d08..aac8b4e 100644
--- a/gpilotd/gpilotd.c
+++ b/gpilotd/gpilotd.c
@@ -25,6 +25,9 @@
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
+#include <glib/gi18n.h>
+#include <libgnome/gnome-config.h>
+#include <libgnomeui/gnome-ui-init.h>
 #endif
 
 /* for crypt () */
@@ -43,6 +46,7 @@
 #include <sys/time.h>
 
 #include <glib.h>
+#include <crypt.h>
 #include <pwd.h>
 #include <errno.h>
 #include <string.h>
@@ -62,8 +66,6 @@
 #include <libhal.h>
 #endif
 
-#include <libgnome/libgnome.h>
-
 #include <pi-source.h>
 #include <pi-dlp.h>
 #include <pi-version.h>
@@ -382,7 +384,7 @@ check_usb_config(GPilotDevice *device) {
 					      "You may need to select a "
 					      "`ttyUSB...' device."),
 			   device->name, device->port);
-		g_warning(line);
+		g_warning("%s", line);
 		gpilot_gui_warning_dialog(line);
 		error = 1;
 	} else if (!libusb_device && !visor_loaded) {
@@ -397,7 +399,7 @@ check_usb_config(GPilotDevice *device) {
 					      "You may need to select a "
 					      "`usb:' device."),
 			   device->name, device->port);
-		g_warning(line);
+		g_warning("%s", line);
 		gpilot_gui_warning_dialog(line);
 		error = 1;
 	}
@@ -1030,7 +1032,7 @@ load_devices_xml (void)
 	}
 
 	root = xmlDocGetRootElement (doc);
-	if (!root->name || strcmp (root->name, "device-list"))
+	if (!root->name || strcmp ((char *) root->name, "device-list"))
 		goto fail;
 	
 	for (node = root->children; node; node = node->next) {
@@ -1040,14 +1042,14 @@ load_devices_xml (void)
 		if (node->type != XML_ELEMENT_NODE)
 			continue;
 
-		if (!node->name || strcmp (node->name, "device")) {
+		if (!node->name || strcmp ((char *) node->name, "device")) {
 			g_warning ("Invalid sub node %s", node->name != NULL ? (char *) node->name : "");
 
 			continue;
 		}
 		
-		vendor = xmlGetProp (node, "vendor_id");
-		product = xmlGetProp (node, "product_id");
+		vendor = xmlGetProp (node, (xmlChar *) "vendor_id");
+		product = xmlGetProp (node, (xmlChar *) "product_id");
 
 		if (!vendor || !product) {
 			g_warning ("No vendor or product id");
@@ -1061,8 +1063,8 @@ load_devices_xml (void)
 		xmlFree (vendor);
 		xmlFree (product);
 		
-		net = xmlGetProp (node, "use_net");
-		use_net = !net || strcmp (net, "false");
+		net = xmlGetProp (node, (xmlChar *) "use_net");
+		use_net = !net || strcmp ((char *) net, "false");
 		
 		g_message ("Using net %s", use_net ? "TRUE" : "FALSE");
 		g_array_append_val (product_net, use_net);
@@ -1095,13 +1097,13 @@ hal_device_added (LibHalContext *ctx, const char *udi)
 	 * and then try to match the usb_device.product_id and usb_device.vendor_id
 	 * against the list in devices.xml.
 	 */
-	if (platform = libhal_device_get_property_string (hal_ctx, udi, "pda.platform", NULL)) {
+	if ((platform = libhal_device_get_property_string (hal_ctx, udi, "pda.platform", NULL))) {
 	    if (strcmp (platform, "palm") != 0) {
 		libhal_free_string (platform);
 		return;
 	    }
 	    libhal_free_string (platform);
-	} else if (bus = libhal_device_get_property_string (hal_ctx, udi, "info.bus", NULL)) {
+	} else if ((bus = libhal_device_get_property_string (hal_ctx, udi, "info.bus", NULL))) {
 	    if (strcmp (bus, "usb_device") != 0) {
 		libhal_free_string (bus);
 		return;
@@ -1343,7 +1345,7 @@ visor_devices_timeout (gpointer data)
 					"Check that usbfs or sysfs is mounted."),
 				    sysfs_dir_name,
 				    usbdevicesfile_str);
-				g_warning (str);
+				g_warning ("%s", str);
 				g_free (str);
 			}
 			return TRUE; /* can't proceed */
@@ -1655,7 +1657,7 @@ dump_build_info (void)
 	str = g_string_append (str, "[Network] ");
 	str = g_string_append (str, "[Bluetooth] ");
 #endif
-	g_message (str->str);
+	g_message ("%s", str->str);
 	g_string_free (str, TRUE);
 }
 
diff --git a/gpilotd/manager.c b/gpilotd/manager.c
index d049244..3aff1ae 100644
--- a/gpilotd/manager.c
+++ b/gpilotd/manager.c
@@ -25,6 +25,7 @@
 #include <config.h>
 #endif
 
+#include <libgnome/gnome-config.h>
 #include <glib.h>
 #include <gmodule.h>
 #include <pi-socket.h>
@@ -33,7 +34,7 @@
 #include <pi-sync.h>
 #include <pi-dlp.h>
 
-#include <libgnome/libgnome.h>
+#include <glib/gi18n.h>
 
 #include "orbit_daemon_glue.h"
 #include "manager.h"
diff --git a/gpilotd/orbit_daemon_glue.c b/gpilotd/orbit_daemon_glue.c
index 0f5f9a3..828e8e5 100644
--- a/gpilotd/orbit_daemon_glue.c
+++ b/gpilotd/orbit_daemon_glue.c
@@ -21,7 +21,7 @@
  */
 
 #include "config.h"
-#include <gnome.h>
+#include <libgnome/gnome-config.h>
 
 #include <bonobo-activation/bonobo-activation.h>
 #include <libbonobo.h>
@@ -2044,7 +2044,7 @@ void gpilotd_corba_init(int *argc,
 			char **argv,
 			GPilotContext **context)
 {
-	PortableServer_ObjectId objid = {0, sizeof("gpilotd"), "gpilotd" };
+	PortableServer_ObjectId objid = {0, sizeof("gpilotd"), (unsigned char *) "gpilotd" };
 	PortableServer_POA the_poa;
 	GNOME_Pilot_Daemon acc;
 	static gboolean object_initialised = FALSE;
diff --git a/gpilotd/queue_io.c b/gpilotd/queue_io.c
index ee0ae5f..9fea906 100644
--- a/gpilotd/queue_io.c
+++ b/gpilotd/queue_io.c
@@ -20,7 +20,8 @@
  *
  */
 
-#include <gnome.h>
+#include <glib/gi18n.h>
+#include <libgnome/gnome-config.h>
 #include "queue_io.h"
 #include "orbit_daemon_glue.h"
 
diff --git a/utils/gpilotd-client.c b/utils/gpilotd-client.c
index 04a9580..99ec21b 100644
--- a/utils/gpilotd-client.c
+++ b/utils/gpilotd-client.c
@@ -5,7 +5,7 @@
  */
 #include <config.h>
 
-#include <gnome.h>
+#include <libgnomeui/gnome-ui-init.h>
 #include <bonobo-activation/bonobo-activation.h>
 
 #include <gpilotd/gnome-pilot-client.h>
diff --git a/utils/gpilotdcm-client.c b/utils/gpilotdcm-client.c
index 0221cd6..0644e84 100644
--- a/utils/gpilotdcm-client.c
+++ b/utils/gpilotdcm-client.c
@@ -5,7 +5,8 @@
  */
 #include <config.h>
 
-#include <gnome.h>
+#include <glib/gi18n.h>
+#include <libgnomeui/gnome-ui-init.h>
 #include <bonobo-activation/bonobo-activation.h>
 
 #include <libgpilotdCM/gnome-pilot-conduit-management.h>
diff --git a/utils/make-password.c b/utils/make-password.c
index a14b77b..8d136d8 100644
--- a/utils/make-password.c
+++ b/utils/make-password.c
@@ -83,7 +83,7 @@ struct pi_sockaddr addr;
   (void)srand((int)time((time_t *)NULL));
   to64(&salt[0],rand(),2);
   /*printf("Encrypted password = \"%s\"\n",crypt(U.password,salt));*/
-  printf((char*)crypt(U.password,salt));
+  printf("%s", (char*)crypt(U.password,salt));
 
   pi_close(sd);
   exit(0);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]