Compiler warning fixes, moved some InternalFoo to private header,

bugfixes.

git-svn-id: http://svn.gnome.org/svn/at-spi/trunk@370 e2bd861d-eb25-0410-b326-f6ed22b6b98c

diff --git a/atk-bridge/bridge.c b/atk-bridge/bridge.c
index d45f463..e1befea 100644 (file)
--- a/atk-bridge/bridge.c
+++ b/atk-bridge/bridge.c
@@ -714,6 +714,8 @@ spi_atk_signal_emit_event (const GObject *gobject,
   else
     spi_atk_emit_eventv (gobject, detail1, detail2, &any,
                         "object:%s", name);
+  if (sp)
+    g_free (sp);
 }
 
 

diff --git a/cspi/spi-listener.h b/cspi/spi-listener.h
index 81029d7..39da8ed 100644 (file)
--- a/cspi/spi-listener.h
+++ b/cspi/spi-listener.h
@@ -40,14 +40,6 @@ typedef struct {
   long         detail2;
 } AccessibleEvent;
   
-/* 
- * For internal use by CSPI implementation only
- */
-typedef struct {
-  AccessibleEvent event;
-  void           *data; 
-} InternalEvent;
-
 typedef enum {
   SPI_KEY_PRESSED  = 1<<0,
   SPI_KEY_RELEASED = 1<<1,

diff --git a/cspi/spi-private.h b/cspi/spi-private.h
index dae71f8..b9375d9 100644 (file)
--- a/cspi/spi-private.h
+++ b/cspi/spi-private.h
@@ -39,6 +39,14 @@ struct _Accessible {
        guint        ref_count : 30;
 };
 
+/* 
+ * For internal use by CSPI implementation only
+ */
+typedef struct {
+  AccessibleEvent event;
+  void           *data; 
+} InternalEvent;
+
 #define CSPI_OBJREF(a) (((Accessible *)(a))->objref)
 
 CORBA_Environment     *cspi_ev               (void);

diff --git a/cspi/spi_event.c b/cspi/spi_event.c
index 974ce41..f8a93be 100644 (file)
--- a/cspi/spi_event.c
+++ b/cspi/spi_event.c
@@ -348,7 +348,7 @@ cspi_internal_event_get_text (const InternalEvent *e)
     }
 }
 
-static char *
+static Accessible *
 cspi_internal_event_get_object (const InternalEvent *e)
 {
   CORBA_any *any;
@@ -375,9 +375,9 @@ cspi_internal_event_get_object (const InternalEvent *e)
 char *
 AccessibleTextChangedEvent_getChangeString (const AccessibleEvent *e)
 {
-  InternalEvent *foo = (InternalEvent *) e;
+  const InternalEvent *foo = (InternalEvent *) e;
   /* TODO: check the event type? expensive... */
-  return cspi_internal_event_get_text (e);
+  return cspi_internal_event_get_text (foo);
 }
 
 /**
@@ -397,7 +397,7 @@ AccessibleTextChangedEvent_getChangeString (const AccessibleEvent *e)
 Accessible *
 AccessibleChildChangedEvent_getChildAccessible (const AccessibleEvent *e)
 {
-  InternalEvent *foo = (InternalEvent *) e;
-  return cspi_internal_event_get_object (e);
+  const InternalEvent *foo = (InternalEvent *) e;
+  return (Accessible *) cspi_internal_event_get_object (foo);
 }
 

diff --git a/registryd/deviceeventcontroller.c b/registryd/deviceeventcontroller.c
index 98294f8..8fe64e4 100644 (file)
--- a/registryd/deviceeventcontroller.c
+++ b/registryd/deviceeventcontroller.c
@@ -26,7 +26,7 @@
 #include <config.h>
 
 #undef  SPI_XKB_DEBUG
-#undef  SPI_DEBUG
+#define  SPI_DEBUG
 #undef  SPI_KEYEVENT_DEBUG
 
 #include <string.h>

diff --git a/registryd/registry.c b/registryd/registry.c
index 347d41a..c412a6f 100644 (file)
--- a/registryd/registry.c
+++ b/registryd/registry.c
@@ -111,10 +111,9 @@ desktop_add_application (SpiDesktop *desktop,
   spi_init_any_object (&e.any_data, a);
   */
   spi_init_any_nil (&e.any_data);
-  Accessibility_Accessible_unref (a, &ev);
   Accessibility_Registry_notifyEvent (BONOBO_OBJREF (registry),
                                      &e, &ev);
-  Accessibility_Desktop_unref (e.source, &ev);
+  bonobo_object_release_unref (a, &ev);
   CORBA_exception_free (&ev);
 }