summaryrefslogtreecommitdiff
path: root/src/tube-dbus.c
diff options
context:
space:
mode:
authorWill Thompson <will.thompson@collabora.co.uk>2011-03-18 18:41:25 +0000
committerJonny Lamb <jonny.lamb@collabora.co.uk>2011-03-21 13:54:45 +0000
commitd4a982ee82f105fa5e11d8ed3086482561af431c (patch)
treed6ce815b86fb0958d320b9b10fa02da4eec3bff2 /src/tube-dbus.c
parentcde06ccf071f793a81e0f71627719d7753d9430d (diff)
downloadtelepathy-salut-d4a982ee82f105fa5e11d8ed3086482561af431c.tar.gz
Unconfuse TpTubeChannelState and TpTubeState a bit
My version of GCC didn't like building a bunch of the tube code because it confuses TpTubeChannelState and TpTubeState. In practice this code works because the former is a superset of the latter and none of the confused code paths can encounter the extra value. This patch tidies up just enough for the compiler not to whine.
Diffstat (limited to 'src/tube-dbus.c')
-rw-r--r--src/tube-dbus.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tube-dbus.c b/src/tube-dbus.c
index 3e7c8789..e5402365 100644
--- a/src/tube-dbus.c
+++ b/src/tube-dbus.c
@@ -508,7 +508,7 @@ unref_handle_foreach (gpointer key,
tp_handle_unref (contact_repo, handle);
}
-static TpTubeState
+static TpTubeChannelState
get_tube_state (SalutTubeDBus *self)
{
SalutTubeDBusPrivate *priv = SALUT_TUBE_DBUS_GET_PRIVATE (self);