char *str;
GtkWidget *account_widget;
EmpathyAccountWidget *widget_object = NULL;
+ gboolean is_gtalk;
priv = GET_PRIV (self);
cm = empathy_protocol_chooser_dup_selected (
- EMPATHY_PROTOCOL_CHOOSER (chooser), &proto);
+ EMPATHY_PROTOCOL_CHOOSER (chooser), &proto, &is_gtalk);
if (cm == NULL || proto == NULL)
/* we are not ready yet */
/* Create account */
/* To translator: %s is the protocol name */
- str = g_strdup_printf (_("New %s account"), proto->name);
+ str = g_strdup_printf (_("New %s account"),
+ empathy_protocol_name_to_display_name (
+ is_gtalk ? "gtalk" : proto->name));
settings = empathy_account_settings_new (cm->name, proto->name, str);
+ empathy_account_settings_set_icon_name_async (settings, "im-google-talk",
+ NULL, NULL);
+
if (priv->first_resp == RESPONSE_CREATE_ACCOUNT)
empathy_account_settings_set_boolean (settings, "register", TRUE);
}
static void
-empathy_account_dialog_widget_cancelled_cb (EmpathyAccountWidget *widget_object,
+empathy_account_dialog_widget_cancelled_cb (
+ EmpathyAccountWidget *widget_object,
EmpathyAccountsDialog *dialog)
{
GtkTreeView *view;
{
TpConnectionManager *cm;
TpConnectionManagerProtocol *proto;
+ gboolean is_gtalk;
EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
cm = empathy_protocol_chooser_dup_selected (
- EMPATHY_PROTOCOL_CHOOSER (priv->combobox_protocol), &proto);
+ EMPATHY_PROTOCOL_CHOOSER (priv->combobox_protocol), &proto, &is_gtalk);
if (cm == NULL)
return;
return;
}
- if (tp_connection_manager_protocol_can_register (proto))
+ if (tp_connection_manager_protocol_can_register (proto) && !is_gtalk)
{
gtk_widget_show (priv->radiobutton_register);
gtk_widget_show (priv->radiobutton_reuse);
name = empathy_account_get_display_name (account);
enabled = empathy_account_is_enabled (account);
+ settings = empathy_account_settings_new_for_account (account);
+
if (!accounts_dialog_get_account_iter (dialog, account, &iter))
gtk_list_store_append (GTK_LIST_STORE (model), &iter);
- settings = empathy_account_settings_new_for_account (account);
-
gtk_list_store_set (GTK_LIST_STORE (model), &iter,
COL_NAME, name,
COL_STATUS, status,
TpConnectionManager *cm;
TpConnectionManagerProtocol *proto;
EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
+ gboolean is_gtalk;
cm = empathy_protocol_chooser_dup_selected (
- EMPATHY_PROTOCOL_CHOOSER (priv->combobox_protocol), &proto);
- display_name = empathy_protocol_name_to_display_name (proto->name);
+ EMPATHY_PROTOCOL_CHOOSER (priv->combobox_protocol), &proto, &is_gtalk);
+
+ display_name = empathy_protocol_name_to_display_name (
+ is_gtalk ? "gtalk" : proto->name);
if (display_name == NULL)
display_name = proto->name;
gboolean active;
active = gtk_toggle_button_get_active
- (GTK_TOGGLE_BUTTON (priv->radiobutton_register));
+ (GTK_TOGGLE_BUTTON (priv->radiobutton_register));
if (active)
empathy_account_settings_set_boolean (settings, "register", TRUE);
}
+ if (is_gtalk)
+ empathy_account_settings_set_icon_name_async (settings, "im-google-talk",
+ NULL, NULL);
+
accounts_dialog_add (dialog, settings);
accounts_dialog_model_set_selected (dialog, settings);