seahorse r2515 - in trunk: . daemon libseahorse pgp ssh

[nnielsen svn gnome org]

Author: nnielsen
Date: Sun Sep 14 23:12:19 2008
New Revision: 2515
URL: http://svn.gnome.org/viewvc/seahorse?rev=2515&view=rev

Log:
	* daemon/seahorse-daemon.c:
	* daemon/seahorse-hkp-server.c:
	* libseahorse/seahorse-util.c:
	* libseahorse/seahorse-validity.c:
	* pgp/seahorse-gpg-options.c:
	* pgp/seahorse-gpgme-io.c:
	* pgp/seahorse-hkp-source.c:
	* pgp/seahorse-ldap-source.c:
	* pgp/seahorse-ssh-askpass.c: Fix compiler warnings
	for gcc 4.3. 
	

Modified:
   trunk/ChangeLog
   trunk/daemon/seahorse-daemon.c
   trunk/daemon/seahorse-hkp-server.c
   trunk/libseahorse/seahorse-util.c
   trunk/libseahorse/seahorse-validity.c
   trunk/pgp/seahorse-gpg-options.c
   trunk/pgp/seahorse-gpgme-io.c
   trunk/pgp/seahorse-hkp-source.c
   trunk/pgp/seahorse-ldap-source.c
   trunk/ssh/seahorse-ssh-askpass.c

Modified: trunk/daemon/seahorse-daemon.c
==============================================================================
--- trunk/daemon/seahorse-daemon.c	(original)
+++ trunk/daemon/seahorse-daemon.c	Sun Sep 14 23:12:19 2008
@@ -98,7 +98,9 @@
             open ("/dev/null", O_WRONLY, 0666);
             open ("/dev/null", O_WRONLY, 0666);
 
-            chdir ("/tmp");
+            if (chdir ("/tmp") < 0)
+                warn ("couldn't change to /tmp directory");
+            
             return; /* Child process returns */
         };
     }

Modified: trunk/daemon/seahorse-hkp-server.c
==============================================================================
--- trunk/daemon/seahorse-hkp-server.c	(original)
+++ trunk/daemon/seahorse-hkp-server.c	Sun Sep 14 23:12:19 2008
@@ -480,7 +480,7 @@
     
     soup_server = soup_server_new (SOUP_SERVER_PORT, port, NULL);
     if (!soup_server) {
-        g_set_error (err, HKP_SERVER_ERROR, errno, g_strdup (strerror (errno)));
+        g_set_error (err, HKP_SERVER_ERROR, errno, "%s", g_strerror (errno));
         return FALSE;
     }
 

Modified: trunk/libseahorse/seahorse-util.c
==============================================================================
--- trunk/libseahorse/seahorse-util.c	(original)
+++ trunk/libseahorse/seahorse-util.c	Sun Sep 14 23:12:19 2008
@@ -79,7 +79,7 @@
 	
 	error = gtk_message_dialog_new_with_markup (GTK_WINDOW (parent), 
 	                                            GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR,
-	                                            GTK_BUTTONS_CLOSE, text);
+	                                            GTK_BUTTONS_CLOSE, "%s", text);
 	g_free (text);
 	
 	gtk_dialog_run (GTK_DIALOG (error));
@@ -686,7 +686,7 @@
     	g_object_unref (fpackage);
 
     if (out) {
-        g_print (out);
+        g_print ("%s", out);
         g_free (out);
     }
     

Modified: trunk/libseahorse/seahorse-validity.c
==============================================================================
--- trunk/libseahorse/seahorse-validity.c	(original)
+++ trunk/libseahorse/seahorse-validity.c	Sun Sep 14 23:12:19 2008
@@ -22,6 +22,8 @@
 
 #include <glib/gi18n.h>
 
+#include <string.h>
+
 #include "seahorse-validity.h"
 
 const gchar*

Modified: trunk/pgp/seahorse-gpg-options.c
==============================================================================
--- trunk/pgp/seahorse-gpg-options.c	(original)
+++ trunk/pgp/seahorse-gpg-options.c	Sun Sep 14 23:12:19 2008
@@ -52,14 +52,14 @@
     
     if ((fd = open (file, O_CREAT | O_TRUNC | O_WRONLY, mode)) == -1) {
         g_set_error (err, G_IO_CHANNEL_ERROR, g_io_channel_error_from_errno (errno),
-                     strerror (errno));     
+                     "%s", g_strerror (errno));
         return FALSE;
     }
 
     /* Write the header when we make a new file */
     if (write (fd, GPG_CONF_HEADER, strlen (GPG_CONF_HEADER)) == -1) {
         g_set_error (err, G_IO_CHANNEL_ERROR, g_io_channel_error_from_errno (errno),
-                     strerror (errno));     
+                     "%s", strerror (errno));
     }
     
     close (fd);
@@ -92,7 +92,7 @@
         if (mkdir (gpg_homedir, 0700) == -1) {
             g_set_error (err, G_IO_CHANNEL_ERROR, 
                          g_io_channel_error_from_errno (errno),
-                         strerror (errno));     
+                         "%s", strerror (errno));
             return NULL;
         }
     }

Modified: trunk/pgp/seahorse-gpgme-io.c
==============================================================================
--- trunk/pgp/seahorse-gpgme-io.c	(original)
+++ trunk/pgp/seahorse-gpgme-io.c	Sun Sep 14 23:12:19 2008
@@ -41,7 +41,7 @@
 	g_return_val_if_fail (err, -1);
 	
 	if (err->message)
-		g_message (err->message);
+		g_message ("%s", err->message);
 	
 	switch (err->code) {
 	case G_IO_ERROR_FAILED:

Modified: trunk/pgp/seahorse-hkp-source.c
==============================================================================
--- trunk/pgp/seahorse-hkp-source.c	(original)
+++ trunk/pgp/seahorse-hkp-source.c	Sun Sep 14 23:12:19 2008
@@ -315,7 +315,7 @@
     g_object_get (hop->hsrc, "key-server", &server, NULL);
 
     if (text) {
-        error = g_error_new (HKP_ERROR_DOMAIN, msg ? msg->status_code : 0, text);
+        error = g_error_new (HKP_ERROR_DOMAIN, msg ? msg->status_code : 0, "%s", text);
 
     } else if (msg) {
         /* Make the body lower case, and no tags */

Modified: trunk/pgp/seahorse-ldap-source.c
==============================================================================
--- trunk/pgp/seahorse-ldap-source.c	(original)
+++ trunk/pgp/seahorse-ldap-source.c	Sun Sep 14 23:12:19 2008
@@ -481,7 +481,7 @@
         switch (r) {   
         case -1: /* Strange system error */
             seahorse_operation_mark_done (SEAHORSE_OPERATION (lop), FALSE, 
-                g_error_new (LDAP_ERROR_DOMAIN, errno, strerror(errno)));
+                g_error_new (LDAP_ERROR_DOMAIN, errno, "%s", g_strerror (errno)));
             return FALSE;
         
         case 0: /* Timeout exceeded */

Modified: trunk/ssh/seahorse-ssh-askpass.c
==============================================================================
--- trunk/ssh/seahorse-ssh-askpass.c	(original)
+++ trunk/ssh/seahorse-ssh-askpass.c	Sun Sep 14 23:12:19 2008
@@ -37,7 +37,7 @@
 askpass_command (const gchar *cmd, const gchar *arg)
 {
     const gchar* env;
-    gchar *t;
+    gchar *t, *ret;
     int fd;
         
     /* Try an open the connection with seahorse */
@@ -68,7 +68,7 @@
     
     /* Read the setting */
     t = g_new0 (gchar, 512);
-    fgets (t, 512, seahorse_link);
+    ret = fgets (t, 512, seahorse_link);
     
     /* Make sure it worked */
     if (ferror (seahorse_link)) {
@@ -107,7 +107,8 @@
     if (pass == NULL)
         return 1;
     
-    write (1, pass, strlen (pass));
+    if (write (1, pass, strlen (pass)) != strlen (pass))
+	    g_warning ("couldn't write out password properly");
     for (p = pass; *p; p++) 
         *p = 0;
     g_free (pass);