2001-11-13 Michael Meeks <michael@ximian.com>

	* libspi/application.c
	(impl_accessibility_application_get_version),
	(impl_accessibility_application_get_toolkit_name):
	warning fixes.
	(impl_accessibility_application_set_id),
	(impl_accessibility_application_get_id): remove
	redundant casting code.

	* libspi/action.c (impl_getDescription): fix warnings.

	* libspi/accessible.c
	(impl_accessibility_accessible_get_parent),
	(impl_accessibility_accessible_get_child_at_index),
	(impl_accessibility_accessible_get_state),
	(impl_accessibility_accessible_get_relation_set):
	warning fixes & include action.h

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

diff --git a/ChangeLog b/ChangeLog
index b640d70..077f4d5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,24 @@
 2001-11-13  Michael Meeks  <michael@ximian.com>
 
+       * libspi/application.c
+       (impl_accessibility_application_get_version),
+       (impl_accessibility_application_get_toolkit_name):
+       warning fixes.
+       (impl_accessibility_application_set_id),
+       (impl_accessibility_application_get_id): remove
+       redundant casting code.
+
+       * libspi/action.c (impl_getDescription): fix warnings.
+
+       * libspi/accessible.c
+       (impl_accessibility_accessible_get_parent),
+       (impl_accessibility_accessible_get_child_at_index),
+       (impl_accessibility_accessible_get_state),
+       (impl_accessibility_accessible_get_relation_set):
+       warning fixes & include action.h
+
+2001-11-13  Michael Meeks  <michael@ximian.com>
+
        * *.[ch] fix bits I screwed up:
 
                s/([^ \tb(\*\&\?\",])spi_/\1/g;

diff --git a/libspi/accessible.c b/libspi/accessible.c
index 3f32112..8e2b8e2 100644 (file)
--- a/libspi/accessible.c
+++ b/libspi/accessible.c
@@ -47,6 +47,7 @@
 #include "table.h"
 #include "text.h"
 #include "value.h"
+#include "action.h"
 
 /*
  * Our parent Gtk object type
@@ -142,11 +143,14 @@ impl_accessibility_accessible_get_parent (PortableServer_Servant servant,
 {
   Accessibility_Accessible retval;
   SpiAccessible *accessible = SPI_ACCESSIBLE (bonobo_object_from_servant (servant));
-  AtkObject *parent;
+  AtkObject     *parent;
+
   parent = atk_object_get_parent (accessible->atko);
   retval = BONOBO_OBJREF (spi_accessible_new (parent));
+
   printf ("SpiAccessible get_parent called\n");
-  return CORBA_Object_duplicate (retval, &ev);
+
+  return CORBA_Object_duplicate (retval, ev);
 }
 
 /*
@@ -190,7 +194,7 @@ impl_accessibility_accessible_get_child_at_index (PortableServer_Servant servant
   AtkObject *child = atk_object_ref_accessible_child (accessible->atko, (gint) index);
   retval = BONOBO_OBJREF (spi_accessible_new (child));
   printf ("SpiAccessible get_child_at_index called.\n");
-  return CORBA_Object_duplicate (retval, &ev);
+  return CORBA_Object_duplicate (retval, ev);
 }
 
 /*
@@ -201,8 +205,8 @@ impl_accessibility_accessible_get_state (PortableServer_Servant servant,
                                         CORBA_Environment     *ev)
 {
   Accessibility_StateSet retval;
-  SpiAccessible *accessible = SPI_ACCESSIBLE (bonobo_object_from_servant (servant));
-  AtkStateSet *state = atk_object_ref_state_set (accessible->atko);
+/*  SpiAccessible *accessible = SPI_ACCESSIBLE (bonobo_object_from_servant (servant));
+    AtkStateSet *state = atk_object_ref_state_set (accessible->atko); */
   retval = CORBA_OBJECT_NIL;
   printf ("SpiAccessible get_state.\n");
   /* TODO: implement the bonobo stateset class */
@@ -217,8 +221,8 @@ impl_accessibility_accessible_get_relation_set (PortableServer_Servant servant,
                                                CORBA_Environment     *ev)
 {
   Accessibility_RelationSet *retval;
-  SpiAccessible *accessible = SPI_ACCESSIBLE (bonobo_object_from_servant (servant));
-  AtkRelationSet *relation_set = atk_object_ref_relation_set (accessible->atko);
+/*  SpiAccessible *accessible = SPI_ACCESSIBLE (bonobo_object_from_servant (servant));
+    AtkRelationSet *relation_set = atk_object_ref_relation_set (accessible->atko); */
   retval = CORBA_sequence_Accessibility_Relation__alloc ();
   /*
    *  TODO: fill the sequence with relation set objects, themselves

diff --git a/libspi/action.c b/libspi/action.c
index 1c05d7e..d4dc70d 100644 (file)
--- a/libspi/action.c
+++ b/libspi/action.c
@@ -172,7 +172,7 @@ impl_getDescription (PortableServer_Servant servant,
                CORBA_Environment * ev)
 {
   SpiAction *action = SPI_ACTION (bonobo_object_from_servant(servant));
-  CORBA_char *rv;
+  const gchar *rv;
   
   rv = atk_action_get_description (ATK_ACTION(action->atko), (gint) index);
   if (rv)
@@ -188,7 +188,7 @@ impl_getName (PortableServer_Servant servant,
                CORBA_Environment * ev)
 {
   SpiAction *action = SPI_ACTION (bonobo_object_from_servant(servant));
-  CORBA_char *rv;
+  const gchar *rv;
   
   rv = atk_action_get_name (ATK_ACTION(action->atko), (gint) index);
   if (rv)
@@ -203,7 +203,7 @@ impl_getKeyBinding (PortableServer_Servant servant,
                    CORBA_Environment * ev)
 {
   SpiAction *action = SPI_ACTION (bonobo_object_from_servant(servant));
-  CORBA_char *rv;
+  const gchar *rv;
   
   rv = atk_action_get_keybinding (ATK_ACTION(action->atko), (gint) index);
   if (rv)

diff --git a/libspi/application.c b/libspi/application.c
index 2a1fcde..1dce58c 100644 (file)
--- a/libspi/application.c
+++ b/libspi/application.c
@@ -75,30 +75,23 @@ static CORBA_string
 impl_accessibility_application_get_toolkit_name (PortableServer_Servant servant,
                                                  CORBA_Environment *ev)
 {
-  CORBA_char *retval;
-  SpiApplication *application = SPI_APPLICATION (bonobo_object_from_servant (servant));
-  retval = CORBA_string_dup (atk_get_toolkit_name ());
-  return retval;
+       return CORBA_string_dup (atk_get_toolkit_name ());
 }
 
 static CORBA_string
 impl_accessibility_application_get_version (PortableServer_Servant servant,
                                             CORBA_Environment *ev)
 {
-  CORBA_char *retval;
-  SpiApplication *application = SPI_APPLICATION (bonobo_object_from_servant (servant));
-  retval = CORBA_string_dup (atk_get_toolkit_version ());
-  return retval;
+       return CORBA_string_dup (atk_get_toolkit_version ());
 }
 
 static CORBA_long
 impl_accessibility_application_get_id (PortableServer_Servant servant,
                                        CORBA_Environment *ev)
 {
-  CORBA_long retval;
-  SpiApplication *application = SPI_APPLICATION (bonobo_object_from_servant (servant));
-  retval = (CORBA_long) application->id;
-  return retval;
+       SpiApplication *application = SPI_APPLICATION (
+               bonobo_object_from_servant (servant));
+       return application->id;
 }
 
 static void
@@ -106,8 +99,9 @@ impl_accessibility_application_set_id (PortableServer_Servant servant,
                                        const CORBA_long id,
                                        CORBA_Environment *ev)
 {
-  SpiApplication *application = SPI_APPLICATION (bonobo_object_from_servant (servant));
-  application->id = id;
+       SpiApplication *application = SPI_APPLICATION (
+               bonobo_object_from_servant (servant));
+       application->id = id;
 }
 
 #define APP_STATIC_BUFF_SZ 64