From: kmaraas Date: Mon, 9 Jan 2006 13:37:45 +0000 (+0000) Subject: 2006-01-09 Kjartan Maraas X-Git-Tag: AT_SPI2_CORE_0_1_3~480 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c8bb006881bf32579ce674777067474c36021f26;p=platform%2Fupstream%2Fat-spi2-core.git 2006-01-09 Kjartan Maraas * configure.in: Generate po/Makefile.in * cspi/spi_main.c: Add #ifdef PRINT_LEAKS around a function * cspi/spi_streamablecontent.c: (accessible_bonobo_stream_client_seek), (AccessibleStreamableContent_seek): Remove unused vars. * libspi/application.c: Missing header. * libspi/text.c: (impl_getDefaultAttributes): Unused vars * login-helper/login-helper.c: (login_helper_finalize), (login_helper_init): Remove unused stuff * registryd/deviceeventcontroller.c: (spi_dec_replace_map_keysym), (spi_dec_init_mouse_listener), (is_key_released): Remove unused vars and surround some with #ifdef GRAB_BUTTON. * test/event-listener-test.c: (main), (report_event), (report_caret_event), (report_detail_event), (report_detail1_event), (report_bounds_event), (report_text_event), (report_text_selection_event), (report_active_descendant_changed_event), (report_children_changed_event), (report_name_changed_event), (report_description_changed_event), (report_parent_changed_event), (report_window_event), (report_table_summary_event), (report_table_header_event), (report_table_caption_event), (report_table_row_description_event), (report_table_column_description_event), (timing_test_event): Remove a bunch of unused variables and fix a slew of format specifiers * test/key-listener-test.c: (report_all_key_event): Format specifier * test/keypad-test.c: (print_key_event): Same * test/login-helper-server-test.c: (main): Include gtkmain.h and remove unused var. * test/screen-review-test.c: (main), (print_chunk_debug), (review_buffer_get_text_chunk), (debug_chunk_list), (string_guess_clip), (text_chunk_get_clipped_string), (text_chunk_list_to_string), (get_screen_review_line_at): Remove unused variables and fix format specifiers. * test/simple-at.c: (report_text_event): Format specifier fix. * test/stress-test.c: (main): Remove unused var. git-svn-id: http://svn.gnome.org/svn/at-spi/trunk@781 e2bd861d-eb25-0410-b326-f6ed22b6b98c --- diff --git a/ChangeLog b/ChangeLog index fa12f56..ea5b764 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,41 @@ +2006-01-09 Kjartan Maraas + + * configure.in: Generate po/Makefile.in + * cspi/spi_main.c: Add #ifdef PRINT_LEAKS around a function + * cspi/spi_streamablecontent.c: + (accessible_bonobo_stream_client_seek), + (AccessibleStreamableContent_seek): Remove unused vars. + * libspi/application.c: Missing header. + * libspi/text.c: (impl_getDefaultAttributes): Unused vars + * login-helper/login-helper.c: (login_helper_finalize), + (login_helper_init): Remove unused stuff + * registryd/deviceeventcontroller.c: (spi_dec_replace_map_keysym), + (spi_dec_init_mouse_listener), (is_key_released): Remove unused vars + and surround some with #ifdef GRAB_BUTTON. + * test/event-listener-test.c: (main), (report_event), + (report_caret_event), (report_detail_event), + (report_detail1_event), (report_bounds_event), (report_text_event), + (report_text_selection_event), + (report_active_descendant_changed_event), + (report_children_changed_event), (report_name_changed_event), + (report_description_changed_event), (report_parent_changed_event), + (report_window_event), (report_table_summary_event), + (report_table_header_event), (report_table_caption_event), + (report_table_row_description_event), + (report_table_column_description_event), (timing_test_event): + Remove a bunch of unused variables and fix a slew of format specifiers + * test/key-listener-test.c: (report_all_key_event): Format specifier + * test/keypad-test.c: (print_key_event): Same + * test/login-helper-server-test.c: (main): Include gtkmain.h and remove + unused var. + * test/screen-review-test.c: (main), (print_chunk_debug), + (review_buffer_get_text_chunk), (debug_chunk_list), + (string_guess_clip), (text_chunk_get_clipped_string), + (text_chunk_list_to_string), (get_screen_review_line_at): + Remove unused variables and fix format specifiers. + * test/simple-at.c: (report_text_event): Format specifier fix. + * test/stress-test.c: (main): Remove unused var. + 2005-12-29 Abel Cheung * configure.in: Add zh_HK, zh_TW to ALL_LINGUAS diff --git a/configure.in b/configure.in index 3785e7c..f84059b 100644 --- a/configure.in +++ b/configure.in @@ -202,6 +202,7 @@ AC_SUBST(REBUILD) AC_OUTPUT([ Makefile +po/Makefile.in libspi-1.0.pc libspi-1.0-uninstalled.pc libloginhelper-1.0.pc diff --git a/cspi/spi_main.c b/cspi/spi_main.c index 0b9ab88..a0acdae 100644 --- a/cspi/spi_main.c +++ b/cspi/spi_main.c @@ -453,6 +453,7 @@ SPI_nextEvent (SPIBoolean waitForEvent) return NULL; } +#ifdef PRINT_LEAKS static void report_leaked_ref (gpointer key, gpointer val, gpointer user_data) { @@ -476,7 +477,7 @@ report_leaked_ref (gpointer key, gpointer val, gpointer user_data) SPI_freeString (name); } - +#endif /** * SPI_exit: diff --git a/cspi/spi_streamablecontent.c b/cspi/spi_streamablecontent.c index aa91106..76312ac 100644 --- a/cspi/spi_streamablecontent.c +++ b/cspi/spi_streamablecontent.c @@ -67,7 +67,6 @@ accessible_bonobo_stream_client_seek (const Bonobo_Stream stream, Bonobo_Stream_SeekType seek_type, CORBA_Environment *opt_ev) { - Bonobo_StorageInfo *info; CORBA_Environment *ev, temp_ev; CORBA_long ret_offset; @@ -258,7 +257,6 @@ AccessibleStreamableContent_seek (AccessibleStreamableContent *obj, stream = cached->stream; if (stream != CORBA_OBJECT_NIL) { - guint8 *mem; switch (seek_type) { case SPI_STREAM_SEEK_SET: bonobo_seek_type = Bonobo_Stream_SeekSet; diff --git a/libspi/application.c b/libspi/application.c index f494757..5fead8f 100644 --- a/libspi/application.c +++ b/libspi/application.c @@ -25,6 +25,7 @@ #include #include +#include #include #include #include diff --git a/libspi/text.c b/libspi/text.c index bfe1ed4..9179a0a 100644 --- a/libspi/text.c +++ b/libspi/text.c @@ -313,7 +313,6 @@ impl_getDefaultAttributes (PortableServer_Servant servant, CORBA_Environment *ev) { AtkAttributeSet *set; - gint intstart_offset, intend_offset; CORBA_char *rv; AtkText *text = get_text_from_servant (servant); diff --git a/login-helper/login-helper.c b/login-helper/login-helper.c index 9d5668c..2e03d19 100644 --- a/login-helper/login-helper.c +++ b/login-helper/login-helper.c @@ -34,9 +34,6 @@ static BonoboObjectClass *bonobo_object_parent_class; static void login_helper_finalize (GObject *object) { - LoginHelper *helper = (LoginHelper *) object; - CORBA_Environment ev; - (G_OBJECT_CLASS (bonobo_object_parent_class))->finalize (object); } @@ -209,7 +206,6 @@ login_helper_class_init (LoginHelperClass *klass) static void login_helper_init (GObject *object) { - LoginHelper *helper = LOGIN_HELPER (object); } BONOBO_TYPE_FUNC_FULL (LoginHelper, diff --git a/registryd/deviceeventcontroller.c b/registryd/deviceeventcontroller.c index c40a785..beb4413 100644 --- a/registryd/deviceeventcontroller.c +++ b/registryd/deviceeventcontroller.c @@ -221,7 +221,6 @@ spi_dec_replace_map_keysym (DEControllerPrivateData *priv, KeyCode keycode, KeyS if (desc && desc->map) { gint offset = desc->map->key_sym_map[keycode].offset; - long old_sym = desc->map->syms[offset]; desc->map->syms[offset] = keysym; } else @@ -617,7 +616,9 @@ spi_dec_ungrab_mouse (gpointer data) static void spi_dec_init_mouse_listener (SpiRegistry *registry) { +#ifdef GRAB_BUTTON Display *display = spi_get_display (); +#endif g_timeout_add (100, spi_dec_poll_mouse_idle, registry); #ifdef GRAB_BUTTON @@ -2519,7 +2520,6 @@ is_key_released (KeyCode code) { char keys[32]; int down; - int i; XQueryKeymap (spi_get_display (), keys); down = BIT (keys, code); diff --git a/test/event-listener-test.c b/test/event-listener-test.c index 137599e..165b9e3 100644 --- a/test/event-listener-test.c +++ b/test/event-listener-test.c @@ -87,14 +87,7 @@ usage_and_exit( void ) int main (int argc, char **argv) { - int i, j, c; - int n_desktops; - int n_apps; - char *s; - gdouble elapsed_time; - Accessible *desktop; - Accessible *application; - const char *modules; + int c; /* Parse Command-line */ if ( argc > 1 ) { @@ -337,7 +330,7 @@ report_event (const AccessibleEvent *event, void *user_data) } ++count; if ((count % 100) == 0) { - g_print ("%d events received, %f events/sec\n", + g_print ("%ld events received, %f events/sec\n", count, count/g_timer_elapsed(timer, NULL)); } @@ -356,7 +349,7 @@ report_caret_event (const AccessibleEvent *event, void *user_data) SPI_TEXT_BOUNDARY_SENTENCE_START, &start, &end); fprintf (stderr, - "caret event from %s %s: offset %d, SENTENCE_START offsets start=%d, end=%d\n", + "caret event from %s %s: offset %ld, SENTENCE_START offsets start=%ld, end=%ld\n", event->type, s, offset, start, end); AccessibleText_getTextAtOffset (text, offset, SPI_TEXT_BOUNDARY_SENTENCE_END, @@ -368,7 +361,7 @@ report_caret_event (const AccessibleEvent *event, void *user_data) SPI_TEXT_BOUNDARY_LINE_END, &line_end_begin, &line_end_end); fprintf (stderr, - "SENTENCE_END: %d - %d; LINE_START: %d - %d; LINE_END: %d - %d\n", + "SENTENCE_END: %ld - %ld; LINE_START: %ld - %ld; LINE_END: %ld - %ld\n", start, end, line_start_begin, line_start_end, line_end_begin, line_end_end); @@ -379,7 +372,7 @@ report_caret_event (const AccessibleEvent *event, void *user_data) SPI_TEXT_BOUNDARY_WORD_END, &line_end_begin, &line_end_end); fprintf (stderr, - "WORD_START: %d - %d; WORD_END: %d - %d\n", + "WORD_START: %ld - %ld; WORD_END: %ld - %ld\n", line_start_begin, line_start_end, line_end_begin, line_end_end); @@ -390,7 +383,7 @@ void report_detail_event (const AccessibleEvent *event, void *user_data) { char *s = Accessible_getName (event->source); - fprintf (stderr, "(detail) %s %s %d %d\n", event->type, s, + fprintf (stderr, "(detail) %s %s %ld %ld\n", event->type, s, event->detail1, event->detail2); if (s) SPI_freeString (s); } @@ -399,7 +392,7 @@ void report_detail1_event (const AccessibleEvent *event, void *user_data) { char *s = Accessible_getName (event->source); - fprintf (stderr, "(detail) %s %s %d\n", event->type, s, + fprintf (stderr, "(detail) %s %s %ld\n", event->type, s, event->detail1); if (s) SPI_freeString (s); } @@ -410,7 +403,7 @@ report_bounds_event (const AccessibleEvent *event, void *user_data) char *s = Accessible_getName (event->source); SPIRect *bounds = AccessibleBoundsChangedEvent_getNewBounds (event); if (!bounds) fprintf (stderr, "bounds-changed event with no bounds?\n"); - fprintf (stderr, "(bounds-changed) %s %s %d,%d - %d,%d\n", event->type, s, + fprintf (stderr, "(bounds-changed) %s %s %ld,%ld - %ld,%ld\n", event->type, s, bounds->x, bounds->y, bounds->x + bounds->width, bounds->y + bounds->height); SPI_freeRect (bounds); if (s) SPI_freeString (s); @@ -420,7 +413,7 @@ void report_text_event (const AccessibleEvent *event, void *user_data) { char *s = Accessible_getName (event->source); - fprintf (stderr, "(detail) %s %s %d %d\n", event->type, s, + fprintf (stderr, "(detail) %s %s %ld %ld\n", event->type, s, event->detail1, event->detail2); SPI_freeString (s); s = AccessibleTextChangedEvent_getChangeString (event); @@ -432,7 +425,7 @@ void report_text_selection_event (const AccessibleEvent *event, void *user_data) { char *s = Accessible_getName (event->source); - fprintf (stderr, "(detail) %s %s %d %d\n", event->type, s, + fprintf (stderr, "(detail) %s %s %ld %ld\n", event->type, s, event->detail1, event->detail2); SPI_freeString (s); s = AccessibleTextSelectionChangedEvent_getSelectionString (event); @@ -449,7 +442,7 @@ report_active_descendant_changed_event (const AccessibleEvent *event, void *user ao = AccessibleActiveDescendantChangedEvent_getActiveDescendant (event); s1 = Accessible_getName (ao); - fprintf (stderr, "(detail) %s parent: %s child: %s %d %d\n", event->type, + fprintf (stderr, "(detail) %s parent: %s child: %s %ld %ld\n", event->type, s ? s : "", s1 ? s1 : "", event->detail1, event->detail2); SPI_freeString (s); @@ -467,7 +460,7 @@ report_children_changed_event (const AccessibleEvent *event, void *user_data) if (ao) s1 = Accessible_getName (ao); s2 = Accessible_getRoleName (event->source); if (ao) s3 = Accessible_getRoleName (ao); - fprintf (stderr, "(detail) %s parent: %s [%s] child: %s [%s] %d %d\n", + fprintf (stderr, "(detail) %s parent: %s [%s] child: %s [%s] %ld %ld\n", event->type, s ? s : "", s2, @@ -485,7 +478,7 @@ void report_name_changed_event (const AccessibleEvent *event, void *user_data) { char *s = Accessible_getName (event->source); - fprintf (stderr, "(detail) %s %s %d %d\n", event->type, s, + fprintf (stderr, "(detail) %s %s %ld %ld\n", event->type, s, event->detail1, event->detail2); SPI_freeString (s); s = AccessibleNameChangedEvent_getNameString (event); @@ -497,7 +490,7 @@ void report_description_changed_event (const AccessibleEvent *event, void *user_data) { char *s = Accessible_getName (event->source); - fprintf (stderr, "(detail) %s %s %d %d\n", event->type, s, + fprintf (stderr, "(detail) %s %s %ld %ld\n", event->type, s, event->detail1, event->detail2); SPI_freeString (s); s = AccessibleDescriptionChangedEvent_getDescriptionString (event); @@ -514,7 +507,7 @@ report_parent_changed_event (const AccessibleEvent *event, void *user_data) ao = AccessibleParentChangedEvent_getParentAccessible (event); s1 = Accessible_getName (ao); - fprintf (stderr, "(detail) %s parent: %s child: %s %d %d\n", event->type, + fprintf (stderr, "(detail) %s parent: %s child: %s %ld %ld\n", event->type, s ? s : "", s1 ? s1 : "", event->detail1, event->detail2); SPI_freeString (s); @@ -526,7 +519,7 @@ void report_window_event (const AccessibleEvent *event, void *user_data) { char *s = Accessible_getName (event->source); - fprintf (stderr, "(detail) %s %s %d %d\n", event->type, s, + fprintf (stderr, "(detail) %s %s %ld %ld\n", event->type, s, event->detail1, event->detail2); SPI_freeString (s); s = AccessibleWindowEvent_getTitleString (event); @@ -543,7 +536,7 @@ report_table_summary_event (const AccessibleEvent *event, void *user_data) ao = AccessibleTableSummaryChangedEvent_getSummaryAccessible (event); s1 = Accessible_getName (ao); - fprintf (stderr, "(detail) %s parent: %s child: %s %d %d\n", event->type, + fprintf (stderr, "(detail) %s parent: %s child: %s %ld %ld\n", event->type, s ? s : "", s1 ? s1 : "", event->detail1, event->detail2); SPI_freeString (s); @@ -560,7 +553,7 @@ report_table_header_event (const AccessibleEvent *event, void *user_data) ao = AccessibleTableHeaderChangedEvent_getHeaderAccessible (event); s1 = Accessible_getName (ao); - fprintf (stderr, "(detail) %s parent: %s child: %s %d %d\n", event->type, + fprintf (stderr, "(detail) %s parent: %s child: %s %ld %ld\n", event->type, s ? s : "", s1 ? s1 : "", event->detail1, event->detail2); SPI_freeString (s); @@ -572,7 +565,7 @@ void report_table_caption_event (const AccessibleEvent *event, void *user_data) { char *s = Accessible_getName (event->source); - fprintf (stderr, "(detail) %s %s %d %d\n", event->type, s, + fprintf (stderr, "(detail) %s %s %ld %ld\n", event->type, s, event->detail1, event->detail2); SPI_freeString (s); s = AccessibleTableCaptionChangedEvent_getCaptionString (event); @@ -584,7 +577,7 @@ void report_table_row_description_event (const AccessibleEvent *event, void *user_data) { char *s = Accessible_getName (event->source); - fprintf (stderr, "(detail) %s %s %d %d\n", event->type, s, + fprintf (stderr, "(detail) %s %s %ld %ld\n", event->type, s, event->detail1, event->detail2); SPI_freeString (s); s = AccessibleTableRowDescriptionChangedEvent_getDescriptionString (event); @@ -596,7 +589,7 @@ void report_table_column_description_event (const AccessibleEvent *event, void *user_data) { char *s = Accessible_getName (event->source); - fprintf (stderr, "(detail) %s %s %d %d\n", event->type, s, + fprintf (stderr, "(detail) %s %s %ld %ld\n", event->type, s, event->detail1, event->detail2); SPI_freeString (s); s = AccessibleTableColumnDescriptionChangedEvent_getDescriptionString (event); @@ -622,7 +615,7 @@ timing_test_event (const AccessibleEvent *event, void *user_data) if (count == 0) g_timer_start (timer); ++count; if ((count % 500) == 0) { - g_print ("%d events received, %f events/sec\n", + g_print ("%ld events received, %f events/sec\n", count, count/g_timer_elapsed(timer, NULL)); } diff --git a/test/key-listener-test.c b/test/key-listener-test.c index ad73d32..c731d61 100644 --- a/test/key-listener-test.c +++ b/test/key-listener-test.c @@ -195,7 +195,7 @@ report_tab_key_event (const AccessibleKeystroke *key, void *user_data) static SPIBoolean report_all_key_event (const AccessibleKeystroke *key, void *user_data) { - fprintf(stderr, "(%d)", key->keyID); + fprintf(stderr, "(%ld)", key->keyID); return FALSE; } diff --git a/test/keypad-test.c b/test/keypad-test.c index f7d0be8..7be9c99 100644 --- a/test/keypad-test.c +++ b/test/keypad-test.c @@ -165,7 +165,7 @@ get_keypad_keycodes (void) static void print_key_event (const AccessibleKeystroke *key, char *prefix) { - fprintf (stderr, "%s KeyEvent %s%c [keysym 0x%x] (keycode %d); string=%s; time=%lx\n", + fprintf (stderr, "%s KeyEvent %s%c [keysym 0x%ld] (keycode %d); string=%s; time=%lx\n", prefix, (key->modifiers & SPI_KEYMASK_ALT)?"Alt-":"", ((key->modifiers & SPI_KEYMASK_SHIFT)^(key->modifiers & SPI_KEYMASK_SHIFTLOCK))? diff --git a/test/login-helper-server-test.c b/test/login-helper-server-test.c index 61446e2..c7b2679 100644 --- a/test/login-helper-server-test.c +++ b/test/login-helper-server-test.c @@ -1,5 +1,6 @@ #include #include +#include #include #include #include @@ -25,7 +26,7 @@ int main (int argc, char **argv) { int ret; - char *obj_id, *display_name; + char *obj_id; BonoboObject *helper; if (!bonobo_init (&argc, argv)) diff --git a/test/screen-review-test.c b/test/screen-review-test.c index 482180b..1b5fa2e 100644 --- a/test/screen-review-test.c +++ b/test/screen-review-test.c @@ -90,7 +90,6 @@ static void report_screen_review_line (const AccessibleEvent *event, void *user_data); -static gint n_elements_traversed = 0; static AccessibleEventListener *mouseclick_listener; typedef struct _BoundaryRect { @@ -123,16 +122,6 @@ static gboolean isJava = FALSE; int main (int argc, char **argv) { - int i, j; - int n_desktops; - int n_apps; - char *s; - GTimer *timer; - gdouble elapsed_time; - Accessible *desktop; - Accessible *application; - const char *modules; - SPI_init (); mouseclick_listener = SPI_createAccessibleEventListener ( @@ -312,7 +301,7 @@ text_chunk_split_insert (GList *chunk_list, GList *iter, TextChunk *chunk) static void print_chunk_debug (TextChunk *chunk, char *opname, GList *prev, GList *next) { - fprintf (stderr, "%sing chunk %s between %s and %s; %d-%d\n", + fprintf (stderr, "%sing chunk %s between %s and %s; %ld-%ld\n", opname, chunk->string, (prev ? ((TextChunk *) prev->data)->string : ""), @@ -459,7 +448,6 @@ review_buffer_get_text_chunk (ScreenReviewBuffer *reviewBuffer, AccessibleText *text = NULL; AccessibleRole role; TextChunk *text_chunk; - BoundaryRect start_char_bounds, end_char_bounds; char *s = NULL; int offset; long start, end; @@ -585,13 +573,14 @@ review_buffer_get_text_chunk (ScreenReviewBuffer *reviewBuffer, return text_chunk; } +#ifdef CHUNK_LIST_DEBUG static void debug_chunk_list (GList *iter) { TextChunk *chunk; while (iter) { chunk = (TextChunk *)iter->data; - fprintf (stderr, "Chunk %s, clip %d-%d, text %d-%d\n", + fprintf (stderr, "Chunk %s, clip %ld-%ld, text %ld-%ld\n", chunk->string, chunk->clip_bounds.x, chunk->clip_bounds.x + chunk->clip_bounds.width, @@ -600,6 +589,7 @@ debug_chunk_list (GList *iter) iter = iter->next; } } +#endif static void clip_into_buffers (Accessible *accessible, BoundaryRect* parentClipBounds[], @@ -745,7 +735,7 @@ string_guess_clip (TextChunk *chunk) start_offset = len * (chunk->text_bounds.x - b.x) / b.width; end_offset = len * (chunk->text_bounds.x + chunk->text_bounds.width - b.x) / b.width; - fprintf (stderr, "String len %d, clipped to %d-%d\n", + fprintf (stderr, "String len %ld, clipped to %ld-%ld\n", len, start_offset, end_offset); len = end_offset - start_offset; sp = g_utf8_offset_to_pointer (chunk->string, start_offset); @@ -763,7 +753,6 @@ static char* text_chunk_get_clipped_string (TextChunk *chunk) { char *s, *string = ""; - int i; long start = chunk->start_offset, end = chunk->end_offset; long word_start, word_end, range_end; BoundaryRect start_bounds, end_bounds; @@ -893,7 +882,6 @@ text_chunk_list_to_string (GList *iter) char *s = ""; char *string; TextChunk *chunk = NULL; - int offset = 0; while (iter) { chunk = (TextChunk *)iter->data; if (chunk) { @@ -983,14 +971,14 @@ static char * get_screen_review_line_at (int x, int y) { char *string; - Accessible *desktop, *app, *toplevel, *child; + Accessible *desktop, *app, *toplevel; AccessibleComponent *component; AccessibleStateSet *states; GList *toplevels = NULL, *actives = NULL, *iter; ScreenReviewBuffer* reviewBuffers[SPI_LAYER_LAST_DEFINED]; BoundaryRect* clip_bounds[SPI_LAYER_LAST_DEFINED]; BoundaryRect toplevel_bounds; - int n_apps, n_toplevels, n_children, app_n, toplevel_n, child_n; + int n_apps, n_toplevels, app_n, toplevel_n; GTimer *timer = g_timer_new (); int i; @@ -1045,8 +1033,8 @@ get_screen_review_line_at (int x, int y) if (Accessible_isComponent (toplevel)) { /* make sure toplevel is visible and not iconified or shaded */ states = Accessible_getStateSet (toplevel); - if (AccessibleStateSet_contains (states, SPI_STATE_VISIBLE) - && !AccessibleStateSet_contains (states, SPI_STATE_ICONIFIED) + if ((AccessibleStateSet_contains (states, SPI_STATE_VISIBLE) + && (!AccessibleStateSet_contains (states, SPI_STATE_ICONIFIED))) || isJava) { /* isJava hack! */ component = Accessible_getComponent (toplevel); AccessibleComponent_getExtents (component, diff --git a/test/simple-at.c b/test/simple-at.c index 8343c31..7da2bb5 100644 --- a/test/simple-at.c +++ b/test/simple-at.c @@ -389,7 +389,7 @@ report_text_event (const AccessibleEvent *event, void *user_data) long start, end; char *word_text = AccessibleText_getTextAtOffset (text, (long) event->detail1, SPI_TEXT_BOUNDARY_WORD_START, &start, &end); char *sentence_text = AccessibleText_getTextAtOffset (text, (long) event->detail1, SPI_TEXT_BOUNDARY_SENTENCE_START, &start, &end); - fprintf (stderr, "text changed: word %s; sentence %s at %d", + fprintf (stderr, "text changed: word %s; sentence %s at %ld", (word_text ? word_text : ""), (sentence_text ? sentence_text : ""), event->detail1); diff --git a/test/stress-test.c b/test/stress-test.c index 17a366a..3264d5f 100644 --- a/test/stress-test.c +++ b/test/stress-test.c @@ -43,7 +43,6 @@ main (int argc, char **argv) GObject *object; AtkObject *atko; GTimer *timer; - gdouble elapsed_time; gtk_init (&argc, &argv); SPI_init ();