Merge branch 'debug-window'

[empathy.git] / src / empathy-accounts-dialog.c

diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c
index ad96ba9218f0e48cb82dbda42f67b031d4740c5b..6fa484924ee208005db9c33585bf19daa84038fd 100644 (file)
--- a/src/empathy-accounts-dialog.c
+++ b/src/empathy-accounts-dialog.c
@@ -240,7 +240,8 @@ account_dialog_create_settings_widget (EmpathyAccountsDialog *dialog,
   gtk_image_set_from_icon_name (GTK_IMAGE (priv->image_type),
       icon_name, GTK_ICON_SIZE_DIALOG);
   gtk_widget_set_tooltip_text (priv->image_type,
-      empathy_account_settings_get_protocol (settings));
+      empathy_protocol_name_to_display_name
+      (empathy_account_settings_get_protocol (settings)));
 
   accounts_dialog_update_name_label (dialog,
       empathy_account_settings_get_display_name (settings));
@@ -290,6 +291,15 @@ accounts_dialog_protocol_changed_cb (GtkWidget *widget,
   cm = empathy_protocol_chooser_dup_selected (
       EMPATHY_PROTOCOL_CHOOSER (priv->combobox_protocol), &proto);
 
+  if (cm == NULL)
+    return;
+
+  if (proto == NULL)
+    {
+      g_object_unref (cm);
+      return;
+    }
+
   if (tp_connection_manager_protocol_can_register (proto))
     {
       gtk_widget_show (priv->radiobutton_register);
@@ -644,7 +654,6 @@ accounts_dialog_model_add_columns (EmpathyAccountsDialog *dialog)
 
   /* Account column */
   column = gtk_tree_view_column_new ();
-  //gtk_tree_view_column_set_title (column, _("Accounts"));
   gtk_tree_view_column_set_expand (column, TRUE);
   gtk_tree_view_append_column (view, column);
 
@@ -711,7 +720,6 @@ static void
 accounts_dialog_model_selection_changed (GtkTreeSelection *selection,
     EmpathyAccountsDialog *dialog)
 {
-//  EmpathyAccountsDialogPriv priv = GET_PRIV (dialog);
   EmpathyAccountSettings *settings;
   GtkTreeModel *model;
   GtkTreeIter   iter;
@@ -726,7 +734,7 @@ accounts_dialog_model_selection_changed (GtkTreeSelection *selection,
 
   accounts_dialog_update_settings (dialog, settings);
 
-  if (settings)
+  if (settings != NULL)
     g_object_unref (settings);
 }
 
@@ -1073,18 +1081,24 @@ accounts_dialog_button_create_clicked_cb (GtkWidget *button,
     EmpathyAccountsDialog *dialog)
 {
   EmpathyAccountSettings *settings;
-  gchar     *str;
+  gchar *str;
+  const gchar *display_name;
   TpConnectionManager *cm;
   TpConnectionManagerProtocol *proto;
   EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
 
   cm = empathy_protocol_chooser_dup_selected (
       EMPATHY_PROTOCOL_CHOOSER (priv->combobox_protocol), &proto);
+  display_name = empathy_protocol_name_to_display_name (proto->name);
 
-  /* Create account */
-  /* To translator: %s is the protocol name */
-  str = g_strdup_printf (_("New %s account"), proto->name);
+  if (display_name == NULL)
+    display_name = proto->name;
 
+  /* Create account */
+  /* To translator: %s is the name of the protocol, such as "Google Talk" or
+   * "Yahoo!
+   */
+  str = g_strdup_printf (_("New %s account"), display_name);
   settings = empathy_account_settings_new (cm->name, proto->name, str);
 
   g_free (str);