diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2013-10-03 09:55:46 +0200 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2013-10-03 09:55:46 +0200 |
| commit | 3c6506a755e55154ed4c164298c5976572128ada (patch) | |
| tree | a2fe79f49df0388a6c6522ad993b3e63cf70a329 /src | |
| parent | 928ab93835c398b130bfc0b16bccaea8a4b87b49 (diff) | |
| parent | c2d7b345aa52e3f5d70d4657f0dbab7c3f62042a (diff) | |
Merge branch 'telepathy-gabble-0.18'
Conflicts:
src/private-tubes-factory.c
Diffstat (limited to 'src')
| -rw-r--r-- | src/conn-presence.c | 2 | ||||
| -rw-r--r-- | src/conn-presence.h | 2 | ||||
| -rw-r--r-- | src/private-tubes-factory.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/conn-presence.c b/src/conn-presence.c index e06062f56..7798b6142 100644 --- a/src/conn-presence.c +++ b/src/conn-presence.c @@ -1917,7 +1917,7 @@ status_available_cb (GObject *obj, guint status) } } -GabblePresenceId +TpConnectionPresenceType conn_presence_get_type (GabblePresence *presence) { return gabble_statuses[presence->status].presence_type; diff --git a/src/conn-presence.h b/src/conn-presence.h index 761a30799..6756f6923 100644 --- a/src/conn-presence.h +++ b/src/conn-presence.h @@ -60,7 +60,7 @@ void conn_decloak_iface_init (gpointer g_iface, gpointer iface_data); void conn_decloak_emit_requested (GabbleConnection *conn, TpHandle contact, const gchar *reason, gboolean decloaked); -GabblePresenceId conn_presence_get_type (GabblePresence *presence); +TpConnectionPresenceType conn_presence_get_type (GabblePresence *presence); const TpPresenceStatusSpec *conn_presence_statuses (void); diff --git a/src/private-tubes-factory.c b/src/private-tubes-factory.c index 2ec632f17..b8e2a80d2 100644 --- a/src/private-tubes-factory.c +++ b/src/private-tubes-factory.c @@ -967,7 +967,7 @@ static void channel_closed_cb (GabbleTubeIface *tube, GabblePrivateTubesFactory *self) { - guint id; + guint64 id; g_object_get (tube, "id", &id, |