diff options
| -rw-r--r-- | atk-adaptor/Makefile.include | 1 | ||||
| -rw-r--r-- | atk-adaptor/bridge.c | 45 | ||||
| -rw-r--r-- | atk-adaptor/gtk-2.0/Makefile.am | 2 | ||||
| -rw-r--r-- | atk-adaptor/gtk-2.0/module.c | 74 | ||||
| -rw-r--r-- | atk-adaptor/gtk-3.0/Makefile.am | 2 | ||||
| -rw-r--r-- | atk-adaptor/gtk-3.0/module.c | 52 |
6 files changed, 131 insertions, 45 deletions
diff --git a/atk-adaptor/Makefile.include b/atk-adaptor/Makefile.include index 08cf6d1..6409964 100644 --- a/atk-adaptor/Makefile.include +++ b/atk-adaptor/Makefile.include @@ -6,6 +6,7 @@ libatk_bridge_la_CFLAGS = \ $(ATSPI_CFLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/atk-adaptor/adaptors \ + -I$(top_srcdir)/atk-adaptor/ $(P2P_CFLAGS) \ $(X_CFLAGS) diff --git a/atk-adaptor/bridge.c b/atk-adaptor/bridge.c index 4babf4c..6822a02 100644 --- a/atk-adaptor/bridge.c +++ b/atk-adaptor/bridge.c @@ -36,7 +36,6 @@ #include <atk/atk.h> #include <droute/droute.h> -#include <gmodule.h> #include <atspi/atspi.h> #include "bridge.h" @@ -905,50 +904,6 @@ adaptor_cleanup (void) /*---------------------------------------------------------------------------*/ -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; -} - -gchar* -g_module_check_init (GModule *module) -{ - g_module_make_resident (module); - - return NULL; -} - -void -gnome_accessibility_module_init (void) -{ - const gchar *load_bridge = g_getenv ("NO_AT_BRIDGE"); - - if (!load_bridge || g_ascii_strtod (load_bridge, NULL) == 0) - { - adaptor_init (NULL, NULL); - - if (g_getenv ("AT_SPI_DEBUG")) - { - g_print ("Atk Accessibility bridge initialized\n"); - } - } -} - -void -gnome_accessibility_module_shutdown (void) -{ - adaptor_cleanup (); -} - -/*---------------------------------------------------------------------------*/ - static gchar *name_match_tmpl = "type='signal', interface='org.freedesktop.DBus', member='NameOwnerChanged', arg0='%s'"; diff --git a/atk-adaptor/gtk-2.0/Makefile.am b/atk-adaptor/gtk-2.0/Makefile.am index 7903fc6..fd4eb7f 100644 --- a/atk-adaptor/gtk-2.0/Makefile.am +++ b/atk-adaptor/gtk-2.0/Makefile.am @@ -1,3 +1,5 @@ gtkmoduledir = $(libdir)/gtk-2.0/modules include $(top_srcdir)/atk-adaptor/Makefile.include + +libatk_bridge_la_SOURCES += module.c diff --git a/atk-adaptor/gtk-2.0/module.c b/atk-adaptor/gtk-2.0/module.c new file mode 100644 index 0000000..4fa6947 --- /dev/null +++ b/atk-adaptor/gtk-2.0/module.c @@ -0,0 +1,74 @@ +/* + * AT-SPI - Assistive Technology Service Provider Interface + * (Gnome Accessibility Project; http://developer.gnome.org/projects/gap) + * + * Copyright 2008, 2009 Codethink Ltd. + * Copyright 2001, 2002, 2003 Sun Microsystems Inc., + * Copyright 2001, 2002, 2003 Ximian, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#define _GNU_SOURCE +#include "config.h" + +#include <gmodule.h> + +#include "bridge.h" + +/*---------------------------------------------------------------------------*/ + +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; +} + +gchar* +g_module_check_init (GModule *module) +{ + g_module_make_resident (module); + + return NULL; +} + +void +gnome_accessibility_module_init (void) +{ + const gchar *load_bridge = g_getenv ("NO_AT_BRIDGE"); + + if (!load_bridge || g_ascii_strtod (load_bridge, NULL) == 0) + { + adaptor_init (NULL, NULL); + + if (g_getenv ("AT_SPI_DEBUG")) + { + g_print ("Atk Accessibility bridge initialized\n"); + } + } +} + +void +gnome_accessibility_module_shutdown (void) +{ + adaptor_cleanup (); +} diff --git a/atk-adaptor/gtk-3.0/Makefile.am b/atk-adaptor/gtk-3.0/Makefile.am index a1a8480..73ac944 100644 --- a/atk-adaptor/gtk-3.0/Makefile.am +++ b/atk-adaptor/gtk-3.0/Makefile.am @@ -1,3 +1,5 @@ gtkmoduledir = $(libdir)/gtk-3.0/modules include $(top_srcdir)/atk-adaptor/Makefile.include + +libatk_bridge_la_SOURCES += module.c diff --git a/atk-adaptor/gtk-3.0/module.c b/atk-adaptor/gtk-3.0/module.c new file mode 100644 index 0000000..82ddce0 --- /dev/null +++ b/atk-adaptor/gtk-3.0/module.c @@ -0,0 +1,52 @@ +/* + * AT-SPI - Assistive Technology Service Provider Interface + * (Gnome Accessibility Project; http://developer.gnome.org/projects/gap) + * + * Copyright 2008, 2009 Codethink Ltd. + * Copyright 2001, 2002, 2003 Sun Microsystems Inc., + * Copyright 2001, 2002, 2003 Ximian, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#define _GNU_SOURCE +#include "config.h" + +#include <gmodule.h> + +#include "bridge.h" + +/*---------------------------------------------------------------------------*/ + +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; +} + +gchar* +g_module_check_init (GModule *module) +{ + g_module_make_resident (module); + + return NULL; +} |