Fixes #334153
2006-03-29 Arjan Timmerman <arjani@soulfly.nl> Fixes #334153 * activate-settings-daemon.c (activate_settings_daemon): fixed leaked CORBA_environment and removed extra if statement.
This commit is contained in:
parent
7d9fce0311
commit
efeb4b9632
2 changed files with 10 additions and 7 deletions
|
@ -1,3 +1,10 @@
|
||||||
|
2006-03-29 Arjan Timmerman <arjani@soulfly.nl>
|
||||||
|
|
||||||
|
Fixes #334153
|
||||||
|
|
||||||
|
* activate-settings-daemon.c (activate_settings_daemon): fixed leaked
|
||||||
|
CORBA_environment and removed extra if statement.
|
||||||
|
|
||||||
2006-93-23 Rodrigo Moya <rodrigo@novell.com>
|
2006-93-23 Rodrigo Moya <rodrigo@novell.com>
|
||||||
|
|
||||||
* activate-settings-daemon.c (popup_error_message): use gtk_dialog_run,
|
* activate-settings-daemon.c (popup_error_message): use gtk_dialog_run,
|
||||||
|
|
|
@ -40,19 +40,15 @@ activate_settings_daemon (void)
|
||||||
object = bonobo_activation_activate_from_id ("OAFIID:GNOME_SettingsDaemon",
|
object = bonobo_activation_activate_from_id ("OAFIID:GNOME_SettingsDaemon",
|
||||||
0, NULL, &ev);
|
0, NULL, &ev);
|
||||||
|
|
||||||
if (ev._major != CORBA_NO_EXCEPTION) {
|
if (BONOBO_EX(&ev) || object == CORBA_OBJECT_NIL ) {
|
||||||
popup_error_message ();
|
|
||||||
return FALSE;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (object == CORBA_OBJECT_NIL) {
|
|
||||||
popup_error_message ();
|
popup_error_message ();
|
||||||
|
CORBA_exception_free(&ev);
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*bool = GNOME_SettingsDaemon_awake (corba_foo, "MyService", &ev);
|
/*bool = GNOME_SettingsDaemon_awake (corba_foo, "MyService", &ev);
|
||||||
printf ("bool is %d\n", bool);*/
|
printf ("bool is %d\n", bool);*/
|
||||||
|
|
||||||
|
CORBA_exception_free(&ev);
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue