commit 4c31b21e2fdc3ca1469457779b5ef2e8dd89b9e6
author Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com> Wed Apr 26 13:45:12 2017 -0400
committer Nicolas Jager <nicolas.jager@savoirfairelinux.com> Thu Apr 27 07:51:07 2017 -0400
tree 6bf899dbdb9cd0c370643ee206c50361f5c258df
parent 40d63252ccf1cd70519d3933045bd40021df31c9

improve combo box model utility functions

- remove filtering of disabled items to simplify code (this can be
  (done via a QSortFilterProxy model if needed)
- add a more generic version of the helper function which doesn't
  force a text renderer

Change-Id: Ic916f7e60f83331a3753b45f56fee1cb38e80858
Reviewed-by: Nicolas Jäger <nicolas.jager@savoirfairelinux.com>

src/accountsecuritytab.cpp

diff --git a/src/accountsecuritytab.cpp b/src/accountsecuritytab.cpp
index de17a32..0e329f8 100644
--- a/src/accountsecuritytab.cpp
+++ b/src/accountsecuritytab.cpp
@@ -402,7 +402,7 @@
     g_signal_connect(priv->checkbutton_use_srtp, "toggled", G_CALLBACK(use_srtp_toggled), self);
 
     /* encryption key exchange type */
-    priv->key_exchange_selection =  gtk_combo_box_set_qmodel(
+    priv->key_exchange_selection =  gtk_combo_box_set_qmodel_text(
         GTK_COMBO_BOX(priv->combobox_key_exchange),
         (QAbstractItemModel *)priv->account->keyExchangeModel(),
         priv->account->keyExchangeModel()->selectionModel());
@@ -488,7 +488,7 @@
     g_signal_connect(priv->entry_password, "changed", G_CALLBACK(private_key_password_changed), self);
 
     /* TLS protocol method */
-    priv->tls_method_selection = gtk_combo_box_set_qmodel(GTK_COMBO_BOX(priv->combobox_tls_protocol_method),
+    priv->tls_method_selection = gtk_combo_box_set_qmodel_text(GTK_COMBO_BOX(priv->combobox_tls_protocol_method),
                                                           (QAbstractItemModel *)priv->account->tlsMethodModel(),
                                                           priv->account->tlsMethodModel()->selectionModel());