← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/libtelepathy/oneiric

« back to all changes in this revision

Viewing changes to src/tp-conn.c

  • Committer: Bazaar Package Importer
  • Author(s): Sjoerd Simons
  • Date: 2007-03-12 11:43:26 UTC
  • mfrom: (1.1.9 upstream)
  • Revision ID: james.westby@ubuntu.com-20070312114326-v4aezxb6sr8utds1
Tags: 0.0.51-2
Bump shlibs

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/tp-conn.c
23
23
#include "tp-helpers.h"
24
24
#include "tp-connmgr.h"
25
25
#include "tp-props-iface.h"
 
26
#include "internal.h"
26
27
 
27
28
static GObjectClass *parent_class = NULL;
28
29
 
345
346
  {
346
347
    if (!tp_conn_get_interfaces(DBUS_G_PROXY(obj), &interfaces, &error))
347
348
    {
348
 
      g_warning("GetInterfaces() failed: %s, dbus err: %s\n", 
349
 
                error->message, dbus_g_error_get_name(error));
 
349
      _tp_warn_failure ("GetInterfaces()", error);
350
350
      g_error_free(error);
351
351
      return obj;
352
352
    } 
399
399
                               type, handle_type, handle, supress_handler,
400
400
                               &chan_object_path, &error))
401
401
  {
402
 
    g_warning("RequestChannel() failed: %s\n", error -> message);
 
402
    _tp_warn_failure ("RequestChannel()", error);
403
403
    g_error_free(error);
404
404
    return NULL;
405
405
  }
524
524
 
525
525
    g_strfreev(interfaces);
526
526
 
527
 
    /* TODO: We should probably drop the StatusChanged monitoring
528
 
       here, as we should now have the interface information */
 
527
    dbus_g_proxy_disconnect_signal(proxy, "StatusChanged",
 
528
                                   G_CALLBACK(tp_conn_status_change_handler),
 
529
                                   NULL);
529
530
 
530
531
    return TRUE;
531
532
  }