From b0ef41dd204e2841a3f1eeb6c5dca709f2e725b1 Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Wed, 3 Mar 2010 11:45:39 +0100 Subject: account-widget: try to guess if the display name has been manually changed by the user --- libempathy-gtk/empathy-account-widget.c | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'libempathy-gtk') diff --git a/libempathy-gtk/empathy-account-widget.c b/libempathy-gtk/empathy-account-widget.c index 390884902..3b8741095 100644 --- a/libempathy-gtk/empathy-account-widget.c +++ b/libempathy-gtk/empathy-account-widget.c @@ -1631,6 +1631,7 @@ do_constructed (GObject *obj) EmpathyAccountWidgetPriv *priv = GET_PRIV (self); TpAccount *account; const gchar *protocol, *cm_name; + const gchar *display_name, *default_display_name; guint i = 0; struct { const gchar *cm_name; @@ -1780,6 +1781,16 @@ do_constructed (GObject *obj) empathy_builder_unref_and_keep_widget (self->ui_details->gui, self->ui_details->widget); self->ui_details->gui = NULL; + + display_name = empathy_account_settings_get_display_name (priv->settings); + default_display_name = empathy_account_widget_get_default_display_name (self); + + if (tp_strdiff (display_name, default_display_name)) + { + /* The display name of the account is not the one that we'd assign by + * default; assume that the user changed it manually */ + g_object_set (priv->settings, "display-name-overridden", TRUE, NULL); + } } static void -- cgit v1.2.3