diff options
| author | Mario Sanchez Prada <mario.prada@samsung.com> | 2013-09-16 16:57:49 +0100 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2013-09-25 20:14:04 -0400 |
| commit | 8d83d989bb2533d61f0d1fbe2046fdebb3335c6b (patch) | |
| tree | ba4650bbc1ed119077858257ede625aec88833a8 /gtk/a11y | |
| parent | 6f9fed45ef99f609829dcfd5ddaea2f48a181e37 (diff) | |
| download | gtk+-8d83d989bb2533d61f0d1fbe2046fdebb3335c6b.tar.gz | |
a11y: don't shutdown accessibility, so the atk bridge is always valid
This will fix issues in applications that for some reason make
several and not nested calls to gtk_main() during their lifetime,
effectively initializing a11y when the first, top most, main loop
is being run and shutting it down then that loop is quit.
https://bugzilla.gnome.org/show_bug.cgi?id=708024
https://bugzilla.gnome.org/show_bug.cgi?id=684076
Diffstat (limited to 'gtk/a11y')
| -rw-r--r-- | gtk/a11y/gtkaccessibility.c | 29 | ||||
| -rw-r--r-- | gtk/a11y/gtkaccessibility.h | 1 |
2 files changed, 0 insertions, 30 deletions
diff --git a/gtk/a11y/gtkaccessibility.c b/gtk/a11y/gtkaccessibility.c index 407ffe73fe..3c51f26508 100644 --- a/gtk/a11y/gtkaccessibility.c +++ b/gtk/a11y/gtkaccessibility.c @@ -967,35 +967,6 @@ do_window_event_initialization (void) g_signal_connect (root, "children-changed::remove", (GCallback) window_removed, NULL); } -static void -undo_window_event_initialization (void) -{ - AtkObject *root; - - root = atk_get_root (); - - g_signal_handlers_disconnect_by_func (root, (GCallback) window_added, NULL); - g_signal_handlers_disconnect_by_func (root, (GCallback) window_removed, NULL); -} - - -void -_gtk_accessibility_shutdown (void) -{ - if (!initialized) - return; - - initialized = FALSE; - - g_clear_object (&atk_misc_instance); - -#ifdef GDK_WINDOWING_X11 - atk_bridge_adaptor_cleanup (); -#endif - - undo_window_event_initialization (); -} - void _gtk_accessibility_init (void) { diff --git a/gtk/a11y/gtkaccessibility.h b/gtk/a11y/gtkaccessibility.h index 461e219a89..c3df055dec 100644 --- a/gtk/a11y/gtkaccessibility.h +++ b/gtk/a11y/gtkaccessibility.h @@ -23,7 +23,6 @@ G_BEGIN_DECLS -void _gtk_accessibility_shutdown (void); void _gtk_accessibility_init (void); gboolean _gtk_accessibility_key_snooper (GtkWidget *widget, |