diff options
| author | Rodrigo Moya <rodrigo@novell.com> | 2006-01-05 14:59:01 +0000 |
|---|---|---|
| committer | Rodrigo Moya <rodrigo@src.gnome.org> | 2006-01-05 14:59:01 +0000 |
| commit | f40f9f0cb89edbd9f9d817dbd971e1496708dc69 (patch) | |
| tree | 882496eef24dfdaafec872f8bff1539a46f4405e | |
| parent | ef0a0df7e1644feb96f77fc4c6cbcab3402f36fd (diff) | |
| download | gnome-session-f40f9f0cb89edbd9f9d817dbd971e1496708dc69.tar.gz | |
more login speed improvements. (gsm_gsd_start): use
2006-01-05 Rodrigo Moya <rodrigo@novell.com>
* gsm-gsd.c: more login speed improvements.
(gsm_gsd_start): use bonobo_activation_activate_from_id_async
instead of bonobo_get_object_async, which is not really async.
(activate_cb): adapted function signature.
| -rw-r--r-- | gnome-session/ChangeLog | 7 | ||||
| -rw-r--r-- | gnome-session/gsm-gsd.c | 20 |
2 files changed, 17 insertions, 10 deletions
diff --git a/gnome-session/ChangeLog b/gnome-session/ChangeLog index 4b4f156d..fa94ab48 100644 --- a/gnome-session/ChangeLog +++ b/gnome-session/ChangeLog @@ -1,3 +1,10 @@ +2006-01-05 Rodrigo Moya <rodrigo@novell.com> + + * gsm-gsd.c: more login speed improvements. + (gsm_gsd_start): use bonobo_activation_activate_from_id_async + instead of bonobo_get_object_async, which is not really async. + (activate_cb): adapted function signature. + 2005-10-30 Kjartan Maraas <kmaraas@gnome.org> * main.c: (main): Add comment with pointer to the patch diff --git a/gnome-session/gsm-gsd.c b/gnome-session/gsm-gsd.c index 5f1b17e0..ab11d22d 100644 --- a/gnome-session/gsm-gsd.c +++ b/gnome-session/gsm-gsd.c @@ -89,9 +89,9 @@ broken_cb (ORBitConnection *cnx, GnomeSettingsData *gsd) } static void -activate_cb (Bonobo_Unknown object, - CORBA_Environment *ev, - gpointer user_data) +activate_cb (Bonobo_Unknown object, + const char *error_reason, + gpointer user_data) { GnomeSettingsData *gsd = user_data; @@ -104,9 +104,9 @@ activate_cb (Bonobo_Unknown object, gsd->activating = FALSE; gsd->gsd_object = object; - if (BONOBO_EX (ev)) + if (error_reason) { - gsd_set_error (gsd, bonobo_exception_general_error_get (ev)); + gsd_set_error (gsd, error_reason); gsm_gsd_start (); return; } @@ -162,11 +162,11 @@ gsm_gsd_start (void) CORBA_exception_init (&ev); - bonobo_get_object_async ("OAFIID:GNOME_SettingsDaemon", - "IDL:Bonobo/Unknown:1.0", - &ev, - activate_cb, - &gsd); + bonobo_activation_activate_from_id_async ("OAFIID:GNOME_SettingsDaemon", + 0, + activate_cb, + &gsd, + &ev); if (BONOBO_EX (&ev)) { |