← Back to branch summary

~sergio91pt/ubuntu/oneiric/gvfs/bug-388904-2

« back to all changes in this revision

Viewing changes to daemon/gvfsbackendobexftp.c

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt
  • Date: 2011-08-22 12:26:27 UTC
  • mfrom: (1.1.72 upstream)
  • Revision ID: james.westby@ubuntu.com-20110822122627-p38bv0co8hq1cjtz
Tags: 1.9.3-0ubuntu1
* New upstream release
* debian/watch: Look for unstable releases and tar.bz2.
* debian/control.in: Bump libglib2.0-dev build dependency as per upstream
  configure.ac.
* Drop debian/patches/debian-changes-1.9.2-0ubuntu2, not necessary any more.

Show diffs side-by-side

added added

removed removed

Lines of Context:
daemon/gvfsbackendobexftp.c
507
507
  DBusConnection *conn;
508
508
  DBusGConnection *connection;
509
509
  DBusError error;
510
 
  GError *err = NULL;
511
510
 
512
511
  /* Otherwise dbus-glib doesn't setup it value types */
513
512
  connection = dbus_g_bus_get (DBUS_BUS_SESSION, NULL);
519
518
  dbus_error_init (&error);
520
519
  conn = dbus_bus_get_private (DBUS_BUS_SESSION, &error);
521
520
  if (conn == NULL) {
522
 
      g_printerr ("Connecting to session bus failed: %s\n", err->message);
 
521
      g_printerr ("Connecting to session bus failed: %s\n", error.message);
523
522
      dbus_error_free (&error);
524
523
      return;
525
524
  }
527
526
 
528
527
  backend->connection = dbus_connection_get_g_connection (conn);
529
528
  if (backend->connection == NULL) {
530
 
      g_printerr ("Connecting to session bus failed: %s\n", err->message);
531
 
      g_error_free (err);
 
529
      g_printerr ("Connecting to session bus failed\n");
532
530
      return;
533
531
  }
534
532