diff options
| author | Bastien Nocera <hadess@hadess.net> | 2012-06-15 17:01:43 +0100 |
|---|---|---|
| committer | Bastien Nocera <hadess@hadess.net> | 2012-06-15 17:06:43 +0100 |
| commit | 007e3785b1ff5d267b047b821797679be1c11a08 (patch) | |
| tree | d1807b7067faf41786b6ee4c25e034e2c9fa3048 | |
| parent | 55b85389cc9fab84ecf17e113747e1b9d7f4ec2c (diff) | |
| download | at-spi2-atk-007e3785b1ff5d267b047b821797679be1c11a08.tar.gz | |
Remove duplicate code from GTK+ modules
Now that the AT_NO_BRIDGE check lives in atk-bridge-2.0
| -rw-r--r-- | atk-adaptor/gtk-2.0/module.c | 19 | ||||
| -rw-r--r-- | atk-adaptor/gtk-3.0/module.c | 8 |
2 files changed, 5 insertions, 22 deletions
diff --git a/atk-adaptor/gtk-2.0/module.c b/atk-adaptor/gtk-2.0/module.c index 93a1905..d2a49ee 100644 --- a/atk-adaptor/gtk-2.0/module.c +++ b/atk-adaptor/gtk-2.0/module.c @@ -33,13 +33,7 @@ int gtk_module_init (gint * argc, gchar ** argv[]) { - const gchar *load_bridge = g_getenv ("NO_AT_BRIDGE"); - - if (!load_bridge || g_ascii_strtod (load_bridge, NULL) == 0) - { - return atk_bridge_adaptor_init (argc, argv); - } - return 0; + return atk_bridge_adaptor_init (argc, argv); } gchar* @@ -53,16 +47,11 @@ g_module_check_init (GModule *module) void gnome_accessibility_module_init (void) { - const gchar *load_bridge = g_getenv ("NO_AT_BRIDGE"); + atk_bridge_adaptor_init (NULL, NULL); - if (!load_bridge || g_ascii_strtod (load_bridge, NULL) == 0) + if (g_getenv ("AT_SPI_DEBUG")) { - atk_bridge_adaptor_init (NULL, NULL); - - if (g_getenv ("AT_SPI_DEBUG")) - { - g_print ("Atk Accessibility bridge initialized\n"); - } + g_print ("Atk Accessibility bridge initialized\n"); } } diff --git a/atk-adaptor/gtk-3.0/module.c b/atk-adaptor/gtk-3.0/module.c index 5f724eb..97929d9 100644 --- a/atk-adaptor/gtk-3.0/module.c +++ b/atk-adaptor/gtk-3.0/module.c @@ -33,13 +33,7 @@ int gtk_module_init (gint * argc, gchar ** argv[]) { - const gchar *load_bridge = g_getenv ("NO_AT_BRIDGE"); - - if (!load_bridge || g_ascii_strtod (load_bridge, NULL) == 0) - { - return atk_bridge_adaptor_init (argc, argv); - } - return 0; + return atk_bridge_adaptor_init (argc, argv); } gchar* |