diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-06-07 15:59:52 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-06-07 18:04:23 +0800 |
| commit | 9d8d7a2e4f9cd772fe69dae15c4c21728e974df3 (patch) | |
| tree | 17a2409f7b366531c7e54164a5ab4df795190804 /libempathy-gtk/empathy-protocol-chooser.c | |
| parent | d51deb6864802a780f7d013dda5bb3c715768bfc (diff) | |
| download | gsoc2013-empathy-9d8d7a2e4f9cd772fe69dae15c4c21728e974df3.tar gsoc2013-empathy-9d8d7a2e4f9cd772fe69dae15c4c21728e974df3.tar.gz gsoc2013-empathy-9d8d7a2e4f9cd772fe69dae15c4c21728e974df3.tar.bz2 gsoc2013-empathy-9d8d7a2e4f9cd772fe69dae15c4c21728e974df3.tar.lz gsoc2013-empathy-9d8d7a2e4f9cd772fe69dae15c4c21728e974df3.tar.xz gsoc2013-empathy-9d8d7a2e4f9cd772fe69dae15c4c21728e974df3.tar.zst gsoc2013-empathy-9d8d7a2e4f9cd772fe69dae15c4c21728e974df3.zip | |
remove empathy_account_settings_set_* functions
They don't buy us much so let's just pass the GVariant directly.
Fix some string leaks in empathy-account-widget-irc.c as well.
https://bugzilla.gnome.org/show_bug.cgi?id=677545
Diffstat (limited to 'libempathy-gtk/empathy-protocol-chooser.c')
| -rw-r--r-- | libempathy-gtk/empathy-protocol-chooser.c | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/libempathy-gtk/empathy-protocol-chooser.c b/libempathy-gtk/empathy-protocol-chooser.c index 6751e796f..0396f7834 100644 --- a/libempathy-gtk/empathy-protocol-chooser.c +++ b/libempathy-gtk/empathy-protocol-chooser.c @@ -615,18 +615,19 @@ empathy_protocol_chooser_create_account_settings (EmpathyProtocolChooser *self) empathy_account_settings_set_icon_name_async (settings, "im-google-talk", NULL, NULL); - empathy_account_settings_set_string (settings, "server", - extra_certificate_identities[0]); - empathy_account_settings_set_boolean (settings, "require-encryption", - TRUE); - empathy_account_settings_set_strv (settings, "fallback-servers", - fallback_servers); + empathy_account_settings_set (settings, "server", + g_variant_new_string (extra_certificate_identities[0])); + empathy_account_settings_set (settings, "require-encryption", + g_variant_new_boolean (TRUE)); + empathy_account_settings_set (settings, "fallback-servers", + g_variant_new_strv (fallback_servers, -1)); if (empathy_account_settings_have_tp_param (settings, "extra-certificate-identities")) { - empathy_account_settings_set_strv (settings, - "extra-certificate-identities", extra_certificate_identities); + empathy_account_settings_set (settings, + "extra-certificate-identities", + g_variant_new_strv (extra_certificate_identities, -1)); } } else if (!tp_strdiff (service, "facebook")) @@ -637,12 +638,12 @@ empathy_protocol_chooser_create_account_settings (EmpathyProtocolChooser *self) empathy_account_settings_set_icon_name_async (settings, "im-facebook", NULL, NULL); - empathy_account_settings_set_boolean (settings, "require-encryption", - TRUE); - empathy_account_settings_set_string (settings, "server", - "chat.facebook.com"); - empathy_account_settings_set_strv (settings, "fallback-servers", - fallback_servers); + empathy_account_settings_set (settings, "require-encryption", + g_variant_new_boolean (TRUE)); + empathy_account_settings_set (settings, "server", + g_variant_new_string ("chat.facebook.com")); + empathy_account_settings_set (settings, "fallback-servers", + g_variant_new_strv (fallback_servers, -1)); } out: |