[Synce-cvslog] SF.net SVN: synce:[3623] trunk/trayicon

[<mar...@us...>]

Revision: 3623
          http://synce.svn.sourceforge.net/synce/?rev=3623&view=rev
Author:   mark_ellis
Date:     2008-12-11 12:04:07 +0000 (Thu, 11 Dec 2008)

Log Message:
-----------
corrected compiler warnings

Modified Paths:
--------------
    trunk/trayicon/ChangeLog
    trunk/trayicon/src/hal-client.c
    trunk/trayicon/src/main.c
    trunk/trayicon/src/synce_app_man.c

Modified: trunk/trayicon/ChangeLog
===================================================================
--- trunk/trayicon/ChangeLog	2008-12-10 13:07:52 UTC (rev 3622)
+++ trunk/trayicon/ChangeLog	2008-12-11 12:04:07 UTC (rev 3623)
@@ -1,3 +1,7 @@
+2008-12-11  Mark Ellis <ma...@mp...>
+
+	* corrected compiler warnings
+
 2008-12-10  Mark Ellis <ma...@mp...>
 
 	* make libnotify required

Modified: trunk/trayicon/src/hal-client.c
===================================================================
--- trunk/trayicon/src/hal-client.c	2008-12-10 13:07:52 UTC (rev 3622)
+++ trunk/trayicon/src/hal-client.c	2008-12-11 12:04:07 UTC (rev 3623)
@@ -362,7 +362,7 @@
 {
   GError *error = NULL;
   gboolean password_accepted = FALSE, result;
-  gint i, num_devices;
+  gint num_devices;
   DBusGProxy *proxy = NULL;
   DBusError dbus_error;
   gchar **device_list;
@@ -405,7 +405,7 @@
 				    device_list[0],
 				    "org.freedesktop.Hal.Device.Synce");
   if (proxy == NULL) {
-    g_critical("%s: Failed to get proxy for device '%s'", G_STRFUNC, device_list[i]);
+    g_critical("%s: Failed to get proxy for device '%s'", G_STRFUNC, device_list[0]);
     goto error_exit;
   }
 

Modified: trunk/trayicon/src/main.c
===================================================================
--- trunk/trayicon/src/main.c	2008-12-10 13:07:52 UTC (rev 3622)
+++ trunk/trayicon/src/main.c	2008-12-11 12:04:07 UTC (rev 3623)
@@ -36,6 +36,7 @@
 #include <gtk/gtk.h>
 #include <gnome.h>
 #include <glade/glade.h>
+#include <errno.h>
 
 #include "synce-trayicon.h"
 
@@ -128,7 +129,10 @@
 	{
 		synce_log_use_syslog();
 		g_debug("Forking into background");
-		daemon(0,0);
+		if (daemon(0,0) == -1) {
+                        g_critical("%s: failed to fork into background: %d: %s", G_STRFUNC, errno, g_strerror(errno));
+                        return -1;
+                }
 	}
 	else
 	{

Modified: trunk/trayicon/src/synce_app_man.c
===================================================================
--- trunk/trayicon/src/synce_app_man.c	2008-12-10 13:07:52 UTC (rev 3622)
+++ trunk/trayicon/src/synce_app_man.c	2008-12-11 12:04:07 UTC (rev 3623)
@@ -326,9 +326,13 @@
       bytes = fread(buffer, 1, sizeof(buffer), input);
       if (bytes < sizeof(buffer)) {
 	if (feof(input)) {
-	  fwrite(buffer, 1, bytes, output);
-	  success = TRUE;
-	  break;
+                if (fwrite(buffer, 1, bytes, output) < bytes) {
+                        g_critical(_("%s: error writing output file for copying: %s"), G_STRFUNC, dest_file);
+                        g_unlink(dest_file);
+                } else {
+                        success = TRUE;
+                }
+                break;
 	}
 
 	g_critical(_("%s: error reading input file for copying: %s"), G_STRFUNC, source_file);
@@ -722,6 +726,7 @@
   HRESULT hr;
   DWORD last_error;
   gchar *tmpdir = NULL;
+  GList *cab_list = NULL;
 
   g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
 
@@ -743,7 +748,7 @@
     goto exit;
   }
 
-  GList *cab_list = extract_with_orange(filepath, tmpdir, system.dwProcessorType);
+  cab_list = extract_with_orange(filepath, tmpdir, system.dwProcessorType);
   if (!cab_list) {
     g_set_error(error,
 		SYNCE_APP_MAN_ERROR,


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.