seahorse r2452 - in trunk: . gkr libseahorse pgp pkcs11 src ssh

[nnielsen svn gnome org]

Author: nnielsen
Date: Sun Sep  7 14:44:38 2008
New Revision: 2452
URL: http://svn.gnome.org/viewvc/seahorse?rev=2452&view=rev

Log:
	* libseahorse/libseahorse-c.vapi: Fix ownership problem 
	with seahorse_multi_operation_take().
	
	* src/seahorse-key-manager.vala: Fix dumb 'Couldn't import keys'
	error message when success. Fixes bug #544059


Modified:
   trunk/ChangeLog
   trunk/gkr/vala-build.stamp
   trunk/libseahorse/libseahorse-c.vapi
   trunk/pgp/vala-build.stamp
   trunk/pkcs11/vala-build.stamp
   trunk/src/seahorse-key-manager.c
   trunk/src/seahorse-key-manager.vala
   trunk/src/vala-build.stamp
   trunk/ssh/vala-build.stamp

Modified: trunk/gkr/vala-build.stamp
==============================================================================
--- trunk/gkr/vala-build.stamp	(original)
+++ trunk/gkr/vala-build.stamp	Sun Sep  7 14:44:38 2008
@@ -1 +1 @@
-1220761697
+1220798429

Modified: trunk/libseahorse/libseahorse-c.vapi
==============================================================================
--- trunk/libseahorse/libseahorse-c.vapi	(original)
+++ trunk/libseahorse/libseahorse-c.vapi	Sun Sep  7 14:44:38 2008
@@ -87,7 +87,7 @@
 
 	[CCode (cheader_filename = "seahorse-operation.h")]
 	public class MultiOperation : Operation {
-		public void take (Operation op);
+		public void take (Operation# op);
 	}
 	
 	[CCode (cheader_filename = "seahorse-context.h")]

Modified: trunk/pgp/vala-build.stamp
==============================================================================
--- trunk/pgp/vala-build.stamp	(original)
+++ trunk/pgp/vala-build.stamp	Sun Sep  7 14:44:38 2008
@@ -1 +1 @@
-1220761707
+1220798439

Modified: trunk/pkcs11/vala-build.stamp
==============================================================================
--- trunk/pkcs11/vala-build.stamp	(original)
+++ trunk/pkcs11/vala-build.stamp	Sun Sep  7 14:44:38 2008
@@ -1 +1 @@
-1220761702
+1220798433

Modified: trunk/src/seahorse-key-manager.c
==============================================================================
--- trunk/src/seahorse-key-manager.c	(original)
+++ trunk/src/seahorse-key-manager.c	Sun Sep  7 14:44:38 2008
@@ -562,10 +562,10 @@
 		uri_collection = uris;
 		uri_collection_length1 = uris_length1;
 		for (uri_it = 0; (uris_length1 != -1 && uri_it < uris_length1) || (uris_length1 == -1 && uri_collection[uri_it] != NULL); uri_it = uri_it + 1) {
-			const char* _tmp1;
+			const char* _tmp2;
 			char* uri;
-			_tmp1 = NULL;
-			uri = (_tmp1 = uri_collection[uri_it], (_tmp1 == NULL ? NULL : g_strdup (_tmp1)));
+			_tmp2 = NULL;
+			uri = (_tmp2 = uri_collection[uri_it], (_tmp2 == NULL ? NULL : g_strdup (_tmp2)));
 			{
 				GQuark ktype;
 				SeahorseSource* _tmp0;
@@ -589,13 +589,15 @@
 					GFile* file;
 					GFileInputStream* input;
 					SeahorseOperation* op;
+					SeahorseOperation* _tmp1;
 					file = g_file_new_for_uri (uri);
 					input = g_file_read (file, NULL, &inner_error);
 					if (inner_error != NULL) {
 						goto __catch0_g_error;
 					}
 					op = seahorse_source_import (sksrc, G_INPUT_STREAM (input));
-					seahorse_multi_operation_take (mop, op);
+					_tmp1 = NULL;
+					seahorse_multi_operation_take (mop, (_tmp1 = op, (_tmp1 == NULL ? NULL : g_object_ref (_tmp1))));
 					(file == NULL ? NULL : (file = (g_object_unref (file), NULL)));
 					(input == NULL ? NULL : (input = (g_object_unref (input), NULL)));
 					(op == NULL ? NULL : (op = (g_object_unref (op), NULL)));
@@ -607,7 +609,7 @@
 					ex = inner_error;
 					inner_error = NULL;
 					{
-						g_string_append_printf (errmsg, "%s: %s", uri, ex->message);
+						g_string_append_printf (errmsg, "%s: %s\n", uri, ex->message);
 						(ex == NULL ? NULL : (ex = (g_error_free (ex), NULL)));
 						uri = (g_free (uri), NULL);
 						(sksrc == NULL ? NULL : (sksrc = (g_object_unref (sksrc), NULL)));
@@ -625,7 +627,7 @@
 		seahorse_progress_show (SEAHORSE_OPERATION (mop), _ ("Importing keys"), TRUE);
 		seahorse_operation_watch (SEAHORSE_OPERATION (mop), _seahorse_key_manager_imported_keys_seahorse_done_func, self, NULL, NULL);
 	}
-	if (errmsg->len == 0) {
+	if (errmsg->len > 0) {
 		seahorse_util_show_error (GTK_WIDGET (seahorse_viewer_get_window (SEAHORSE_VIEWER (self))), _ ("Couldn't import keys"), errmsg->str);
 	}
 	(mop == NULL ? NULL : (mop = (g_object_unref (mop), NULL)));

Modified: trunk/src/seahorse-key-manager.vala
==============================================================================
--- trunk/src/seahorse-key-manager.vala	(original)
+++ trunk/src/seahorse-key-manager.vala	Sun Sep  7 14:44:38 2008
@@ -496,7 +496,7 @@
 					mop.take (op);
 					
 				} catch (GLib.Error ex) {
-					errmsg.append_printf ("%s: %s", uri, ex.message);
+					errmsg.append_printf ("%s: %s\n", uri, ex.message);
 					continue;
 				}
 			}
@@ -506,7 +506,7 @@
 				mop.watch (imported_keys, null);
 			}
 			
-			if (errmsg.len == 0)
+			if (errmsg.len > 0)
 				Util.show_error (window, _("Couldn't import keys"), errmsg.str);
 		}
 		

Modified: trunk/src/vala-build.stamp
==============================================================================
--- trunk/src/vala-build.stamp	(original)
+++ trunk/src/vala-build.stamp	Sun Sep  7 14:44:38 2008
@@ -1 +1 @@
-1220761717
+1220798615

Modified: trunk/ssh/vala-build.stamp
==============================================================================
--- trunk/ssh/vala-build.stamp	(original)
+++ trunk/ssh/vala-build.stamp	Sun Sep  7 14:44:38 2008
@@ -1 +1 @@
-1220761712
+1220798446