diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-03-03 18:54:57 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-03-03 18:54:57 +0800 |
| commit | 4728aaffa21812eb2e6bd8b9eeac0cceccb85437 (patch) | |
| tree | c752552504d39cf40be8f54167888ccd54fdfa17 /libempathy | |
| parent | 46adf4f15f0d9fee5b3b2e22e2cffca0d48a7184 (diff) | |
| parent | 1dab11523a8fffd546d154ca21c79a8c76d0c3c0 (diff) | |
| download | gsoc2013-empathy-4728aaffa21812eb2e6bd8b9eeac0cceccb85437.tar gsoc2013-empathy-4728aaffa21812eb2e6bd8b9eeac0cceccb85437.tar.gz gsoc2013-empathy-4728aaffa21812eb2e6bd8b9eeac0cceccb85437.tar.bz2 gsoc2013-empathy-4728aaffa21812eb2e6bd8b9eeac0cceccb85437.tar.lz gsoc2013-empathy-4728aaffa21812eb2e6bd8b9eeac0cceccb85437.tar.xz gsoc2013-empathy-4728aaffa21812eb2e6bd8b9eeac0cceccb85437.tar.zst gsoc2013-empathy-4728aaffa21812eb2e6bd8b9eeac0cceccb85437.zip | |
Merge branch 'update-display-name-603463'
Diffstat (limited to 'libempathy')
| -rw-r--r-- | libempathy/empathy-account-settings.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/libempathy/empathy-account-settings.c b/libempathy/empathy-account-settings.c index 78b14456e..a67fc20cd 100644 --- a/libempathy/empathy-account-settings.c +++ b/libempathy/empathy-account-settings.c @@ -950,6 +950,13 @@ empathy_account_settings_set_display_name_async ( result = g_simple_async_result_new (G_OBJECT (settings), callback, user_data, empathy_account_settings_set_display_name_finish); + if (!tp_strdiff (name, priv->display_name)) + { + /* Nothing to do */ + g_simple_async_result_complete_in_idle (result); + return; + } + if (priv->account == NULL) { if (priv->display_name != NULL) |