applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

don't crash if dbus connection is not available (part of bug #411504)

Browse source 
2007-03-22  Jens Granseuer  <jensgr@gmx.net>

	* gnome-settings-dbus.c: (gnome_settings_server_init): don't crash if
	dbus connection is not available (part of bug #411504)

svn path=/trunk/; revision=7415
This commit is contained in:
Jens Granseuer 2007-03-22 19:07:34 +00:00 • committed by Jens Granseuer
parent 9bb60f7a53
commit 044eb80355
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gnome-settings-daemon/ChangeLog
View file

@ -1,3 +1,8 @@
2007-03-22 Jens Granseuer <jensgr@gmx.net>
* gnome-settings-dbus.c: (gnome_settings_server_init): don't crash if
dbus connection is not available (part of bug #411504)
2007-03-20 Priit Laes <plaes@svn.gnome.org> 2007-03-20 Priit Laes <plaes@svn.gnome.org>
* gnome-settings-multimedia-keys.c: (do_media_action), (do_action): Added * gnome-settings-multimedia-keys.c: (do_media_action), (do_action): Added

3
gnome-settings-daemon/gnome-settings-dbus.c
View file

@ -207,6 +207,9 @@ gnome_settings_server_init (GnomeSettingsServer * server)
GNOME_SETTINGS_SERVER_GET_CLASS (server); GNOME_SETTINGS_SERVER_GET_CLASS (server);
unsigned request_ret; unsigned request_ret;
if (klass->connection == NULL)
return;
/* Register DBUS path */ /* Register DBUS path */
dbus_g_connection_register_g_object (klass->connection, dbus_g_connection_register_g_object (klass->connection,
"/org/gnome/SettingsDaemon", "/org/gnome/SettingsDaemon",