← Back to branch summary

~ubuntu-branches/ubuntu/vivid/telepathy-idle/vivid

« back to all changes in this revision

Viewing changes to src/idle-im-manager.c

  • Committer: Package Import Robot
  • Author(s): Simon McVittie
  • Date: 2013-04-24 16:34:58 UTC
  • mfrom: (1.3.5) (7.1.2 experimental)
  • Revision ID: package-import@ubuntu.com-20130424163458-65p4fj8al2oui3ri
Tags: 0.1.15-1
http://bugs.debian.org/706094
* Merge from experimental to unstable
* New upstream release
  - update build-dependencies
  - verifies TLS certificates properly (Closes: #706094)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/idle-im-manager.c
18
18
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
19
19
 */
20
20
 
 
21
#include "config.h"
 
22
 
21
23
#include "idle-im-manager.h"
22
24
 
23
25
#include <telepathy-glib/channel-manager.h>
387
389
{
388
390
        IdleIMManager *self = IDLE_IM_MANAGER (user_data);
389
391
        IdleIMManagerPrivate *priv = IDLE_IM_MANAGER_GET_PRIVATE (self);
390
 
        TpHandle handle;
 
392
        TpBaseChannel *base = TP_BASE_CHANNEL (chan);
391
393
 
392
394
        tp_channel_manager_emit_channel_closed_for_object (self,
393
395
                                                                                                           TP_EXPORTABLE_CHANNEL (chan));
394
396
 
395
397
        if (priv->channels)
396
398
        {
397
 
                gboolean really_destroyed;
398
 
 
399
 
                g_object_get (chan,
400
 
                        "handle", &handle,
401
 
                        "channel-destroyed", &really_destroyed,
402
 
                        NULL);
403
 
 
404
 
                if (really_destroyed)
 
399
                TpHandle handle = tp_base_channel_get_target_handle (base);
 
400
 
 
401
                if (tp_base_channel_is_destroyed (base))
405
402
                {
406
403
                        IDLE_DEBUG ("removing channel with handle %u", handle);
407
404
                        g_hash_table_remove (priv->channels, GUINT_TO_POINTER (handle));