aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy-gtk/empathy-status-icon.c
diff options
context:
space:
mode:
authorXavier Claessens <xclaesse@src.gnome.org>2008-03-11 20:22:37 +0800
committerXavier Claessens <xclaesse@src.gnome.org>2008-03-11 20:22:37 +0800
commitfd6d3fc84dbd00c3c1015ac8f9b54935fc1c12e9 (patch)
treefa43f89134570a145e721945b72da07d27ac4f3f /libempathy-gtk/empathy-status-icon.c
parentcf327059e269141a38a3aa38f0a37d3c6eb0fbbb (diff)
downloadgsoc2013-empathy-fd6d3fc84dbd00c3c1015ac8f9b54935fc1c12e9.tar
gsoc2013-empathy-fd6d3fc84dbd00c3c1015ac8f9b54935fc1c12e9.tar.gz
gsoc2013-empathy-fd6d3fc84dbd00c3c1015ac8f9b54935fc1c12e9.tar.bz2
gsoc2013-empathy-fd6d3fc84dbd00c3c1015ac8f9b54935fc1c12e9.tar.lz
gsoc2013-empathy-fd6d3fc84dbd00c3c1015ac8f9b54935fc1c12e9.tar.xz
gsoc2013-empathy-fd6d3fc84dbd00c3c1015ac8f9b54935fc1c12e9.tar.zst
gsoc2013-empathy-fd6d3fc84dbd00c3c1015ac8f9b54935fc1c12e9.zip
Make sure we don't expect contact id and handle to be directly ready. Add some _run_until_ready.
svn path=/trunk/; revision=755
Diffstat (limited to 'libempathy-gtk/empathy-status-icon.c')
-rw-r--r--libempathy-gtk/empathy-status-icon.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/libempathy-gtk/empathy-status-icon.c b/libempathy-gtk/empathy-status-icon.c
index 9f10bd37e..241a2841f 100644
--- a/libempathy-gtk/empathy-status-icon.c
+++ b/libempathy-gtk/empathy-status-icon.c
@@ -418,6 +418,10 @@ status_icon_call_local_pending_cb (EmpathyTpGroup *group,
/* We are local pending, it's an incoming call, we need to ask
* the user if he wants to accept the call. */
+ empathy_contact_run_until_ready (member,
+ EMPATHY_CONTACT_READY_NAME,
+ NULL);
+
empathy_debug (DEBUG_DOMAIN, "INCOMING call, add event");
msg = g_strdup_printf (_("Incoming call from %s:\n%s"),
@@ -708,7 +712,6 @@ status_icon_pendings_changed_cb (EmpathyContactManager *manager,
EmpathyStatusIconPriv *priv;
StatusIconEvent *event;
GString *str;
- GList *l;
priv = GET_PRIV (icon);
@@ -717,11 +720,9 @@ status_icon_pendings_changed_cb (EmpathyContactManager *manager,
return;
}
- for (l = priv->events; l; l = l->next) {
- if (empathy_contact_equal (contact, ((StatusIconEvent*)l->data)->user_data)) {
- return;
- }
- }
+ empathy_contact_run_until_ready (contact,
+ EMPATHY_CONTACT_READY_NAME,
+ NULL);
str = g_string_new (NULL);
g_string_printf (str, _("Subscription requested by %s"),