[gnome-keyring] Make buildable with GTK+ 2.20 without deprecated symbols.

[Stefan Walter <stefw src gnome org>]

commit 1ec39cc82cb7e9804e77f1d812882481a01f3ef6
Author: Stef Walter <stef memberwebs com>
Date:   Thu Apr 8 15:50:37 2010 +0000

    Make buildable with GTK+ 2.20 without deprecated symbols.
    
    Now requires GTK+ 2.20.

 configure.in                    |    2 +-
 daemon/prompt/gkd-prompt-tool.c |    4 ++--
 gcr/gcr-import-dialog.c         |    8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/configure.in b/configure.in
index abd9c43..a86f5a3 100644
--- a/configure.in
+++ b/configure.in
@@ -62,7 +62,7 @@ PKG_CHECK_MODULES(GIO, glib-2.0 >= 2.16.0 gio-2.0)
 AC_SUBST(GIO_CFLAGS)
 AC_SUBST(GIO_LIBS)
 
-PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.6.0)
+PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.20.0)
 AC_SUBST(GTK_CFLAGS)
 AC_SUBST(GTK_LIBS)
 
diff --git a/daemon/prompt/gkd-prompt-tool.c b/daemon/prompt/gkd-prompt-tool.c
index ab03fdb..024ae88 100644
--- a/daemon/prompt/gkd-prompt-tool.c
+++ b/daemon/prompt/gkd-prompt-tool.c
@@ -419,7 +419,7 @@ validate_passwords (GtkBuilder *builder, GtkDialog *dialog)
 	g_return_val_if_fail (pentry && centry, FALSE);
 
 	/* No confirm, no password check */
-	if (!GTK_WIDGET_REALIZED (centry))
+	if (!gtk_widget_get_realized (GTK_WIDGET (centry)))
 		return TRUE;
 
 	password = gtk_entry_get_text (GTK_ENTRY (pentry));
@@ -511,7 +511,7 @@ gather_password (GtkBuilder *builder, const gchar *password_type)
 	g_return_if_fail (GTK_IS_ENTRY (entry));
 	g_free (name);
 
-	if (!GTK_WIDGET_REALIZED (GTK_WIDGET (entry)))
+	if (!gtk_widget_get_realized (GTK_WIDGET (entry)))
 		return;
 
 	/* A non-encrypted password: just send the value back */
diff --git a/gcr/gcr-import-dialog.c b/gcr/gcr-import-dialog.c
index 9fcb612..a584046 100644
--- a/gcr/gcr-import-dialog.c
+++ b/gcr/gcr-import-dialog.c
@@ -110,7 +110,7 @@ static void
 gcr_import_dialog_real_realize (GtkWidget *base)
 {
 	GcrImportDialog *self = GCR_IMPORT_DIALOG (base);
-	if (GTK_WIDGET_VISIBLE (self->pv->combo)) 
+	if (gtk_widget_get_visible (GTK_WIDGET (self->pv->combo)))
 		populate_slots (self);	
 	GTK_WIDGET_CLASS (_gcr_import_dialog_parent_class)->realize (base);
 }
@@ -311,7 +311,7 @@ _gcr_import_dialog_get_selected_slot (GcrImportDialog *self)
 	
 	g_return_val_if_fail (GCR_IMPORT_DIALOG (self), NULL);
 	
-	if (GTK_WIDGET_VISIBLE (self->pv->combo))
+	if (gtk_widget_get_visible (GTK_WIDGET (self->pv->combo)))
 		populate_slots (self);
 	else
 		return NULL;
@@ -336,8 +336,8 @@ _gcr_import_dialog_set_selected_slot (GcrImportDialog *self, GP11Slot *slot)
 	gboolean matched;
 
 	g_return_if_fail (GCR_IMPORT_DIALOG (self));
-	
-	if (GTK_WIDGET_VISIBLE (self->pv->combo)) 
+
+	if (gtk_widget_get_visible (GTK_WIDGET (self->pv->combo)))
 		populate_slots (self);
 	else
 		g_return_if_reached ();