aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Claessens <xclaesse@src.gnome.org>2008-03-11 20:22:41 +0800
committerXavier Claessens <xclaesse@src.gnome.org>2008-03-11 20:22:41 +0800
commit77c9c2a9e83163438a58d947f85803cb17537dab (patch)
treedc6079a3cb2fbe6f7c70461f6782db26ea1b0760
parent464aa25b8aefc2838fcf9074a3d913ed8ca7a24e (diff)
downloadgsoc2013-empathy-77c9c2a9e83163438a58d947f85803cb17537dab.tar
gsoc2013-empathy-77c9c2a9e83163438a58d947f85803cb17537dab.tar.gz
gsoc2013-empathy-77c9c2a9e83163438a58d947f85803cb17537dab.tar.bz2
gsoc2013-empathy-77c9c2a9e83163438a58d947f85803cb17537dab.tar.lz
gsoc2013-empathy-77c9c2a9e83163438a58d947f85803cb17537dab.tar.xz
gsoc2013-empathy-77c9c2a9e83163438a58d947f85803cb17537dab.tar.zst
gsoc2013-empathy-77c9c2a9e83163438a58d947f85803cb17537dab.zip
Remove useless empathy_contact_run_until_ready and use tp_strdiff instead of strcmp
svn path=/trunk/; revision=757
-rw-r--r--libempathy-gtk/empathy-private-chat.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/libempathy-gtk/empathy-private-chat.c b/libempathy-gtk/empathy-private-chat.c
index a8b2941aa..9f84c1273 100644
--- a/libempathy-gtk/empathy-private-chat.c
+++ b/libempathy-gtk/empathy-private-chat.c
@@ -34,6 +34,7 @@
#include <glib/gi18n.h>
#include <libmissioncontrol/mission-control.h>
+#include <telepathy-glib/util.h>
#include <libempathy/empathy-debug.h>
#include <libempathy/empathy-tp-chat.h>
@@ -105,10 +106,6 @@ private_chat_constructor (GType type,
priv->contact = empathy_contact_factory_get_from_handle (priv->factory,
account,
tp_chan->handle);
- empathy_contact_run_until_ready (priv->contact,
- EMPATHY_CONTACT_READY_ID |
- EMPATHY_CONTACT_READY_NAME,
- NULL);
priv->name = g_strdup (empathy_contact_get_name (priv->contact));
@@ -271,7 +268,7 @@ private_chat_contact_updated_cb (EmpathyContact *contact,
priv = GET_PRIV (chat);
- if (strcmp (priv->name, empathy_contact_get_name (contact)) != 0) {
+ if (tp_strdiff (priv->name, empathy_contact_get_name (contact))) {
g_free (priv->name);
priv->name = g_strdup (empathy_contact_get_name (contact));
g_signal_emit_by_name (chat, "name-changed", priv->name);