cspi_bus -> SPI_BUS; exposing because tester wants it

diff --git a/cspi/spi-event.c b/cspi/spi-event.c
index d20161a..f8179d9 100644 (file)
--- a/cspi/spi-event.c
+++ b/cspi/spi-event.c
@@ -1063,7 +1063,7 @@ SPI_registerGlobalEventListener (AccessibleEventListener *listener,
   }
   event_listeners = new_list;
   dbus_error_init (&error);
-  dbus_bus_add_match (cspi_bus(), matchrule, &error);
+  dbus_bus_add_match (SPI_bus(), matchrule, &error);
   if (error.message)
   {
     g_warning ("Adding match: %s", error.message);
@@ -1142,7 +1142,7 @@ SPI_deregisterGlobalEventListener (AccessibleEventListener *listener,
       listener_data_free (e);
       l = g_list_remove (l, e);
       dbus_error_init (&error);
-      dbus_bus_remove_match (cspi_bus(), matchrule, &error);
+      dbus_bus_remove_match (SPI_bus(), matchrule, &error);
     }
     else l = g_list_next (l);
   }

diff --git a/cspi/spi-listener.c b/cspi/spi-listener.c
index 3429386..57f0bfb 100644 (file)
--- a/cspi/spi-listener.c
+++ b/cspi/spi-listener.c
@@ -399,7 +399,7 @@ done:
   if (reply)
   {
     dbus_message_append_args (reply, DBUS_TYPE_BOOLEAN, &retval, DBUS_TYPE_INVALID);
-    dbus_connection_send (cspi_bus(), reply, NULL);
+    dbus_connection_send (SPI_bus(), reply, NULL);
     dbus_message_unref (reply);
   }
   return DBUS_HANDLER_RESULT_HANDLED;

diff --git a/cspi/spi-main.c b/cspi/spi-main.c
index 49d1680..fe8f402 100644 (file)
--- a/cspi/spi-main.c
+++ b/cspi/spi-main.c
@@ -147,7 +147,7 @@ cspi_get_live_refs (void)
 }
 
 DBusConnection *
-cspi_bus (void)
+SPI_bus (void)
 {
   return bus;
 }
@@ -1023,7 +1023,7 @@ cspi_dbus_call (Accessible *obj, const char *interface, const char *method, DBus
   if (!error) error = &err;
   dbus_error_init (error);
   va_start (args, type);
-  retval = dbind_connection_method_call_va (cspi_bus(), obj->app->bus_name, path, interface, method, error, type, args);
+  retval = dbind_connection_method_call_va (SPI_bus(), obj->app->bus_name, path, interface, method, error, type, args);
   va_end (args);
   g_free (path);
   if (dbus_error_is_set (error))
@@ -1056,7 +1056,7 @@ cspi_dbus_get_property (Accessible *obj, const char *interface, const char *name
   dbus_message_append_args (message, DBUS_TYPE_STRING, &interface, DBUS_TYPE_STRING, &name, DBUS_TYPE_INVALID);
   if (!error) error = &err;
   dbus_error_init (error);
-  reply = dbus_connection_send_with_reply_and_block (cspi_bus(), message, 1000, error);
+  reply = dbus_connection_send_with_reply_and_block (SPI_bus(), message, 1000, error);
   dbus_message_unref (message);
   if (!reply)
   {

diff --git a/cspi/spi-private.h b/cspi/spi-private.h
index 573d286..57df3fc 100644 (file)
--- a/cspi/spi-private.h
+++ b/cspi/spi-private.h
@@ -83,7 +83,7 @@ struct _SPIException {
   char * desc;
 };
 
-DBusConnection *spi_bus (void);
+DBusConnection *SPI_bus (void);
 SPIBoolean             cspi_exception         (void);
 Accessible            *cspi_object_add (Accessible  *accessible);
 void                   cspi_object_ref        (Accessible  *accessible);

diff --git a/cspi/spi-registry.c b/cspi/spi-registry.c
index 48b84d8..ede820d 100644 (file)
--- a/cspi/spi-registry.c
+++ b/cspi/spi-registry.c
@@ -88,7 +88,7 @@ SPI_getDesktopList (Accessible ***desktop_list)
 
   if (!desktops)
   {
-    dbind_connection_method_call (cspi_bus(), spi_bus_registry, spi_path_registry, spi_interface_registry, "getDesktopList", NULL, "=>ao", &desktops);
+    dbind_connection_method_call (SPI_bus(), spi_bus_registry, spi_path_registry, spi_interface_registry, "getDesktopList", NULL, "=>ao", &desktops);
     if (!desktops) return 0;
   }
 
@@ -226,7 +226,7 @@ SPI_registerAccessibleKeystrokeListener (AccessibleKeystrokeListener  *listener,
          (dbus_bool_t) ((sync_type & SPI_KEYLISTENER_ALL_WINDOWS)!=0);
 
     dbus_error_init (&error);
-    dbind_connection_method_call (cspi_bus(), spi_bus_registry, spi_path_dec, spi_interface_dec, "registerKeystrokeListener", &error, "oa(iisi)uu(bbb)=>b", path, key_set, controller_event_mask, key_set, &listener_mode, &retval);
+    dbind_connection_method_call (SPI_bus(), spi_bus_registry, spi_path_dec, spi_interface_dec, "registerKeystrokeListener", &error, "oa(iisi)uu(bbb)=>b", path, key_set, controller_event_mask, key_set, &listener_mode, &retval);
 
   g_array_free (key_set, TRUE);
   g_free (path);
@@ -265,7 +265,7 @@ SPI_deregisterAccessibleKeystrokeListener (AccessibleKeystrokeListener *listener
   controller_event_mask = (dbus_uint32_t) modmask;
 
       key_set = g_array_sized_new (FALSE, TRUE, sizeof (Accessibility_KeyDefinition), 0);
-    dbind_connection_method_call (cspi_bus(), spi_bus_registry, spi_path_dec, spi_interface_dec, "deregisterKeystrokeListener", &error, "oa(iisi)uu", path, &key_set, key_events, controller_event_mask);
+    dbind_connection_method_call (SPI_bus(), spi_bus_registry, spi_path_dec, spi_interface_dec, "deregisterKeystrokeListener", &error, "oa(iisi)uu", path, &key_set, key_events, controller_event_mask);
   g_free (path);
   return TRUE;
 }
@@ -310,7 +310,7 @@ SPI_registerDeviceEventListener (AccessibleDeviceListener  *listener,
     }
 
   dbus_error_init (&error);
-    dbind_connection_method_call (cspi_bus(), spi_bus_registry, spi_path_dec, spi_interface_dec, "registerDeviceEventListener", &error, "ou=>b", path, event_types, &retval);
+    dbind_connection_method_call (SPI_bus(), spi_bus_registry, spi_path_dec, spi_interface_dec, "registerDeviceEventListener", &error, "ou=>b", path, event_types, &retval);
   g_free (path);
   return retval;
 }
@@ -343,7 +343,7 @@ SPI_deregisterDeviceEventListener (AccessibleDeviceListener *listener,
   event_types |= (1 << Accessibility_BUTTON_RELEASED_EVENT);
 
   dbus_error_init (&error);
-    dbind_connection_method_call (cspi_bus(), spi_bus_registry, spi_path_dec, spi_interface_dec, "deregisterDeviceEventListener", &error, "ou", path, event_types);
+    dbind_connection_method_call (SPI_bus(), spi_bus_registry, spi_path_dec, spi_interface_dec, "deregisterDeviceEventListener", &error, "ou", path, event_types);
   g_free (path);
   return TRUE;
 }
@@ -399,7 +399,7 @@ SPI_generateKeyboardEvent (long int keyval,
 
   if (!keystring) keystring = "";
   dbus_error_init (&error);
-    dbind_connection_method_call (cspi_bus(), spi_bus_registry, spi_path_dec, spi_interface_dec, "generateKeyboardEvent", &error, "isu", keycode, keystring, keysynth_type);
+    dbind_connection_method_call (SPI_bus(), spi_bus_registry, spi_path_dec, spi_interface_dec, "generateKeyboardEvent", &error, "isu", keycode, keystring, keysynth_type);
 
   return TRUE;
 }
@@ -427,7 +427,7 @@ SPI_generateMouseEvent (long x, long y, char *name)
   DBusError error;
 
   dbus_error_init (&error);
-    dbind_connection_method_call (cspi_bus(), spi_bus_registry, spi_path_dec, spi_interface_dec, "generateMouseEvent", &error, "iis", x, y, name);
+    dbind_connection_method_call (SPI_bus(), spi_bus_registry, spi_path_dec, spi_interface_dec, "generateMouseEvent", &error, "iis", x, y, name);
   return TRUE;
 }