aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonny Lamb <jonnylamb@gnome.org>2009-10-24 23:00:07 +0800
committerJonny Lamb <jonnylamb@gnome.org>2009-10-24 23:00:07 +0800
commit94afc1026dce7dc92d12196cc61a320509080762 (patch)
treea158a3e50696998826f8fb8656661b0b1a8acbe4
parent8cf5bd07af7bcc53a115ff7cf7145c62b3d7dca6 (diff)
downloadgsoc2013-empathy-94afc1026dce7dc92d12196cc61a320509080762.tar
gsoc2013-empathy-94afc1026dce7dc92d12196cc61a320509080762.tar.gz
gsoc2013-empathy-94afc1026dce7dc92d12196cc61a320509080762.tar.bz2
gsoc2013-empathy-94afc1026dce7dc92d12196cc61a320509080762.tar.lz
gsoc2013-empathy-94afc1026dce7dc92d12196cc61a320509080762.tar.xz
gsoc2013-empathy-94afc1026dce7dc92d12196cc61a320509080762.tar.zst
gsoc2013-empathy-94afc1026dce7dc92d12196cc61a320509080762.zip
event-manager: port to new tp-glib account API
Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>
-rw-r--r--src/empathy-event-manager.c15
1 files changed, 11 insertions, 4 deletions
diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c
index c68458d69..f3eb2992d 100644
--- a/src/empathy-event-manager.c
+++ b/src/empathy-event-manager.c
@@ -24,11 +24,12 @@
#include <string.h>
#include <glib/gi18n.h>
+#include <telepathy-glib/account-manager.h>
#include <telepathy-glib/util.h>
#include <telepathy-glib/interfaces.h>
-#include <libempathy/empathy-account-manager.h>
#include <libempathy/empathy-dispatcher.h>
+#include <libempathy/empathy-idle.h>
#include <libempathy/empathy-tp-contact-factory.h>
#include <libempathy/empathy-contact-manager.h>
#include <libempathy/empathy-tp-chat.h>
@@ -918,13 +919,16 @@ event_manager_presence_changed_cb (EmpathyContactMonitor *monitor,
TpConnectionPresenceType previous,
EmpathyEventManager *manager)
{
- EmpathyAccount *account;
+ TpAccount *account;
gchar *header = NULL;
gboolean preference = FALSE;
+ EmpathyIdle *idle;
account = empathy_contact_get_account (contact);
- if (empathy_account_is_just_connected (account))
- return;
+ idle = empathy_idle_dup_singleton ();
+
+ if (empathy_idle_account_is_just_connected (idle, account))
+ goto out;
if (tp_connection_presence_type_cmp_availability (previous,
TP_CONNECTION_PRESENCE_TYPE_OFFLINE) > 0)
@@ -960,6 +964,9 @@ event_manager_presence_changed_cb (EmpathyContactMonitor *monitor,
}
}
g_free (header);
+
+out:
+ g_object_unref (idle);
}