aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonny Lamb <jonny.lamb@collabora.co.uk>2008-11-22 00:16:33 +0800
committerXavier Claessens <xclaesse@src.gnome.org>2008-11-22 00:16:33 +0800
commit2dae0afb60297b9c90d1d2dcf4dba8753dd8b73a (patch)
tree6874930ecb00a3f6f0753f337c41ee21d58238eb
parent19474c9873f1d5a7d49e7537d9ecf478cb8e2b52 (diff)
downloadgsoc2013-empathy-2dae0afb60297b9c90d1d2dcf4dba8753dd8b73a.tar
gsoc2013-empathy-2dae0afb60297b9c90d1d2dcf4dba8753dd8b73a.tar.gz
gsoc2013-empathy-2dae0afb60297b9c90d1d2dcf4dba8753dd8b73a.tar.bz2
gsoc2013-empathy-2dae0afb60297b9c90d1d2dcf4dba8753dd8b73a.tar.lz
gsoc2013-empathy-2dae0afb60297b9c90d1d2dcf4dba8753dd8b73a.tar.xz
gsoc2013-empathy-2dae0afb60297b9c90d1d2dcf4dba8753dd8b73a.tar.zst
gsoc2013-empathy-2dae0afb60297b9c90d1d2dcf4dba8753dd8b73a.zip
Changed EmpathyEventManager to not rely on the Direction property of the file channel. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk> svn path=/trunk/; revision=1780
-rw-r--r--src/empathy-event-manager.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c
index 75096b4a2..913e69c9f 100644
--- a/src/empathy-event-manager.c
+++ b/src/empathy-event-manager.c
@@ -227,19 +227,21 @@ event_manager_filter_channel_cb (EmpathyDispatcher *dispatcher,
g_object_unref (tp_group);
}
else if (!tp_strdiff (channel_type, EMP_IFACE_CHANNEL_TYPE_FILE)) {
- GValue *direction;
+ GValue *state;
tp_cli_dbus_properties_run_get (channel,
-1,
EMP_IFACE_CHANNEL_TYPE_FILE,
- "Direction",
- &direction,
+ "State",
+ &state,
NULL,
NULL);
+ DEBUG ("file channel with state %u", g_value_get_uint (state));
+
/* Only deal with incoming channels */
- if (g_value_get_uint (direction) ==
- EMP_FILE_TRANSFER_DIRECTION_INCOMING) {
+ if (g_value_get_uint (state) ==
+ EMP_FILE_TRANSFER_STATE_LOCAL_PENDING) {
EmpathyContact *contact;
gchar *msg;
McAccount *account;
@@ -263,7 +265,7 @@ event_manager_filter_channel_cb (EmpathyDispatcher *dispatcher,
g_free (msg);
}
- g_value_unset (direction);
+ g_value_unset (state);
}
g_free (channel_type);