aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-03-29 21:12:10 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-03-29 21:17:11 +0800
commit39cc5827bfe5dc0280e0b8a720459b04e613b802 (patch)
tree621b60923b38d42c4cf5badb501e875bac24a379
parent889cbf11540c152be0e1c2d63758e5da8bd10a5f (diff)
downloadgsoc2013-empathy-39cc5827bfe5dc0280e0b8a720459b04e613b802.tar
gsoc2013-empathy-39cc5827bfe5dc0280e0b8a720459b04e613b802.tar.gz
gsoc2013-empathy-39cc5827bfe5dc0280e0b8a720459b04e613b802.tar.bz2
gsoc2013-empathy-39cc5827bfe5dc0280e0b8a720459b04e613b802.tar.lz
gsoc2013-empathy-39cc5827bfe5dc0280e0b8a720459b04e613b802.tar.xz
gsoc2013-empathy-39cc5827bfe5dc0280e0b8a720459b04e613b802.tar.zst
gsoc2013-empathy-39cc5827bfe5dc0280e0b8a720459b04e613b802.zip
account-widget-sip: use gtk_list_store_insert_with_values()
-rw-r--r--libempathy-gtk/empathy-account-widget-sip.c33
1 files changed, 16 insertions, 17 deletions
diff --git a/libempathy-gtk/empathy-account-widget-sip.c b/libempathy-gtk/empathy-account-widget-sip.c
index d11634e75..05be1b874 100644
--- a/libempathy-gtk/empathy-account-widget-sip.c
+++ b/libempathy-gtk/empathy-account-widget-sip.c
@@ -136,7 +136,6 @@ empathy_account_widget_sip_build (EmpathyAccountWidget *self,
else
{
GtkListStore *store;
- GtkTreeIter iter;
GtkCellRenderer *renderer;
GtkToggleButton *checkbutton_tel;
@@ -202,17 +201,17 @@ empathy_account_widget_sip_build (EmpathyAccountWidget *self,
gtk_cell_layout_add_attribute (
GTK_CELL_LAYOUT (settings->combobox_transport), renderer, "text", 1);
- gtk_list_store_append (store, &iter);
- gtk_list_store_set (store, &iter, 0, "auto", 1, _("Auto"), -1);
+ gtk_list_store_insert_with_values (store, NULL, -1,
+ 0, "auto", 1, _("Auto"), -1);
- gtk_list_store_append (store, &iter);
- gtk_list_store_set (store, &iter, 0, "udp", 1, _("UDP"), -1);
+ gtk_list_store_insert_with_values (store, NULL, -1,
+ 0, "udp", 1, _("UDP"), -1);
- gtk_list_store_append (store, &iter);
- gtk_list_store_set (store, &iter, 0, "tcp", 1, _("TCP"), -1);
+ gtk_list_store_insert_with_values (store, NULL, -1,
+ 0, "tcp", 1, _("TCP"), -1);
- gtk_list_store_append (store, &iter);
- gtk_list_store_set (store, &iter, 0, "tls", 1, _("TLS"), -1);
+ gtk_list_store_insert_with_values (store, NULL, -1,
+ 0, "tls", 1, _("TLS"), -1);
empathy_account_widget_setup_widget (self, settings->combobox_transport,
"transport");
@@ -235,21 +234,21 @@ empathy_account_widget_sip_build (EmpathyAccountWidget *self,
GTK_CELL_LAYOUT (settings->combobox_keep_alive_mechanism), renderer,
"text", 1);
- gtk_list_store_append (store, &iter);
- gtk_list_store_set (store, &iter, 0, "auto", 1, _("Auto"), -1);
+ gtk_list_store_insert_with_values (store, NULL, -1,
+ 0, "auto", 1, _("Auto"), -1);
- gtk_list_store_append (store, &iter);
/* translators: this string is very specific to SIP's internal; maybe
* best to keep the English version. */
- gtk_list_store_set (store, &iter, 0, "register", 1, _("Register"), -1);
+ gtk_list_store_insert_with_values (store, NULL, -1,
+ 0, "register", 1, _("Register"), -1);
- gtk_list_store_append (store, &iter);
/* translators: this string is very specific to SIP's internal; maybe
* best to keep the English version. */
- gtk_list_store_set (store, &iter, 0, "options", 1, _("Options"), -1);
+ gtk_list_store_insert_with_values (store, NULL, -1,
+ 0, "options", 1, _("Options"), -1);
- gtk_list_store_append (store, &iter);
- gtk_list_store_set (store, &iter, 0, "none", 1, _("None"), -1);
+ gtk_list_store_insert_with_values (store, NULL, -1,
+ 0, "none", 1, _("None"), -1);
g_signal_connect (settings->combobox_keep_alive_mechanism, "changed",
G_CALLBACK (keep_alive_mechanism_combobox_change_cb), settings);