2005-11-02 Kjartan Maraas <kmaraas@gnome.org>

	* atk-bridge/bridge.c: (spi_atk_bridge_signal_listener):
	* cspi/spi_streamablecontent.c: (AccessibleStreamableContent_seek):
	* registryd/deviceeventcontroller.c:
	(spi_controller_notify_mouselisteners),
	(impl_generate_keyboard_event):
	* test/screen-review-test.c: (chunk_bounds_within):
	* test/test-simple.c: (test_desktop): Remove lots of unused code
	and fix compiler warnings. Closes bug #320049.

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

diff --git a/ChangeLog b/ChangeLog
index 11fbb0ef495d425f8e4a9c2fa2c5e9bc874a3fc2..3c88144be599ab85d83bb3769eac078ed25068be 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2005-11-02  Kjartan Maraas  <kmaraas@gnome.org>
+
+       * atk-bridge/bridge.c: (spi_atk_bridge_signal_listener):
+       * cspi/spi_streamablecontent.c: (AccessibleStreamableContent_seek):
+       * registryd/deviceeventcontroller.c:
+       (spi_controller_notify_mouselisteners),
+       (impl_generate_keyboard_event):
+       * test/screen-review-test.c: (chunk_bounds_within):
+       * test/test-simple.c: (test_desktop): Remove lots of unused code
+       and fix compiler warnings. Closes bug #320049.
+
 2005-10-27 Bill Haneman <bill.haneman@sun.com>
 
        * registryd/deviceeventcontroller.c:

diff --git a/atk-bridge/bridge.c b/atk-bridge/bridge.c
index 436b289450ba9b1b671887ad4b9ed7ef72ed56dd..84e5a109469eac4acd864df75a0623ac8637159e 100644 (file)
--- a/atk-bridge/bridge.c
+++ b/atk-bridge/bridge.c
@@ -932,7 +932,6 @@ spi_atk_bridge_signal_listener (GSignalInvocationHint *signal_hint,
   CORBA_Object c_obj;
   char *sp = NULL;
   AtkObject *ao;
-  AtkText *text;
   gint detail1 = 0, detail2 = 0;
   SpiAccessible *s_ao = NULL;
 #ifdef SPI_BRIDGE_DEBUG
@@ -1022,8 +1021,6 @@ spi_atk_bridge_signal_listener (GSignalInvocationHint *signal_hint,
         }
       else if (signal_query.signal_id == atk_signal_text_selection_changed)
         {
-          text = ATK_TEXT (gobject);
- 
           /* Return NULL as the selected string */
          spi_init_any_nil (&any);
         }

diff --git a/cspi/spi_streamablecontent.c b/cspi/spi_streamablecontent.c
index ca98642f46ea16bbf5881e916652db5bcfcedd03..aa91106089117a05823b4d9a49688107e35c3cb4 100644 (file)
--- a/cspi/spi_streamablecontent.c
+++ b/cspi/spi_streamablecontent.c
@@ -273,7 +273,7 @@ AccessibleStreamableContent_seek (AccessibleStreamableContent *obj,
          }
          /* bonobo-client doesn't wrap seek yet, so we have to. */
          ret_offset = accessible_bonobo_stream_client_seek (stream, offset, 
-                                                            seek_type, cspi_ev ());
+                                                            bonobo_seek_type, cspi_ev ());
          cspi_return_val_if_ev ("seek", FALSE);
        }
     }

diff --git a/registryd/deviceeventcontroller.c b/registryd/deviceeventcontroller.c
index b908a3642ca740de99b365fbad8f0ee3d989bdba..c40a7851fc689473bddd727959db78bd6c2ac7e9 100644 (file)
--- a/registryd/deviceeventcontroller.c
+++ b/registryd/deviceeventcontroller.c
@@ -920,8 +920,9 @@ spi_controller_notify_mouselisteners (SpiDEController                 *controlle
   GSList  *notify = NULL, *l2;
   GList  **listeners = &controller->mouse_listeners;
   gboolean is_consumed;
+#ifdef SPI_KEYEVENT_DEBUG
   gboolean found = FALSE;
-
+#endif
   if (!listeners)
     {
       return FALSE;
@@ -940,7 +941,9 @@ spi_controller_notify_mouselisteners (SpiDEController                 *controlle
               /* we clone (don't dup) the listener, to avoid refcount inc. */
               notify = g_slist_prepend (notify,
                                         spi_listener_clone (listener, ev));
+#ifdef SPI_KEYEVENT_DEBUG
                found = TRUE;
+#endif
             }
          }
     }
@@ -2220,7 +2223,6 @@ impl_generate_keyboard_event (PortableServer_Servant           servant,
 {
   SpiDEController *controller =
        SPI_DEVICE_EVENT_CONTROLLER (bonobo_object (servant));
-  long key_synth_code;
   gint err;
   KeySym keysym;
 
@@ -2236,7 +2238,6 @@ impl_generate_keyboard_event (PortableServer_Servant           servant,
    */
   
   gdk_error_trap_push ();
-  key_synth_code = keycode;
 
   switch (synth_type)
     {

diff --git a/test/screen-review-test.c b/test/screen-review-test.c
index a2d72825846361b41010b34240c7c9b639369532..482180be34ad7ce3dc647a9341c1dd7b1aa20c45 100644 (file)
--- a/test/screen-review-test.c
+++ b/test/screen-review-test.c
@@ -161,13 +161,11 @@ main (int argc, char **argv)
 static inline gboolean
 chunk_bounds_within (TextChunk *chunk, TextChunk *test_chunk)
 {
-       int x1, x2, tx1, tx2;
+       int x1, tx1;
        gboolean gtx1, ltx2;
 
        x1 = chunk->clip_bounds.x;
-       x2 = x1 + chunk->clip_bounds.width;
        tx1 = test_chunk->clip_bounds.x;
-       tx2 = tx1 + test_chunk->clip_bounds.width;
        gtx1 = (chunk->clip_bounds.x >= test_chunk->clip_bounds.x);
        ltx2 = (chunk->clip_bounds.x + chunk->clip_bounds.width
                <= test_chunk->clip_bounds.x + test_chunk->clip_bounds.width);

diff --git a/test/test-simple.c b/test/test-simple.c
index 78527fd6dfa2f57ba241e6f6c543f45bb388f442..3c469ee6f85ad08b70c5eaed4538205edfc7d56c 100644 (file)
--- a/test/test-simple.c
+++ b/test/test-simple.c
@@ -196,7 +196,6 @@ test_desktop (void)
 {
        Accessible  *desktop;
        Accessible  *application;
-       int          length;
        Accessible **list;
 
        fprintf (stderr, "Testing desktop...\n");
@@ -205,7 +204,7 @@ test_desktop (void)
        desktop = SPI_getDesktop (0);
        g_assert (desktop != NULL);
 
-       g_assert ((length = SPI_getDesktopList (&list)) > 0);
+       g_assert ((SPI_getDesktopList (&list)) > 0);
        g_assert (list[0] == desktop);
        SPI_freeDesktopList (list);