seahorse r2398 - in seahorse-plugins/trunk: libseahorse plugins/gedit plugins/nautilus

[sadam svn gnome org]

Author: sadam
Date: Wed Aug 27 16:54:54 2008
New Revision: 2398
URL: http://svn.gnome.org/viewvc/seahorse?rev=2398&view=rev

Log:
2008-08-27  Adam Schreiber  <sadam clemson edu>
    
    * plugins/nautilus/seahorse-tool.c:
    * plugins/gedit/seahorse-gedit.c:
    * libseahorse/seahorse-util.c:
    * libseahorse/seahorse-gpg-options.c: Fix compiler warnings


Modified:
   seahorse-plugins/trunk/libseahorse/seahorse-gpg-options.c
   seahorse-plugins/trunk/libseahorse/seahorse-util.c
   seahorse-plugins/trunk/plugins/gedit/seahorse-gedit.c
   seahorse-plugins/trunk/plugins/nautilus/seahorse-tool.c

Modified: seahorse-plugins/trunk/libseahorse/seahorse-gpg-options.c
==============================================================================
--- seahorse-plugins/trunk/libseahorse/seahorse-gpg-options.c	(original)
+++ seahorse-plugins/trunk/libseahorse/seahorse-gpg-options.c	Wed Aug 27 16:54:54 2008
@@ -50,14 +50,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));     
+                     strerror (errno), NULL);     
         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));     
+                     strerror (errno), NULL);     
     }
     
     close (fd);
@@ -90,7 +90,7 @@
         if (mkdir (gpg_homedir, 0700) == -1) {
             g_set_error (err, G_IO_CHANNEL_ERROR, 
                          g_io_channel_error_from_errno (errno),
-                         strerror (errno));     
+                         strerror (errno), NULL);     
             return NULL;
         }
     }

Modified: seahorse-plugins/trunk/libseahorse/seahorse-util.c
==============================================================================
--- seahorse-plugins/trunk/libseahorse/seahorse-util.c	(original)
+++ seahorse-plugins/trunk/libseahorse/seahorse-util.c	Wed Aug 27 16:54:54 2008
@@ -60,7 +60,7 @@
         t = g_strdup (message);
 	
 	error = gtk_message_dialog_new_with_markup (parent, GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR,
-		GTK_BUTTONS_CLOSE, t);
+		GTK_BUTTONS_CLOSE, t, NULL);
     g_free (t);
 	
 	gtk_dialog_run (GTK_DIALOG (error));
@@ -629,7 +629,7 @@
     g_free (cmd); 
     
     if (out) {
-        g_print (out);
+        g_print (out, NULL);
         g_free (out);
     }
     

Modified: seahorse-plugins/trunk/plugins/gedit/seahorse-gedit.c
==============================================================================
--- seahorse-plugins/trunk/plugins/gedit/seahorse-gedit.c	(original)
+++ seahorse-plugins/trunk/plugins/gedit/seahorse-gedit.c	Wed Aug 27 16:54:54 2008
@@ -241,7 +241,7 @@
                     error->message ? error->message : "", NULL);
     
     dlg = gtk_message_dialog_new_with_markup (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR,
-                                              GTK_BUTTONS_CLOSE, t);
+                                              GTK_BUTTONS_CLOSE, t, NULL);
     g_free (t);
     
     gtk_dialog_run (GTK_DIALOG (dlg));

Modified: seahorse-plugins/trunk/plugins/nautilus/seahorse-tool.c
==============================================================================
--- seahorse-plugins/trunk/plugins/nautilus/seahorse-tool.c	(original)
+++ seahorse-plugins/trunk/plugins/nautilus/seahorse-tool.c	Wed Aug 27 16:54:54 2008
@@ -469,7 +469,7 @@
 	t = g_strdup_printf (ngettext ("Imported %d key", "Imported %d keys", mode->imports), mode->imports);
         
     dlg = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
-                                  GTK_MESSAGE_INFO, GTK_BUTTONS_OK, t);
+                                  GTK_MESSAGE_INFO, GTK_BUTTONS_OK, t, NULL);
     g_free (t);
     gtk_dialog_run (GTK_DIALOG (dlg));
     gtk_widget_destroy (dlg);