From efeb4b9632944df6b44369bae3316597c5b610fb Mon Sep 17 00:00:00 2001 From: Arjan Timmerman Date: Wed, 29 Mar 2006 16:12:52 +0000 Subject: [PATCH] Fixes #334153 2006-03-29 Arjan Timmerman Fixes #334153 * activate-settings-daemon.c (activate_settings_daemon): fixed leaked CORBA_environment and removed extra if statement. --- capplets/common/ChangeLog | 7 +++++++ capplets/common/activate-settings-daemon.c | 10 +++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/capplets/common/ChangeLog b/capplets/common/ChangeLog index 67df7b9eb..a1ad38802 100644 --- a/capplets/common/ChangeLog +++ b/capplets/common/ChangeLog @@ -1,3 +1,10 @@ +2006-03-29 Arjan Timmerman + + Fixes #334153 + + * activate-settings-daemon.c (activate_settings_daemon): fixed leaked + CORBA_environment and removed extra if statement. + 2006-93-23 Rodrigo Moya * activate-settings-daemon.c (popup_error_message): use gtk_dialog_run, diff --git a/capplets/common/activate-settings-daemon.c b/capplets/common/activate-settings-daemon.c index a990cfd18..ff3e67d66 100644 --- a/capplets/common/activate-settings-daemon.c +++ b/capplets/common/activate-settings-daemon.c @@ -40,19 +40,15 @@ activate_settings_daemon (void) object = bonobo_activation_activate_from_id ("OAFIID:GNOME_SettingsDaemon", 0, NULL, &ev); - if (ev._major != CORBA_NO_EXCEPTION) { - popup_error_message (); - return FALSE; - } - - if (object == CORBA_OBJECT_NIL) { + if (BONOBO_EX(&ev) || object == CORBA_OBJECT_NIL ) { popup_error_message (); + CORBA_exception_free(&ev); return FALSE; } /*bool = GNOME_SettingsDaemon_awake (corba_foo, "MyService", &ev); printf ("bool is %d\n", bool);*/ - + CORBA_exception_free(&ev); return TRUE; }