← Back to branch summary

~ubuntu-branches/ubuntu/utopic/gconf/utopic

« back to all changes in this revision

Viewing changes to gconf/gconf-dbus.c

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2011-07-26 15:18:05 UTC
  • mfrom: (1.1.30 upstream)
  • Revision ID: james.westby@ubuntu.com-20110726151805-i7a0s7r06paq2q5n
Tags: 3.1.4-0ubuntu1
New upstream version, clean patches included in the new version

Show diffs side-by-side

added added

removed removed

Lines of Context:
gconf/gconf-dbus.c
548
548
                         DBUS_TYPE_STRING, &db,
549
549
                         DBUS_TYPE_INVALID);
550
550
 
551
 
  dbus_message_unref (reply);
552
 
 
553
551
  if (db == NULL)
554
552
    {
555
553
      if (err)
556
554
        *err = gconf_error_new (GCONF_ERROR_BAD_ADDRESS,
557
555
                                _("Server couldn't resolve the address `%s'"),
558
556
                                conf->persistent_address);
559
 
      
 
557
 
 
558
      dbus_message_unref (reply);
560
559
      return FALSE;
561
560
    }
562
561
 
563
562
  gconf_engine_set_database (conf, db);
564
563
 
 
564
  dbus_message_unref (reply);
565
565
  return TRUE;
566
566
}
567
567