projects
/
platform
/
core
/
uifw
/
at-spi2-atk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove duplicate code from GTK+ modules
[platform/core/uifw/at-spi2-atk.git]
/
atk-adaptor
/
gtk-2.0
/
module.c
diff --git
a/atk-adaptor/gtk-2.0/module.c
b/atk-adaptor/gtk-2.0/module.c
index
4fa6947
..
d2a49ee
100644
(file)
--- a/
atk-adaptor/gtk-2.0/module.c
+++ b/
atk-adaptor/gtk-2.0/module.c
@@
-26,21
+26,14
@@
#include "config.h"
#include <gmodule.h>
#include "config.h"
#include <gmodule.h>
-
-#include "bridge.h"
+#include <atk-bridge.h>
/*---------------------------------------------------------------------------*/
int
gtk_module_init (gint * argc, gchar ** argv[])
{
/*---------------------------------------------------------------------------*/
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 adaptor_init (argc, argv);
- }
- return 0;
+ return atk_bridge_adaptor_init (argc, argv);
}
gchar*
}
gchar*
@@
-54,21
+47,16
@@
g_module_check_init (GModule *module)
void
gnome_accessibility_module_init (void)
{
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")
)
{
{
- adaptor_init (NULL, NULL);
-
- if (g_getenv ("AT_SPI_DEBUG"))
- {
- g_print ("Atk Accessibility bridge initialized\n");
- }
+ g_print ("Atk Accessibility bridge initialized\n");
}
}
void
gnome_accessibility_module_shutdown (void)
{
}
}
void
gnome_accessibility_module_shutdown (void)
{
- adaptor_cleanup ();
+ a
tk_bridge_a
daptor_cleanup ();
}
}