Attachment 61153 Details for Bug 49593 – [Haze master, 2/3] Use non-deprecated TpIntset APIs

[patch] [Haze master, 2/3] Use non-deprecated TpIntset APIs

0002-Use-non-deprecated-TpIntset-APIs.patch (text/plain), 2.24 KB, created by Simon McVittie on 2012-05-07 10:27:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2012-05-07 10:27:25 UTC

Size: 2.24 KB

patch

obsolete

>From eb516a9909fe271e40b91df9d7f9cc12a83c2422 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Mon, 7 May 2012 17:37:15 +0100
>Subject: [PATCH 2/3] Use non-deprecated TpIntset APIs
>
>---
> src/contact-list.c  |    2 +-
> src/media-channel.c |   10 +++++-----
> 2 files changed, 6 insertions(+), 6 deletions(-)
>
>diff --git a/src/contact-list.c b/src/contact-list.c
>index 60eda63..fbbc1f9 100644
>--- a/src/contact-list.c
>+++ b/src/contact-list.c
>@@ -374,7 +374,7 @@ typedef struct _HandleContext {
>     TpHandleRepoIface *contact_repo;
>     TpHandleSet *add_handles;
> 
>-    /* Map from group names (const char *) to (TpIntSet *)s of handles */
>+    /* Map from group names (const char *) to (TpIntset *)s of handles */
>     GHashTable *group_handles;
> } HandleContext;
> 
>diff --git a/src/media-channel.c b/src/media-channel.c
>index 8fadea4..c81974e 100644
>--- a/src/media-channel.c
>+++ b/src/media-channel.c
>@@ -431,7 +431,7 @@ media_state_changed_cb (PurpleMedia *media,
>           TpGroupMixin *mixin = TP_GROUP_MIXIN (chan);
>           guint terminator;
>           TpHandle peer;
>-          TpIntSet *set;
>+          TpIntset *set;
> 
>           priv->media_ended = TRUE;
> 
>@@ -483,7 +483,7 @@ media_stream_info_cb(PurpleMedia *media,
> 
>   if (type == PURPLE_MEDIA_INFO_ACCEPT)
>     {
>-      TpIntSet *set;
>+      TpIntset *set;
>       TpHandle actor;
> 
>       if (local == FALSE)
>@@ -517,7 +517,7 @@ media_stream_info_cb(PurpleMedia *media,
>     {
>       TpGroupMixin *mixin = TP_GROUP_MIXIN (chan);
>       guint terminator;
>-      TpIntSet *set;
>+      TpIntset *set;
> 
>       if (sid != NULL)
>         return;
>@@ -583,7 +583,7 @@ haze_media_channel_constructor (GType type, guint n_props,
>   HazeMediaChannelPrivate *priv;
>   TpBaseConnection *conn;
>   TpDBusDaemon *bus;
>-  TpIntSet *set;
>+  TpIntset *set;
>   TpHandleRepoIface *contact_handles;
> 
>   obj = G_OBJECT_CLASS (haze_media_channel_parent_class)->
>@@ -1565,7 +1565,7 @@ haze_media_channel_add_member (GObject *obj,
>   HazeMediaChannel *chan = HAZE_MEDIA_CHANNEL (obj);
>   HazeMediaChannelPrivate *priv = chan->priv;
>   TpGroupMixin *mixin = TP_GROUP_MIXIN (obj);
>-  TpIntSet *set;
>+  TpIntset *set;
> 
>   /* did we create this channel? */
>   if (priv->creator == mixin->self_handle)
>-- 
>1.7.10
>

Actions: View | Splinter Review

Attachments on bug 49593: 61151 | 61152 | 61153 | 61154 | 61155

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.