aboutsummaryrefslogtreecommitdiffstats
path: root/src/empathy-accounts-dialog.c
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-02-11 20:34:09 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-02-12 00:01:37 +0800
commitd5c50301939772d752c7f8789a9b5ae81334fab3 (patch)
tree7070ff37419303cde3fdbd46e7201cef1d4fb624 /src/empathy-accounts-dialog.c
parent0d6a5a8caef60613531a96f5f81b55c811200ec8 (diff)
downloadgsoc2013-empathy-d5c50301939772d752c7f8789a9b5ae81334fab3.tar
gsoc2013-empathy-d5c50301939772d752c7f8789a9b5ae81334fab3.tar.gz
gsoc2013-empathy-d5c50301939772d752c7f8789a9b5ae81334fab3.tar.bz2
gsoc2013-empathy-d5c50301939772d752c7f8789a9b5ae81334fab3.tar.lz
gsoc2013-empathy-d5c50301939772d752c7f8789a9b5ae81334fab3.tar.xz
gsoc2013-empathy-d5c50301939772d752c7f8789a9b5ae81334fab3.tar.zst
gsoc2013-empathy-d5c50301939772d752c7f8789a9b5ae81334fab3.zip
add is_facebook arg to empathy_protocol_chooser_dup_selected
So the assistant and accounts dialog can special case facebook accounts.
Diffstat (limited to 'src/empathy-accounts-dialog.c')
-rw-r--r--src/empathy-accounts-dialog.c19
1 files changed, 14 insertions, 5 deletions
diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c
index 4c8ed1346..39e20d860 100644
--- a/src/empathy-accounts-dialog.c
+++ b/src/empathy-accounts-dialog.c
@@ -530,19 +530,25 @@ accounts_dialog_setup_ui_to_add_account (EmpathyAccountsDialog *dialog)
EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
EmpathyAccountSettings *settings;
gchar *str;
- const gchar *display_name;
+ const gchar *name, *display_name;
TpConnectionManager *cm;
TpConnectionManagerProtocol *proto;
- gboolean is_gtalk;
+ gboolean is_gtalk, is_facebook;
cm = empathy_protocol_chooser_dup_selected (
- EMPATHY_PROTOCOL_CHOOSER (priv->combobox_protocol), &proto, &is_gtalk);
+ EMPATHY_PROTOCOL_CHOOSER (priv->combobox_protocol), &proto, &is_gtalk,
+ &is_facebook);
if (cm == NULL)
return;
- display_name = empathy_protocol_name_to_display_name (
- is_gtalk ? "gtalk" : proto->name);
+ if (is_gtalk)
+ name = "gtalk";
+ else if (is_facebook)
+ name ="facebook";
+ else
+ name = proto->name;
+ display_name = empathy_protocol_name_to_display_name (name);
if (display_name == NULL)
display_name = proto->name;
@@ -558,6 +564,9 @@ accounts_dialog_setup_ui_to_add_account (EmpathyAccountsDialog *dialog)
if (is_gtalk)
empathy_account_settings_set_icon_name_async (settings, "im-google-talk",
NULL, NULL);
+ else if (is_facebook)
+ empathy_account_settings_set_icon_name_async (settings, "im-facebook",
+ NULL, NULL);
accounts_dialog_add (dialog, settings);
accounts_dialog_model_set_selected (dialog, settings);