diff options
| author | Milan Crha <mcrha@redhat.com> | 2010-11-18 20:35:36 +0800 |
|---|---|---|
| committer | Rodrigo Moya <rodrigo@gnome-db.org> | 2011-06-30 00:41:01 +0800 |
| commit | 12a91dbb21f2a052d26460c9aad30835fd17456b (patch) | |
| tree | 5dede0765bb0f74f363614a05210e533655e0c39 /smime | |
| parent | 9e833a704ce57e4f571d0da91e795e6ae7cc2469 (diff) | |
| download | gsoc2013-evolution-12a91dbb21f2a052d26460c9aad30835fd17456b.tar.gz gsoc2013-evolution-12a91dbb21f2a052d26460c9aad30835fd17456b.tar.zst gsoc2013-evolution-12a91dbb21f2a052d26460c9aad30835fd17456b.zip | |
Bug #633779 - GtkComboBoxText issues
Diffstat (limited to 'smime')
| -rw-r--r-- | smime/gui/e-cert-selector.c | 13 | ||||
| -rw-r--r-- | smime/gui/smime-ui.ui | 2 |
2 files changed, 9 insertions, 6 deletions
diff --git a/smime/gui/e-cert-selector.c b/smime/gui/e-cert-selector.c index 5bbf3afc40..f20baa582c 100644 --- a/smime/gui/e-cert-selector.c +++ b/smime/gui/e-cert-selector.c @@ -37,9 +37,6 @@ #include "e-util/e-util.h" #include "e-util/e-util-private.h" -/* backward-compatibility cruft */ -#include "e-util/gtk-compat.h" - struct _ECertSelectorPrivate { CERTCertList *certlist; @@ -153,6 +150,8 @@ e_cert_selector_new (gint type, const gchar *currentid) GtkBuilder *builder; GtkWidget *content_area; GtkWidget *w; + GtkListStore *store; + GtkTreeIter iter; gint n=0, active=0; ecs = g_object_new (e_cert_selector_get_type (), NULL); @@ -179,7 +178,8 @@ e_cert_selector_new (gint type, const gchar *currentid) break; } - gtk_list_store_clear (GTK_LIST_STORE (gtk_combo_box_get_model (GTK_COMBO_BOX (p->combobox)))); + store = GTK_LIST_STORE (gtk_combo_box_get_model (GTK_COMBO_BOX (p->combobox))); + gtk_list_store_clear (store); certlist = CERT_FindUserCertsByUsage (CERT_GetDefaultCertDB (), usage, FALSE, TRUE, NULL); ecs->priv->certlist = certlist; @@ -187,7 +187,10 @@ e_cert_selector_new (gint type, const gchar *currentid) node = CERT_LIST_HEAD (certlist); while (!CERT_LIST_END (node, certlist)) { if (node->cert->nickname || node->cert->emailAddr) { - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (p->combobox), node->cert->nickname?node->cert->nickname:node->cert->emailAddr); + gtk_list_store_append (store, &iter); + gtk_list_store_set (store, &iter, + 0, node->cert->nickname?node->cert->nickname:node->cert->emailAddr, + -1); if (currentid != NULL && ((node->cert->nickname != NULL && strcmp (node->cert->nickname, currentid) == 0) diff --git a/smime/gui/smime-ui.ui b/smime/gui/smime-ui.ui index 0f876ea36e..3d3dd28939 100644 --- a/smime/gui/smime-ui.ui +++ b/smime/gui/smime-ui.ui @@ -1332,7 +1332,7 @@ </packing> </child> <child> - <object class="GtkComboBoxText" id="cert_combobox"> + <object class="GtkComboBox" id="cert_combobox"> <property name="visible">True</property> <property name="model">model1</property> <child> |