Patch by: Chad Miller

2007-05-17  Jens Granseuer  <jensgr@gmx.net>

	Patch by: Chad Miller
                            
	* gnome-settings-dbus.c: (gnome_settings_server_init): double-check
	that DBUS really passed us an error (closes bug #439208)

svn path=/trunk/; revision=7632
This commit is contained in:
Jens Granseuer 2007-05-17 19:45:08 +00:00 committed by Jens Granseuer
parent ab651d94c1
commit a76ef5e383
2 changed files with 14 additions and 3 deletions

View file

@ -1,3 +1,10 @@
2007-05-17 Jens Granseuer <jensgr@gmx.net>
Patch by: Chad Miller
* gnome-settings-dbus.c: (gnome_settings_server_init): double-check
that DBUS really passed us an error (closes bug #439208)
2007-05-17 Rodrigo Moya <rodrigo@gnome-db.org>
* gnome-settings-daemon.c: declare module types registration functions.

View file

@ -224,9 +224,13 @@ gnome_settings_server_init (GnomeSettingsServer * server)
if (!org_freedesktop_DBus_request_name
(driver_proxy, "org.gnome.SettingsDaemon", 0, &request_ret,
&error)) {
g_warning ("Unable to register service: %s",
error->message);
g_error_free (error);
if (error) {
g_warning ("Unable to register service: %s",
error->message);
g_error_free (error);
} else {
g_warning ("Unable to register service: Unknown DBUS error");
}
}
g_object_unref (driver_proxy);