[seahorse] Fixes related to new GTK+3 GtkComboText class.

[Stefan Walter <stefw src gnome org>]

commit 5b9aa67a8841cd54744fd365973ceed8c8524987
Author: Stef Walter <stef memberwebs com>
Date:   Tue Nov 2 18:48:41 2010 +0000

    Fixes related to new GTK+3 GtkComboText class.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=633773

 gkr/seahorse-gkr-add-item.c   |    6 +++++-
 libseahorse/seahorse-prefs.c  |   10 ++++++++--
 pgp/seahorse-gpgme-generate.c |    6 ++++++
 ssh/seahorse-ssh-generate.c   |    8 ++++++++
 4 files changed, 27 insertions(+), 3 deletions(-)
---
diff --git a/gkr/seahorse-gkr-add-item.c b/gkr/seahorse-gkr-add-item.c
index 3d9146c..09d1928 100644
--- a/gkr/seahorse-gkr-add-item.c
+++ b/gkr/seahorse-gkr-add-item.c
@@ -102,8 +102,12 @@ on_add_item_response (GtkDialog *dialog, int response, SeahorseWidget *swidget)
 		secret = gtk_entry_get_text (GTK_ENTRY (widget));
 		
 		widget = seahorse_widget_get_widget (swidget, "item-keyring");
+#if GTK_CHECK_VERSION (2,91,2)
+		keyring = gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT (widget));
+#else
 		keyring = gtk_combo_box_get_active_text (GTK_COMBO_BOX (widget));
-		
+#endif
+
 		attributes = gnome_keyring_attribute_list_new ();
 	    
 		request = gnome_keyring_item_create (keyring, GNOME_KEYRING_ITEM_NOTE, label, 
diff --git a/libseahorse/seahorse-prefs.c b/libseahorse/seahorse-prefs.c
index 11a8ff9..44be3fd 100644
--- a/libseahorse/seahorse-prefs.c
+++ b/libseahorse/seahorse-prefs.c
@@ -350,10 +350,16 @@ on_prefs_keyserver_add_clicked (GtkButton *button, SeahorseWidget *sw)
     for (l = types; l; l = g_slist_next (l))
 	    descriptions = g_slist_append (descriptions, seahorse_servers_get_description (l->data));
     descriptions = g_slist_append (descriptions, g_strdup (_("Custom")));
-    
-    gtk_combo_box_remove_text (GTK_COMBO_BOX (widget), 0);    
+
+#if GTK_CHECK_VERSION (2,91,2)
+    gtk_combo_box_text_remove (GTK_COMBO_BOX_TEXT (widget), 0);
+    for (l = descriptions; l; l = g_slist_next (l))
+        gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), l->data ? l->data : "");
+#else
+    gtk_combo_box_remove_text (GTK_COMBO_BOX (widget), 0);
     for (l = descriptions; l; l = g_slist_next (l))
         gtk_combo_box_append_text (GTK_COMBO_BOX (widget), l->data ? l->data : "");
+#endif
     gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 0);
     seahorse_util_string_slist_free (descriptions);
 
diff --git a/pgp/seahorse-gpgme-generate.c b/pgp/seahorse-gpgme-generate.c
index 8913b6f..0dc8e76 100644
--- a/pgp/seahorse-gpgme-generate.c
+++ b/pgp/seahorse-gpgme-generate.c
@@ -435,9 +435,15 @@ seahorse_gpgme_generate_show (SeahorseGpgmeSource *sksrc, GtkWindow *parent, con
     /* The algoritms */
     widget = seahorse_widget_get_widget (swidget, "algorithm-choice");
     g_return_if_fail (widget != NULL);
+#if GTK_CHECK_VERSION (2,91,2)
+    gtk_combo_box_text_remove (GTK_COMBO_BOX_TEXT (widget), 0);
+    for(i = 0; i < G_N_ELEMENTS(available_algorithms); i++)
+        gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), _(available_algorithms[i].desc));
+#else
     gtk_combo_box_remove_text (GTK_COMBO_BOX (widget), 0);
     for(i = 0; i < G_N_ELEMENTS(available_algorithms); i++)
         gtk_combo_box_append_text (GTK_COMBO_BOX (widget), _(available_algorithms[i].desc));
+#endif
     gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 0);
     on_gpgme_generate_algorithm_changed (GTK_COMBO_BOX (widget), swidget);
     
diff --git a/ssh/seahorse-ssh-generate.c b/ssh/seahorse-ssh-generate.c
index cc958a5..f10da2f 100644
--- a/ssh/seahorse-ssh-generate.c
+++ b/ssh/seahorse-ssh-generate.c
@@ -125,7 +125,11 @@ on_change (GtkComboBox *combo, SeahorseWidget *swidget)
     widget = seahorse_widget_get_widget (swidget, "bits-entry");
     g_return_if_fail (widget != NULL);
     
+#if GTK_CHECK_VERSION (2,91,2)
+    t = gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT (combo));
+#else
     t = gtk_combo_box_get_active_text (combo);
+#endif
     if (t && strstr (t, "DSA")) {
         gtk_spin_button_set_value (GTK_SPIN_BUTTON (widget), DSA_SIZE);
         gtk_widget_set_sensitive (widget, FALSE);
@@ -169,7 +173,11 @@ on_response (GtkDialog *dialog, guint response, SeahorseWidget *swidget)
     /* The algorithm */
     widget = seahorse_widget_get_widget (swidget, "algorithm-choice");
     g_return_if_fail (widget != NULL);
+#if GTK_CHECK_VERSION (2,91,2)
+    t = gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT (widget));
+#else
     t = gtk_combo_box_get_active_text (GTK_COMBO_BOX (widget));
+#endif
     if (t && strstr (t, "DSA"))
         type = SSH_ALGO_DSA;
     else