diff -u seahorse-2.23.90/debian/changelog seahorse-2.23.90/debian/changelog
--- seahorse-2.23.90/debian/changelog
+++ seahorse-2.23.90/debian/changelog
@@ -1,3 +1,10 @@
+seahorse (2.23.90-0ubuntu2) intrepid; urgency=low
+
+  * Added patch to prevent Nullbytes being written to .authorized_keys (lp: #257415)
+  * Added patch to Clear passwords-tab before refilling (lp: #256679)
+
+ -- Andreas Moog <andreas.moog@warperbbs.de>  Fri, 29 Aug 2008 02:52:00 +0200
+
 seahorse (2.23.90-0ubuntu1) intrepid; urgency=low
 
   * New upstream version:
diff -u seahorse-2.23.90/debian/patches/series seahorse-2.23.90/debian/patches/series
--- seahorse-2.23.90/debian/patches/series
+++ seahorse-2.23.90/debian/patches/series
@@ -3 +3,3 @@
+12_nullbytes.diff
 80_autoconf_update.patch
+13_multiplepassword
only in patch2:
unchanged:
--- seahorse-2.23.90.orig/debian/patches/12_nullbytes.diff
+++ seahorse-2.23.90/debian/patches/12_nullbytes.diff
@@ -0,0 +1,22 @@
+Index: seahorse-2.23.90/ssh/seahorse-ssh-operation.c
+===================================================================
+--- seahorse-2.23.90.orig/ssh/seahorse-ssh-operation.c	2008-08-29 02:37:52.000000000 +0200
++++ seahorse-2.23.90/ssh/seahorse-ssh-operation.c	2008-08-29 02:38:42.000000000 +0200
+@@ -738,7 +738,7 @@
+     SeahorseOperation *op;
+     GMemoryOutputStream *output;
+     gchar *data;
+-    size_t length;
++    size_t length, size, strl;
+     gchar *cmd;
+     
+     g_return_val_if_fail (keys != NULL, NULL);
+@@ -783,7 +783,7 @@
+                            port ? port : "");
+     
+ 	data = g_memory_output_stream_get_data (output);
+-	length = seahorse_util_memory_output_length (output);
++	length = strlen (data);
+ 	g_object_unref (output);
+     
+ 	op = seahorse_ssh_operation_new (ssrc, cmd, data, length, NULL);
only in patch2:
unchanged:
--- seahorse-2.23.90.orig/debian/patches/13_multiplepassword
+++ seahorse-2.23.90/debian/patches/13_multiplepassword
@@ -0,0 +1,58 @@
+Index: seahorse-2.23.90/src/seahorse-key-manager.c
+===================================================================
+--- seahorse-2.23.90.orig/src/seahorse-key-manager.c	2008-08-29 02:43:20.000000000 +0200
++++ seahorse-2.23.90/src/seahorse-key-manager.c	2008-08-29 02:50:56.000000000 +0200
+@@ -135,6 +135,8 @@
+ static void seahorse_key_manager_on_gconf_notify (SeahorseKeyManager* self, GConfClient* client, guint cnxn_id, GConfEntry* entry);
+ static gboolean seahorse_key_manager_fire_selection_changed (SeahorseKeyManager* self);
+ static void seahorse_key_manager_on_tab_changed (SeahorseKeyManager* self, GtkNotebook* notebook, void* unused, guint page_num);
++static void __lambda0 (SeahorseOperation* op, SeahorseKeyManager* self);
++static void ___lambda0_seahorse_done_func (SeahorseOperation* op, gpointer self);
+ static void seahorse_key_manager_load_gnome_keyring_items (SeahorseKeyManager* self);
+ static void _seahorse_key_manager_on_app_quit_gtk_action_activate (GtkAction* _sender, gpointer self);
+ static void _seahorse_key_manager_on_key_generate_gtk_action_activate (GtkAction* _sender, gpointer self);
+@@ -973,6 +975,19 @@
+ }
+ 
+ 
++static void __lambda0 (SeahorseOperation* op, SeahorseKeyManager* self) {
++         g_return_if_fail (SEAHORSE_IS_OPERATION (op));
++         if (seahorse_operation_is_successful (op)) {
++                 self->priv->_loaded_gnome_keyring = TRUE;
++         }
++}
++
++
++static void ___lambda0_seahorse_done_func (SeahorseOperation* op, gpointer self) {
++         __lambda0 (op, self);
++}
++
++
+ static void seahorse_key_manager_load_gnome_keyring_items (SeahorseKeyManager* self) {
+ 	GType type;
+ 	SeahorseSource* sksrc;
+@@ -988,6 +1003,7 @@
+ 	op = seahorse_source_load (sksrc, ((GQuark) (0)));
+ 	/* Monitor loading progress */
+ 	seahorse_progress_status_set_operation (SEAHORSE_WIDGET (self), op);
++	seahorse_operation_watch (op, ___lambda0_seahorse_done_func, self, NULL, NULL);
+ 	(sksrc == NULL ? NULL : (sksrc = (g_object_unref (sksrc), NULL)));
+ 	(op == NULL ? NULL : (op = (g_object_unref (op), NULL)));
+ }
+Index: seahorse-2.23.90/src/seahorse-key-manager.vala
+===================================================================
+--- seahorse-2.23.90.orig/src/seahorse-key-manager.vala	2008-08-29 02:47:37.000000000 +0200
++++ seahorse-2.23.90/src/seahorse-key-manager.vala	2008-08-29 02:49:43.000000000 +0200
+@@ -731,6 +731,12 @@
+ 			
+ 			/* Monitor loading progress */
+ 			Progress.status_set_operation (this, op);
++
++			/* After load completes set loaded to TRUE */
++ 	  	        op.watch ((op) => {if (op.is_successful ())
++                    		_loaded_gnome_keyring = true;
++                             },
++                       null);
+ 		}
+ 	}
+ }