← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/empathy/oneiric-security

« back to all changes in this revision

Viewing changes to libempathy/empathy-ft-factory.c

  • Committer: Bazaar Package Importer
  • Author(s): Ken VanDine
  • Date: 2011-08-22 14:16:36 UTC
  • mfrom: (1.1.75 upstream)
  • Revision ID: james.westby@ubuntu.com-20110822141636-iiju0fvx1f9sl3oz
Tags: 3.1.5.1-1ubuntu1
https://launchpad.net/bugs/829826
* New upstream version
  - crashed with SIGSEGV in dbus_connection_dispatch (LP: #829826)

Show diffs side-by-side

added added

removed removed

Lines of Context:
libempathy/empathy-ft-factory.c
206
206
{
207
207
  EmpathyFTFactoryPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
208
208
    EMPATHY_TYPE_FT_FACTORY, EmpathyFTFactoryPriv);
209
 
  TpDBusDaemon *dbus;
210
 
  GError *error = NULL;
 
209
  TpAccountManager *am;
211
210
 
212
211
  self->priv = priv;
213
212
 
214
 
  dbus = tp_dbus_daemon_dup (&error);
215
 
  if (dbus == NULL)
216
 
    {
217
 
      g_warning ("Failed to get TpDBusDaemon: %s", error->message);
218
 
      g_error_free (error);
219
 
      return;
220
 
    }
 
213
  am = tp_account_manager_dup ();
221
214
 
222
 
  priv->handler = tp_simple_handler_new (dbus, FALSE, FALSE,
 
215
  priv->handler = tp_simple_handler_new_with_am (am, FALSE, FALSE,
223
216
      EMPATHY_FT_BUS_NAME_SUFFIX, FALSE, handle_channels_cb, self, NULL);
224
217
 
225
218
  tp_base_client_take_handler_filter (priv->handler, tp_asv_new (
231
224
        TP_PROP_CHANNEL_REQUESTED, G_TYPE_BOOLEAN, FALSE,
232
225
        NULL));
233
226
 
234
 
  g_object_unref (dbus);
 
227
  g_object_unref (am);
235
228
}
236
229
 
237
230
static void