~ubuntu-branches/ubuntu/maverick/telepathy-glib/maverick

« back to all changes in this revision

Viewing changes to examples/cm/callable/media-channel.c

  • Committer: Bazaar Package Importer
  • Author(s): Simon McVittie
  • Date: 2010-05-10 17:59:54 UTC
  • mfrom: (1.6.1 upstream) (27.1.3 sid)
  • Revision ID: james.westby@ubuntu.com-20100510175954-bxvqq3xx0sy4itmp
Tags: 0.11.5-1
New upstream version with new API/ABI

Show diffs side-by-side

added added

removed removed

Lines of Context:
161
161
  ExampleCallableMediaChannel *self = EXAMPLE_CALLABLE_MEDIA_CHANNEL (object);
162
162
  TpHandleRepoIface *contact_repo = tp_base_connection_get_handles
163
163
      (self->priv->conn, TP_HANDLE_TYPE_CONTACT);
164
 
  DBusGConnection *bus;
165
164
  TpIntSet *members;
166
165
  TpIntSet *local_pending;
167
166
 
171
170
  tp_handle_ref (contact_repo, self->priv->handle);
172
171
  tp_handle_ref (contact_repo, self->priv->initiator);
173
172
 
174
 
  bus = tp_get_bus ();
175
 
  dbus_g_connection_register_g_object (bus, self->priv->object_path, object);
 
173
  tp_dbus_daemon_register_object (
 
174
      tp_base_connection_get_dbus_daemon (self->priv->conn),
 
175
      self->priv->object_path, self);
176
176
 
177
177
  tp_group_mixin_init (object,
178
178
      G_STRUCT_OFFSET (ExampleCallableMediaChannel, group),