Updated Basque language

[empathy.git] / libempathy / empathy-account-settings.c

diff --git a/libempathy/empathy-account-settings.c b/libempathy/empathy-account-settings.c
index d0858a7dac7c8241a53a17e5c48ee70d0de7cd5c..49eb63366f0cef541457cd54cd043eb7f865fe8f 100644 (file)
--- a/libempathy/empathy-account-settings.c
+++ b/libempathy/empathy-account-settings.c
@@ -62,7 +62,6 @@ struct _EmpathyAccountSettingsPriv
   gchar *protocol;
   gchar *display_name;
   gchar *icon_name;
-  gboolean icon_name_set;
   gboolean display_name_overridden;
   gboolean ready;
 
@@ -188,7 +187,7 @@ empathy_account_settings_constructed (GObject *object)
     }
   else
     {
-      priv->icon_name = g_strdup_printf ("im-%s", priv->protocol);
+      priv->icon_name = empathy_protocol_icon_name (priv->protocol);
     }
 
   g_assert (priv->cm_name != NULL && priv->protocol != NULL);
@@ -256,7 +255,8 @@ empathy_account_settings_class_init (
   g_object_class_install_property (object_class, PROP_DISPLAY_NAME_OVERRIDDEN,
       g_param_spec_boolean ("display-name-overridden",
         "display-name-overridden",
-        "Whether the display name for this account has been manually overridden",
+        "Whether the display name for this account has been manually "
+        "overridden",
         FALSE,
         G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE));
 
@@ -990,7 +990,6 @@ empathy_account_settings_set_icon_name_async (
         g_free (priv->icon_name);
 
       priv->icon_name = g_strdup (name);
-      priv->icon_name_set = TRUE;
 
       g_simple_async_result_complete_in_idle (result);
 
@@ -1119,9 +1118,8 @@ empathy_account_settings_do_create_account (EmpathyAccountSettings *settings)
         TP_STRUCT_TYPE_SIMPLE_PRESENCE, presence);
     }
 
-  if (priv->icon_name_set)
-    tp_asv_set_string (properties, TP_IFACE_ACCOUNT ".Icon",
-        priv->icon_name);
+  tp_asv_set_string (properties, TP_IFACE_ACCOUNT ".Icon",
+      priv->icon_name);
 
   empathy_account_manager_create_account_async (priv->account_manager,
     priv->cm_name, priv->protocol, priv->display_name,