← Back to branch summary

~alexlauni/ubuntu/lucid/gnome-control-center/fix-533888

« back to all changes in this revision

Viewing changes to gnome-settings-daemon/gnome-settings-dbus.c

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2007-06-13 12:30:08 UTC
  • mto: This revision was merged to the branch mainline in revision 3.
  • Revision ID: james.westby@ubuntu.com-20070613123008-nmcon6qb309hkjek
Tags: upstream-2.19.3
Import upstream version 2.19.3

Show diffs side-by-side

added added

removed removed

Lines of Context:
gnome-settings-daemon/gnome-settings-dbus.c
224
224
        if (!org_freedesktop_DBus_request_name
225
225
            (driver_proxy, "org.gnome.SettingsDaemon", 0, &request_ret,
226
226
             &error)) {
227
 
                g_warning ("Unable to register service: %s",
228
 
                           error->message);
229
 
                g_error_free (error);
 
227
                if (error) {
 
228
                        g_warning ("Unable to register service: %s",
 
229
                                   error->message);
 
230
                        g_error_free (error);
 
231
                } else {
 
232
                        g_warning ("Unable to register service: Unknown DBUS error"); 
 
233
                }
230
234
        }
231
235
 
232
236
        g_object_unref (driver_proxy);