diff options
author | Bastien Nocera <hadess@hadess.net> | 2012-06-13 17:07:52 +0100 |
---|---|---|
committer | Bastien Nocera <hadess@hadess.net> | 2012-06-14 18:00:24 +0100 |
commit | ed83098eebf77cb108b9471342cc3a172d8d258f (patch) | |
tree | 2c79775312ffca09e7bba85419f1719b11101489 | |
parent | 870da4fec9e9c5007a10875ecc0b80b62ac92c45 (diff) | |
download | at-spi2-atk-ed83098eebf77cb108b9471342cc3a172d8d258f.tar.gz |
Move adaptor_*() functions into their own header
https://bugzilla.gnome.org/show_bug.cgi?id=678037
-rw-r--r-- | atk-adaptor/Makefile.am | 3 | ||||
-rw-r--r-- | atk-adaptor/atk-bridge.h | 35 | ||||
-rw-r--r-- | atk-adaptor/bridge.c | 1 | ||||
-rw-r--r-- | atk-adaptor/bridge.h | 2 | ||||
-rw-r--r-- | atk-adaptor/gtk-2.0/module.c | 3 | ||||
-rw-r--r-- | atk-adaptor/gtk-3.0/module.c | 3 |
6 files changed, 40 insertions, 7 deletions
diff --git a/atk-adaptor/Makefile.am b/atk-adaptor/Makefile.am index 2992f0a..6619c2d 100644 --- a/atk-adaptor/Makefile.am +++ b/atk-adaptor/Makefile.am @@ -29,7 +29,8 @@ libatk_bridge_2_0_la_SOURCES = \ event.c \ event.h \ spi-dbus.c \ - spi-dbus.h + spi-dbus.h \ + atk-bridge.h libatk_bridge_2_0_la_LIBADD = \ $(DBUS_LIBS) \ diff --git a/atk-adaptor/atk-bridge.h b/atk-adaptor/atk-bridge.h new file mode 100644 index 0000000..ae0fcc5 --- /dev/null +++ b/atk-adaptor/atk-bridge.h @@ -0,0 +1,35 @@ +/* + * AT-SPI - Assistive Technology Service Provider Interface + * (Gnome Accessibility Project; http://developer.gnome.org/projects/gap) + * + * Copyright 2001, 2002, 2003 Sun Microsystems Inc., + * Copyright 2001, 2002, 2003 Ximian, Inc. + * Copyright 2008, 2009, 2010 Codethink Ltd. + * + * 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. + */ + +#ifndef ATK_BRIDGE_H +#define ATK_BRIDGE_H + +G_BEGIN_DECLS + +int adaptor_init (int * argc, char ** argv[]); +void adaptor_cleanup (void); + +G_END_DECLS + +#endif /* ATK_BRIDGE_H */ diff --git a/atk-adaptor/bridge.c b/atk-adaptor/bridge.c index 6822a02..a179ab8 100644 --- a/atk-adaptor/bridge.c +++ b/atk-adaptor/bridge.c @@ -37,6 +37,7 @@ #include <droute/droute.h> #include <atspi/atspi.h> +#include <atk-bridge.h> #include "bridge.h" #include "event.h" diff --git a/atk-adaptor/bridge.h b/atk-adaptor/bridge.h index 949af30..c24183e 100644 --- a/atk-adaptor/bridge.h +++ b/atk-adaptor/bridge.h @@ -66,8 +66,6 @@ char *app_bus_addr; extern SpiBridge *spi_global_app_data; -int adaptor_init (gint * argc, gchar ** argv[]); -void adaptor_cleanup (void); void spi_atk_add_client (const char *bus_name); void spi_atk_remove_client (const char *bus_name); diff --git a/atk-adaptor/gtk-2.0/module.c b/atk-adaptor/gtk-2.0/module.c index 4fa6947..a7251d2 100644 --- a/atk-adaptor/gtk-2.0/module.c +++ b/atk-adaptor/gtk-2.0/module.c @@ -26,8 +26,7 @@ #include "config.h" #include <gmodule.h> - -#include "bridge.h" +#include <atk-bridge.h> /*---------------------------------------------------------------------------*/ diff --git a/atk-adaptor/gtk-3.0/module.c b/atk-adaptor/gtk-3.0/module.c index 82ddce0..0483cca 100644 --- a/atk-adaptor/gtk-3.0/module.c +++ b/atk-adaptor/gtk-3.0/module.c @@ -26,8 +26,7 @@ #include "config.h" #include <gmodule.h> - -#include "bridge.h" +#include <atk-bridge.h> /*---------------------------------------------------------------------------*/ |