[seahorse] Use GcrSecureEntryBuffer and remove duplicate code

[Stefan Walter <stefw src gnome org>]

commit d62ff173c02beba7b73e0dbbcca7558df4f51917
Author: Stef Walter <stefw gnome org>
Date:   Sat Jun 23 16:07:40 2012 +0200

    Use GcrSecureEntryBuffer and remove duplicate code
    
     * Remove duplicate SeahorseSecureBuffer since we have the
       equivalent in the gcr library

 gkr/seahorse-gkr-add-item.c          |    3 +-
 gkr/seahorse-gkr-item-properties.c   |    3 +-
 libseahorse/Makefile.am              |    1 -
 libseahorse/seahorse-passphrase.c    |    7 +-
 libseahorse/seahorse-secure-buffer.c |  196 ----------------------------------
 libseahorse/seahorse-secure-buffer.h |   57 ----------
 6 files changed, 6 insertions(+), 261 deletions(-)
---
diff --git a/gkr/seahorse-gkr-add-item.c b/gkr/seahorse-gkr-add-item.c
index e58fb31..fc21cd6 100644
--- a/gkr/seahorse-gkr-add-item.c
+++ b/gkr/seahorse-gkr-add-item.c
@@ -24,7 +24,6 @@
 #include "seahorse-gkr-dialogs.h"
 #include "seahorse-gkr-keyring.h"
 
-#include "seahorse-secure-buffer.h"
 #include "seahorse-widget.h"
 #include "seahorse-util.h"
 
@@ -171,7 +170,7 @@ seahorse_gkr_add_item_show (GtkWindow *parent)
 	
 	widget = seahorse_widget_get_widget (swidget, "password-area");
 	g_return_if_fail (widget);
-	buffer = seahorse_secure_buffer_new ();
+	buffer = gcr_secure_entry_buffer_new ();
 	entry = gtk_entry_new_with_buffer (buffer);
 	g_object_unref (buffer);
 	gtk_container_add (GTK_CONTAINER (widget), GTK_WIDGET (entry));
diff --git a/gkr/seahorse-gkr-item-properties.c b/gkr/seahorse-gkr-item-properties.c
index db38419..b4f1db2 100644
--- a/gkr/seahorse-gkr-item-properties.c
+++ b/gkr/seahorse-gkr-item-properties.c
@@ -32,7 +32,6 @@
 #include "seahorse-object.h"
 #include "seahorse-object-widget.h"
 #include "seahorse-progress.h"
-#include "seahorse-secure-buffer.h"
 #include "seahorse-secure-memory.h"
 #include "seahorse-util.h"
 #include "seahorse-widget.h"
@@ -434,7 +433,7 @@ setup_main (SeahorseWidget *swidget)
 	                             seahorse_widget_get_widget (swidget, "login-field"), NULL);
 
 	/* Create the password entry */
-	buffer = seahorse_secure_buffer_new ();
+	buffer = gcr_secure_entry_buffer_new ();
 	widget = gtk_entry_new_with_buffer (buffer);
 	g_object_unref (buffer);
 
diff --git a/libseahorse/Makefile.am b/libseahorse/Makefile.am
index be5db0d..4f885ba 100644
--- a/libseahorse/Makefile.am
+++ b/libseahorse/Makefile.am
@@ -58,7 +58,6 @@ libseahorse_la_SOURCES = \
 	seahorse-progress.c seahorse-progress.h \
 	seahorse-registry.c seahorse-registry.h \
 	seahorse-secure-memory.c seahorse-secure-memory.h \
-	seahorse-secure-buffer.c seahorse-secure-buffer.h \
 	seahorse-servers.c seahorse-servers.h \
 	seahorse-types.c seahorse-types.h \
 	seahorse-util.c seahorse-util.h \
diff --git a/libseahorse/seahorse-passphrase.c b/libseahorse/seahorse-passphrase.c
index abd87fe..4239c14 100644
--- a/libseahorse/seahorse-passphrase.c
+++ b/libseahorse/seahorse-passphrase.c
@@ -46,8 +46,9 @@
 #include <gdk/gdkkeysyms.h>
 #include <gdk/gdkkeysyms-compat.h>
 
+#include <gcr/gcr.h>
+
 #include "seahorse-passphrase.h"
-#include "seahorse-secure-buffer.h"
 #include "seahorse-util.h"
 #include "seahorse-widget.h"
 
@@ -228,7 +229,7 @@ seahorse_passphrase_prompt_show (const gchar *title,
 		gtk_misc_set_alignment (GTK_MISC (widget), 0.0, 0.5);
 		gtk_grid_attach (grid, widget, 0, 0, 1, 1);
 
-		buffer = seahorse_secure_buffer_new ();
+		buffer = gcr_secure_entry_buffer_new ();
 		entry = GTK_ENTRY (gtk_entry_new_with_buffer (buffer));
 		g_object_unref (buffer);
 		gtk_entry_set_visibility (entry, FALSE);
@@ -247,7 +248,7 @@ seahorse_passphrase_prompt_show (const gchar *title,
 	gtk_misc_set_alignment (GTK_MISC (widget), 0.0, 0.5);
 	gtk_grid_attach (grid, widget, 0, 1, 1, 1);
 
-	buffer = seahorse_secure_buffer_new ();
+	buffer = gcr_secure_entry_buffer_new ();
 	entry = GTK_ENTRY (gtk_entry_new_with_buffer (buffer));
 	g_object_unref (buffer);
 	gtk_widget_set_size_request (GTK_WIDGET (entry), 200, -1);