Fix for bug #437584

svn path=/trunk/; revision=33697

4 files changed, 22 insertions, 30 deletions

diff --git a/plugins/ipod-sync/ChangeLog b/plugins/ipod-sync/ChangeLog
index 537a3c79dc..143d1a3760 100644
--- a/plugins/ipod-sync/ChangeLog
+++ b/plugins/ipod-sync/ChangeLog
@@ -1,3 +1,11 @@
+2007-06-07  Gilles Dartiguelongue  <dartigug@esiee.fr>
+
+	* evolution-ipod-sync.c: (ipod_get_mount):
+	* evolution-ipod-sync.h:
+	* ipod.c: (try_mount), (try_umount): more compilation
+	warnings cleanup, completes bug #437584 fixes. Removes
+	hopefully useless code in headers.
+
 2007-05-14  Srinivasa Ragavan  <sragavan@novell.com>
 
 	** Fix for bug #375234 from Vitaliy Ischenko  
diff --git a/plugins/ipod-sync/evolution-ipod-sync.c b/plugins/ipod-sync/evolution-ipod-sync.c
index 72619a77db..96ed6ba7d6 100644
--- a/plugins/ipod-sync/evolution-ipod-sync.c
+++ b/plugins/ipod-sync/evolution-ipod-sync.c
@@ -7,13 +7,15 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
+
 #include "evolution-ipod-sync.h"
 
-#include <gnome.h>
 #include <glib/gi18n-lib.h>
+#include <gtk/gtk.h>
 #include <glade/glade.h>
-#include <libhal.h>
 
 char *  mount_point = NULL;
 LibHalContext *ctx;
@@ -77,7 +79,7 @@ ipod_check_status (gboolean silent)
 }
 
 char *
-ipod_get_mount ()
+ipod_get_mount (void)
 {
 	return mount_point;
 }
diff --git a/plugins/ipod-sync/evolution-ipod-sync.h b/plugins/ipod-sync/evolution-ipod-sync.h
index 89110ed7f7..5984b8a059 100644
--- a/plugins/ipod-sync/evolution-ipod-sync.h
+++ b/plugins/ipod-sync/evolution-ipod-sync.h
@@ -7,37 +7,19 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
 #include <dbus/dbus.h>
 #include <dbus/dbus-glib.h>
 #include <libhal.h>
 #include <signal.h>
 
-#ifdef ENABLE_NLS
-# include <libintl.h>
-# define _(String) gettext (String)
-# ifdef gettext_noop
-#  define N_(String) gettext_noop (String)
-# else
-#  define N_(String) (String)
-# endif
-#else
-# define _(String)
-# define N_(String) (String)
-#endif
-
-#ifdef EIS_DEBUG
-# define dbg(fmt,arg...) fprintf(stderr, "%s/%d: " fmt,__FILE__,__LINE__,##arg)
-#else
-# define dbg(fmt,arg...) do { } while(0)
-#endif
-
-#define warn(fmt,arg...) g_warning("%s/%d: " fmt,__FILE__,__LINE__,##arg)
-
-
-gboolean check_hal ();
+gboolean check_hal (void);
+gboolean ipod_check_status (gboolean silent);
+gboolean try_umount (char *device);
 
 char *find_ipod_mount_point (LibHalContext *ctx);
-gboolean ipod_check_status (gboolean silent);
-char *ipod_get_mount ();
+char *ipod_get_mount (void);
+
 
diff --git a/plugins/ipod-sync/ipod.c b/plugins/ipod-sync/ipod.c
index d5ea660056..292d07681f 100644
--- a/plugins/ipod-sync/ipod.c
+++ b/plugins/ipod-sync/ipod.c
@@ -62,7 +62,7 @@ try_mount (char *device)
 	if (!g_spawn_sync (g_get_home_dir (), argv, NULL, 0, NULL, NULL, NULL,
 							 NULL, &exit_status, &err))
 	{
-		warn ("try_mount failed: %s", err->message);
+		g_warning ("try_mount failed: %s", err->message);
 		return FALSE;
 	}
 
@@ -88,7 +88,7 @@ try_umount (char *device)
 	if (!g_spawn_sync (g_get_home_dir (), argv, NULL, 0, NULL, NULL, NULL,
 							 NULL, &exit_status, &err))
 	{
-		warn ("try_umount failed: %s", err->message);
+		g_warning ("try_umount failed: %s", err->message);
 		return FALSE;
 	}