2004-09-30 Kjartan Maraas <kmaraas@gnome.org>

	* libspi/accessible.c:
	(impl_accessibility_accessible_get_role_name),

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

diff --git a/ChangeLog b/ChangeLog
index 884cace..56728f7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,28 @@
+2004-09-30  Kjartan Maraas  <kmaraas@gnome.org>
+
+       * libspi/accessible.c:
+       (impl_accessibility_accessible_get_role_name),
+       (impl_accessibility_accessible_get_local_role_name):
+       NULL vs. 0 cleanups.
+       * libspi/component.c:
+       (impl_accessibility_component_get_accessible_at_point):
+       Same here.
+       * libspi/eventlistener.c: (spi_event_listener_new):
+       ANSIfication.
+       * libspi/stateset.c: (impl_compare): More of the same
+       * libspi/table.c: (impl_getRowDescription): Again.
+       * registryd/desktop.c: (spi_atk_desktop_get_type): Same
+       * registryd/deviceeventcontroller.c: (spi_clear_error_state),
+       (impl_generate_keyboard_event): Same.
+       * registryd/registry-main.c: (main): Same
+       * test/event-listener-test.c: (test_exit): Same
+       * test/keysynth-demo.c: (scan_state), (create_vkbd): Same
+       * test/keysynth-test.c: (test_key_synthesis): Same
+       * test/login-helper-server-test.c: (main): Fix warning.
+       * test/screen-review-test.c: (test_exit): Fix include.
+       * test/simple-at.c: (simple_at_exit), (_festival_init):
+       ANSIfication.
+

 2004-09-13  Padraig O'Briain <padraig.vriain@sun.com>
 
        * configure.in, NEWS, README: Revved to 1.6.0.
 2004-09-13  Padraig O'Briain <padraig.vriain@sun.com>
 
        * configure.in, NEWS, README: Revved to 1.6.0.

diff --git a/libspi/accessible.c b/libspi/accessible.c
index 9b4f70c..5ac7f84 100644 (file)
--- a/libspi/accessible.c
+++ b/libspi/accessible.c
@@ -395,7 +395,7 @@ impl_accessibility_accessible_get_role_name (PortableServer_Servant servant,
   AtkRole    role;
   AtkObject *object = get_atkobject_from_servant (servant);
 
   AtkRole    role;
   AtkObject *object = get_atkobject_from_servant (servant);
 

-  g_return_val_if_fail (object != NULL, 0);
+  g_return_val_if_fail (object != NULL, NULL);

 
   role = atk_object_get_role (object);
 
 
   role = atk_object_get_role (object);
 


@@ -417,7 +417,7 @@ impl_accessibility_accessible_get_local_role_name (PortableServer_Servant servan
   AtkRole    role;
   AtkObject *object = get_atkobject_from_servant (servant);
 
   AtkRole    role;
   AtkObject *object = get_atkobject_from_servant (servant);
 

-  g_return_val_if_fail (object != NULL, 0);
+  g_return_val_if_fail (object != NULL, NULL);

 
   role = atk_object_get_role (object);
 
 
   role = atk_object_get_role (object);
 

diff --git a/libspi/component.c b/libspi/component.c
index 2f3c995..960851d 100644 (file)
--- a/libspi/component.c
+++ b/libspi/component.c
@@ -76,7 +76,7 @@ impl_accessibility_component_get_accessible_at_point (PortableServer_Servant ser
   AtkObject    *child;
   AtkComponent *component = get_component_from_servant (servant);
 
   AtkObject    *child;
   AtkComponent *component = get_component_from_servant (servant);
 

-  g_return_val_if_fail (component != NULL, FALSE);
+  g_return_val_if_fail (component != NULL, NULL);

 
   child = atk_component_ref_accessible_at_point (component,
                                                 x, y,
 
   child = atk_component_ref_accessible_at_point (component,
                                                 x, y,

diff --git a/libspi/eventlistener.c b/libspi/eventlistener.c
index 570f44d..6374813 100644 (file)
--- a/libspi/eventlistener.c
+++ b/libspi/eventlistener.c
@@ -81,7 +81,7 @@ BONOBO_TYPE_FUNC (SpiEventListener,
                  spi_event_listener)
 
 SpiEventListener *
                  spi_event_listener)
 
 SpiEventListener *

-spi_event_listener_new ()
+spi_event_listener_new (void)

 {
     SpiEventListener *retval = g_object_new (
            SPI_EVENT_LISTENER_TYPE, NULL);
 {
     SpiEventListener *retval = g_object_new (
            SPI_EVENT_LISTENER_TYPE, NULL);

diff --git a/libspi/stateset.c b/libspi/stateset.c
index bf2a762..3066446 100644 (file)
--- a/libspi/stateset.c
+++ b/libspi/stateset.c
@@ -260,7 +260,7 @@ impl_compare (PortableServer_Servant servant,
   AtkStateSet *set2, *return_set;
   SpiStateSet *spi_set;
   
   AtkStateSet *set2, *return_set;
   SpiStateSet *spi_set;
   

-  g_return_val_if_fail (set, FALSE);
+  g_return_val_if_fail (set, NULL);

 
   set2 = atk_state_set_from_accessibility_state_set (compareState, ev);
   g_return_val_if_fail (set2, CORBA_OBJECT_NIL);
 
   set2 = atk_state_set_from_accessibility_state_set (compareState, ev);
   g_return_val_if_fail (set2, CORBA_OBJECT_NIL);

diff --git a/libspi/table.c b/libspi/table.c
index d982b68..82c5732 100644 (file)
--- a/libspi/table.c
+++ b/libspi/table.c
@@ -172,7 +172,7 @@ impl_getRowDescription (PortableServer_Servant servant,
   const char *rv;
   AtkTable   *table = get_table_from_servant (servant);
 
   const char *rv;
   AtkTable   *table = get_table_from_servant (servant);
 

-  g_return_val_if_fail (table != NULL, 0);
+  g_return_val_if_fail (table != NULL, NULL);

   
   rv = atk_table_get_row_description (table, row);
 
   
   rv = atk_table_get_row_description (table, row);
 

diff --git a/registryd/desktop.c b/registryd/desktop.c
index 2d1af63..a7865d6 100644 (file)
--- a/registryd/desktop.c
+++ b/registryd/desktop.c
@@ -75,7 +75,7 @@ static void spi_atk_desktop_get_extents        (AtkComponent    *component,
                                           AtkCoordType    coord_type);
 
 static GType 
                                           AtkCoordType    coord_type);
 
 static GType 

-spi_atk_desktop_get_type ()
+spi_atk_desktop_get_type (void)

 {
   static GType type = 0;
 
 {
   static GType type = 0;
 

diff --git a/registryd/deviceeventcontroller.c b/registryd/deviceeventcontroller.c
index 6529d86..56d8686 100644 (file)
--- a/registryd/deviceeventcontroller.c
+++ b/registryd/deviceeventcontroller.c
@@ -1480,7 +1480,7 @@ spi_controller_notify_keylisteners (SpiDEController                 *controller,
 }
 
 static gboolean
 }
 
 static gboolean

-spi_clear_error_state ()
+spi_clear_error_state (void)

 {
        gboolean retval = spi_error_code != 0;
        spi_error_code = 0;
 {
        gboolean retval = spi_error_code != 0;
        spi_error_code = 0;


@@ -2264,7 +2264,7 @@ impl_generate_keyboard_event (PortableServer_Servant           servant,
                               keystring);
              break;
     }
                               keystring);
              break;
     }

-  if (err = gdk_error_trap_pop ())
+  if ((err = gdk_error_trap_pop ()))

     {
       DBG (-1, g_warning ("Error [%d] emitting keystroke", err));
     }
     {
       DBG (-1, g_warning ("Error [%d] emitting keystroke", err));
     }

diff --git a/registryd/registry-main.c b/registryd/registry-main.c
index 2c72844..149ee50 100644 (file)
--- a/registryd/registry-main.c
+++ b/registryd/registry-main.c
@@ -34,7 +34,8 @@ int
 main (int argc, char **argv)
 {
   int          ret;
 main (int argc, char **argv)
 {
   int          ret;

-  char        *obj_id, *display_name;
+  char        *obj_id;
+  const char  *display_name;

   char        *cp, *dp;
   SpiRegistry *registry;
   GSList      *reg_env = NULL;
   char        *cp, *dp;
   SpiRegistry *registry;
   GSList      *reg_env = NULL;

diff --git a/test/event-listener-test.c b/test/event-listener-test.c
index a6b7a93..d66d8b2 100644 (file)
--- a/test/event-listener-test.c
+++ b/test/event-listener-test.c
@@ -569,7 +569,7 @@ timing_test_event (const AccessibleEvent *event, void *user_data)
 }
 
 void
 }
 
 void

-test_exit ()
+test_exit (void)

 {
   SPI_deregisterGlobalEventListenerAll (generic_listener);
   AccessibleEventListener_unref (generic_listener);
 {
   SPI_deregisterGlobalEventListenerAll (generic_listener);
   AccessibleEventListener_unref (generic_listener);

diff --git a/test/keysynth-demo.c b/test/keysynth-demo.c
index 9e7bb6a..5f6b6f7 100644 (file)
--- a/test/keysynth-demo.c
+++ b/test/keysynth-demo.c
@@ -129,7 +129,7 @@ select_line (gint lineno)
 
 
 static ScanState*
 
 
 static ScanState*

-scan_state ()
+scan_state (void)

 {
   static ScanState state = {SCAN_IDLE, 0, 0};
   return &state;
 {
   static ScanState state = {SCAN_IDLE, 0, 0};
   return &state;


@@ -382,7 +382,7 @@ synth_keycode (GtkButton *button, KeyCode *keycode)
 }
 
 static void
 }
 
 static void

-create_vkbd()
+create_vkbd(void)

 {
   GtkWidget *window, *container, *hbox;
   int i, j;
 {
   GtkWidget *window, *container, *hbox;
   int i, j;

diff --git a/test/keysynth-test.c b/test/keysynth-test.c
index d77eefa..78d59bc 100644 (file)
--- a/test/keysynth-test.c
+++ b/test/keysynth-test.c
@@ -46,7 +46,7 @@ static TextTest text[] = {
 };
 
 static void
 };
 
 static void

-test_key_synthesis ()
+test_key_synthesis (void)

 {
        int i;
        for (i = 0; i < G_N_ELEMENTS (text); ++i) {
 {
        int i;
        for (i = 0; i < G_N_ELEMENTS (text); ++i) {

diff --git a/test/login-helper-server-test.c b/test/login-helper-server-test.c
index 2e2c2d3..ba6a274 100644 (file)
--- a/test/login-helper-server-test.c
+++ b/test/login-helper-server-test.c
@@ -70,7 +70,7 @@ main (int argc, char **argv)
 
        /* this is a testing hack - we are changing the LoginHelperClass's vpointers here */
        
 
        /* this is a testing hack - we are changing the LoginHelperClass's vpointers here */
        

-       test_init_login_helper_vpointers (helper, test_set_safe, test_get_device_reqs, test_get_raise_windows);
+       test_init_login_helper_vpointers ((LoginHelper*)helper, test_set_safe, test_get_device_reqs, test_get_raise_windows);

 
        bonobo_main ();
 }
 
        bonobo_main ();
 }

diff --git a/test/screen-review-test.c b/test/screen-review-test.c
index abc916d..a2d7282 100644 (file)
--- a/test/screen-review-test.c
+++ b/test/screen-review-test.c
@@ -22,7 +22,7 @@
  */
 
 #include <stdio.h>
  */
 
 #include <stdio.h>

-#include <strings.h>
+#include <string.h>

 #include <stdlib.h>
 #include "../cspi/spi-private.h"
 
 #include <stdlib.h>
 #include "../cspi/spi-private.h"
 


@@ -1128,7 +1128,7 @@ report_screen_review_line (const AccessibleEvent *event, void *user_data)
 }
 
 void
 }
 
 void

-test_exit ()
+test_exit (void)

 {
   SPI_deregisterGlobalEventListenerAll (mouseclick_listener);
   AccessibleEventListener_unref (mouseclick_listener);
 {
   SPI_deregisterGlobalEventListenerAll (mouseclick_listener);
   AccessibleEventListener_unref (mouseclick_listener);

diff --git a/test/simple-at.c b/test/simple-at.c
index a5b39f7..8343c31 100644 (file)
--- a/test/simple-at.c
+++ b/test/simple-at.c
@@ -43,7 +43,7 @@ static SPIBoolean report_command_key_event  (const AccessibleKeystroke *stroke,
 static SPIBoolean report_ordinary_key_event (const AccessibleKeystroke *stroke, void *user_data);
 static void get_environment_vars (void);
 
 static SPIBoolean report_ordinary_key_event (const AccessibleKeystroke *stroke, void *user_data);
 static void get_environment_vars (void);
 

-static int _festival_init ();
+static int _festival_init (void);

 static void _festival_say (const char *text, const char *voice, SPIBoolean shutup);
 static void _festival_write (const char *buff, int fd);
 
 static void _festival_say (const char *text, const char *voice, SPIBoolean shutup);
 static void _festival_write (const char *buff, int fd);
 


@@ -452,7 +452,7 @@ check_property_change (const AccessibleEvent *event, void *user_data)
 }
 
 static void
 }
 
 static void

-simple_at_exit ()
+simple_at_exit (void)

 {
   SPI_deregisterGlobalEventListenerAll (focus_listener);
   AccessibleEventListener_unref        (focus_listener);
 {
   SPI_deregisterGlobalEventListenerAll (focus_listener);
   AccessibleEventListener_unref        (focus_listener);


@@ -532,7 +532,7 @@ report_ordinary_key_event (const AccessibleKeystroke *key, void *user_data)
 }
 
 static int
 }
 
 static int

-_festival_init ()
+_festival_init (void)

 {
   int fd;
   struct sockaddr_in name;
 {
   int fd;
   struct sockaddr_in name;