summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
f1622b2)
* registryd/registry-main.c:
(main): set registry ior only when register server successfully.
* atk-bridge/bridge.c:
(spi_atk_bridge_register_application), (spi_atk_emit_eventv):
Bug #372988, #381670. Fix memory leak.
git-svn-id: http://svn.gnome.org/svn/at-spi/trunk@875
e2bd861d-eb25-0410-b326-
f6ed22b6b98c
+2007-01-08 Li Yuan <li.yuan@sun.com>
+
+ * registryd/registry-main.c:
+ (main): set registry ior only when register server successfully.
+ * atk-bridge/bridge.c:
+ (spi_atk_bridge_register_application), (spi_atk_emit_eventv):
+ Bug #372988, #381670. Fix memory leak.
+
2007-01-02 Bill Haneman <billh@gnome.org>
* libspi/text.c:
2007-01-02 Bill Haneman <billh@gnome.org>
* libspi/text.c:
Accessibility_Registry_registerApplication (spi_atk_bridge_get_registry (),
BONOBO_OBJREF (this_app),
&ev);
Accessibility_Registry_registerApplication (spi_atk_bridge_get_registry (),
BONOBO_OBJREF (this_app),
&ev);
+ if (ev._major != CORBA_NO_EXCEPTION)
+ CORBA_exception_free (&ev);
#endif
CORBA_exception_init (&ev);
registry = spi_atk_bridge_get_registry ();
#endif
CORBA_exception_init (&ev);
registry = spi_atk_bridge_get_registry ();
- if (registry_died) {
- g_free (e.type);
- return;
- }
- Accessibility_Registry_notifyEvent (registry,
- &e, &ev);
+ if (!registry_died)
+ {
+
+ Accessibility_Registry_notifyEvent (registry,
+ &e, &ev);
- if (ev._major != CORBA_NO_EXCEPTION)
- g_message ("error emitting event %s, (%d) %s",
- e.type,
- ev._major,
- CORBA_exception_id(&ev));
+ if (ev._major != CORBA_NO_EXCEPTION)
+ g_message ("error emitting event %s, (%d) %s",
+ e.type,
+ ev._major,
+ CORBA_exception_id(&ev));
- if (BONOBO_EX (&ev)) registry_died = TRUE;
-
+ if (BONOBO_EX (&ev)) registry_died = TRUE;
+ }
+
if (source)
bonobo_object_unref (BONOBO_OBJECT (source));
else
if (source)
bonobo_object_unref (BONOBO_OBJECT (source));
else
bonobo_object_corba_objref (bonobo_object (registry)),
NULL);
bonobo_object_corba_objref (bonobo_object (registry)),
NULL);
- registry_set_ior (registry);
-
if (ret != Bonobo_ACTIVATION_REG_SUCCESS)
{
#ifdef AT_SPI_DEBUG
if (ret != Bonobo_ACTIVATION_REG_SUCCESS)
{
#ifdef AT_SPI_DEBUG
#ifdef AT_SPI_DEBUG
fprintf (stderr, "SpiRegistry Message: SpiRegistry daemon is running.\n");
#endif
#ifdef AT_SPI_DEBUG
fprintf (stderr, "SpiRegistry Message: SpiRegistry daemon is running.\n");
#endif
+ registry_set_ior (registry);