From aca3c37006a1198a76e5ead8e29a7534f94f2569 Mon Sep 17 00:00:00 2001 From: michael Date: Fri, 27 Jul 2001 10:18:59 +0000 Subject: [PATCH] 2001-07-27 Michael Meeks * po/Makefile.in.in: remove autogenerated file from CVS. * libspi/Makefile.am: Radicaly re-vamp to simplify & add ORBit2 type library. * idl/Registry.idl: include guard. * idl/Accessibility.idl: Add, and include all the other IDL files. * idl/*.idl: remove mass of pragmas etc. 2001-07-26 Michael Meeks * registryd/Makefile.am (registryd_SOURCES): remove redundant at_. git-svn-id: http://svn.gnome.org/svn/at-spi/trunk@10 e2bd861d-eb25-0410-b326-f6ed22b6b98c --- ChangeLog | 19 ++++ idl/Accessibility.idl | 46 +++++++++ idl/Accessibility_Accessible.idl | 12 --- idl/Accessibility_Application.idl | 15 --- idl/Accessibility_Desktop.idl | 15 --- idl/Accessibility_Event.idl | 16 --- idl/Accessibility_Registry.idl | 5 + idl/Accessibility_Relation.idl | 13 --- idl/Accessibility_Role.idl | 12 +-- idl/Accessibility_State.idl | 11 +- idl/Accessible.idl | 12 --- idl/Application.idl | 15 --- idl/Desktop.idl | 15 --- idl/Event.idl | 16 --- idl/Registry.idl | 5 + idl/Relation.idl | 13 --- idl/Role.idl | 12 +-- idl/State.idl | 11 +- libspi/Makefile.am | 73 +++++-------- libspi/accessible.c | 2 +- libspi/accessible.h | 2 +- libspi/application.c | 2 +- libspi/application.h | 2 +- libspi/atksimpleobject.c | 1 + libspi/desktop.c | 2 +- libspi/desktop.h | 2 +- libspi/listener.c | 2 +- libspi/listener.h | 2 +- libspi/registry.c | 2 +- libspi/registry.h | 2 +- po/Makefile.in.in | 210 -------------------------------------- registryd/Makefile.am | 2 +- registryd/desktop.c | 2 +- registryd/desktop.h | 2 +- registryd/registry.c | 2 +- registryd/registry.h | 2 +- test/app.c | 3 +- test/at.c | 3 +- 38 files changed, 124 insertions(+), 459 deletions(-) create mode 100644 idl/Accessibility.idl delete mode 100644 po/Makefile.in.in diff --git a/ChangeLog b/ChangeLog index 61df7cc..b0d4e06 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,22 @@ +2001-07-27 Michael Meeks + + * po/Makefile.in.in: remove autogenerated file from CVS. + + * libspi/Makefile.am: Radicaly re-vamp to simplify & add ORBit2 + type library. + + * idl/Registry.idl: include guard. + + * idl/Accessibility.idl: Add, and include all the other IDL + files. + + * idl/*.idl: remove mass of pragmas etc. + +2001-07-26 Michael Meeks + + * registryd/Makefile.am (registryd_SOURCES): remove + redundant at_. + 2001-07-27 Mark McLoughlin * libspi/.cvsignore, registryd/.cvsignore, diff --git a/idl/Accessibility.idl b/idl/Accessibility.idl new file mode 100644 index 0000000..862453a --- /dev/null +++ b/idl/Accessibility.idl @@ -0,0 +1,46 @@ +/* + * AT-SPI - Assistive Technology Service Provider Interface + * (Gnome Accessibility Project; http://developer.gnome.org/projects/gap) + * + * Copyright 2001 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. + */ + +#ifndef _ACCESSIBILITY_IDL_ +#define _ACCESSIBILITY_IDL_ + +#if !defined(__ACCESSIBILITY_COMPILATION__) && defined(__ORBIT_IDL__) +%{ +#pragma include_defs Accessibility.h +%} +#pragma inhibit push +#endif + +#include +#include +#include +#include +#include +#include +#include +#include + +#if !defined(__ACCESSIBILITY_COMPILATION__) && defined(__ORBIT_IDL__) +#pragma inhibit pop +#endif + +#endif diff --git a/idl/Accessibility_Accessible.idl b/idl/Accessibility_Accessible.idl index 5f5bf96..ac65681 100644 --- a/idl/Accessibility_Accessible.idl +++ b/idl/Accessibility_Accessible.idl @@ -23,16 +23,8 @@ #ifndef _ACCESSIBILITY_ACCESSIBLE_IDL #define _ACCESSIBILITY_ACCESSIBLE_IDL - #include -#if !defined(__ACCESSIBILITY_ACCESSIBLE_COMPILATION) && defined(__ORBIT_IDL__) -%{ -#pragma include_defs Accessible.h -%} -#pragma inhibit push -#endif - #include "Relation.idl" #include "State.idl" #include "Role.idl" @@ -114,9 +106,5 @@ module Accessibility { }; }; -#if !defined(__ACCESSIBILITY_ACCESSIBLE_COMPILATION) && defined(__ORBIT_IDL__) -#pragma inhibit pop -#endif - #endif diff --git a/idl/Accessibility_Application.idl b/idl/Accessibility_Application.idl index 528d63c..1253bb4 100644 --- a/idl/Accessibility_Application.idl +++ b/idl/Accessibility_Application.idl @@ -26,17 +26,6 @@ #include #include -#if !defined(__ACCESSIBILITY_APPLICATION_COMPILATION) && defined(__ORBIT_IDL__) -%{ -#pragma include_defs Application.h -%} -#pragma inhibit push -#endif - -#pragma inhibit push -#include "Accessible.idl" -#pragma inhibit pop - module Accessibility { interface Application : Accessible { @@ -83,8 +72,4 @@ module Accessibility { }; }; -#if !defined(__ACCESSIBILITY_APPLICATION_COMPILATION) && defined(__ORBIT_IDL__) -#pragma inhibit pop -#endif - #endif diff --git a/idl/Accessibility_Desktop.idl b/idl/Accessibility_Desktop.idl index 5d63fa2..635fee5 100644 --- a/idl/Accessibility_Desktop.idl +++ b/idl/Accessibility_Desktop.idl @@ -26,17 +26,6 @@ #include #include -#if !defined(__ACCESSIBILITY_DESKTOP_COMPILATION) && defined(__ORBIT_IDL__) -%{ -#pragma include_defs Desktop.h -%} -#pragma inhibit push -#endif - -#pragma inhibit push -#include "Accessible.idl" -#pragma inhibit pop - module Accessibility { interface Desktop : Accessible { /** @@ -46,8 +35,4 @@ module Accessibility { }; }; -#if !defined(__ACCESSIBILITY_DESKTOP_COMPILATION) && defined(__ORBIT_IDL__) -#pragma inhibit pop -#endif - #endif diff --git a/idl/Accessibility_Event.idl b/idl/Accessibility_Event.idl index 3d32618..1d9a2ea 100644 --- a/idl/Accessibility_Event.idl +++ b/idl/Accessibility_Event.idl @@ -25,18 +25,6 @@ #include -#if !defined(__ACCESSIBILITY_EVENT_COMPILATION) && defined(__ORBIT_IDL__) -%{ -#pragma include_defs Accessible.h -#pragma include_defs Event.h -%} -#pragma inhibit push -#endif - -#pragma inhibit push -#include "Accessible.idl" -#pragma inhibit pop - module Accessibility { interface Accessible; @@ -54,8 +42,4 @@ module Accessibility }; -#if !defined(__ACCESSIBILITY_EVENT_COMPILATION) && defined(__ORBIT_IDL__) -#pragma inhibit pop -#endif - #endif diff --git a/idl/Accessibility_Registry.idl b/idl/Accessibility_Registry.idl index 0a2f74c..e2b4a87 100644 --- a/idl/Accessibility_Registry.idl +++ b/idl/Accessibility_Registry.idl @@ -25,6 +25,9 @@ #include #include +#ifndef _ACCESSIBILITY_REGISTRY_IDL_ +#define _ACCESSIBILITY_REGISTRY_IDL_ + module Accessibility { typedef sequence DesktopSeq; @@ -198,3 +201,5 @@ module Accessibility { void generateMouseEvent (in long x, in long y, in string eventName); }; }; + +#endif diff --git a/idl/Accessibility_Relation.idl b/idl/Accessibility_Relation.idl index 018c6b5..d1a526b 100644 --- a/idl/Accessibility_Relation.idl +++ b/idl/Accessibility_Relation.idl @@ -23,13 +23,6 @@ #ifndef _ACCESSIBILITY_RELATION_IDL #define _ACCESSIBILITY_RELATION_IDL -#if !defined(__ACCESSIBILITY_RELATION_COMPILATION) && defined(__ORBIT_IDL__) -%{ -#pragma include_defs Relation.h -%} -#pragma inhibit push -#endif - module Accessibility { enum RelationType { @@ -41,9 +34,7 @@ module Accessibility { }; /* - * * This interface inherits from a base class implementing ref counts. - * */ interface Relation { @@ -52,8 +43,4 @@ module Accessibility { }; }; -#if !defined(__ACCESSIBILITY_RELATION_COMPILATION) && defined(__ORBIT_IDL__) -#pragma inhibit pop -#endif - #endif diff --git a/idl/Accessibility_Role.idl b/idl/Accessibility_Role.idl index 9b2b6c7..8977c2c 100644 --- a/idl/Accessibility_Role.idl +++ b/idl/Accessibility_Role.idl @@ -21,14 +21,7 @@ */ #ifndef _ACCESSIBILITY_ROLE_IDL -#define _ACCESSIBILITY_ROLE_IDL - -#if !defined(__ACCESSIBILITY_ROLE_COMPILATION) && defined(__ORBIT_IDL__) -%{ -#pragma include_defs Role.h -%} -#pragma inhibit push -#endif +#define _ACCESSIBILITY_ROLE_IDL module Accessibility { @@ -211,8 +204,5 @@ module Accessibility { ROLE_LAST_DEFINED }; }; -#if !defined(__ACCESSIBILITY_ROLE_COMPILATION) && defined(__ORBIT_IDL__) -#pragma inhibit pop -#endif #endif diff --git a/idl/Accessibility_State.idl b/idl/Accessibility_State.idl index ab45ede..5ec266c 100644 --- a/idl/Accessibility_State.idl +++ b/idl/Accessibility_State.idl @@ -23,13 +23,6 @@ #ifndef _ACCESSIBILITY_STATE_IDL #define _ACCESSIBILITY_STATE_IDL -#if !defined(__ACCESSIBILITY_STATE_COMPILATION) && defined(__ORBIT_IDL__) -%{ -#pragma include_defs State.h -%} -#pragma inhibit push -#endif - module Accessibility { enum StateType { @@ -119,7 +112,5 @@ module Accessibility { boolean isEmpty (); }; }; -#if !defined(__ACCESSIBILITY_STATE_COMPILATION) && defined(__ORBIT_IDL__) -#pragma inhibit pop -#endif + #endif diff --git a/idl/Accessible.idl b/idl/Accessible.idl index 5f5bf96..ac65681 100644 --- a/idl/Accessible.idl +++ b/idl/Accessible.idl @@ -23,16 +23,8 @@ #ifndef _ACCESSIBILITY_ACCESSIBLE_IDL #define _ACCESSIBILITY_ACCESSIBLE_IDL - #include -#if !defined(__ACCESSIBILITY_ACCESSIBLE_COMPILATION) && defined(__ORBIT_IDL__) -%{ -#pragma include_defs Accessible.h -%} -#pragma inhibit push -#endif - #include "Relation.idl" #include "State.idl" #include "Role.idl" @@ -114,9 +106,5 @@ module Accessibility { }; }; -#if !defined(__ACCESSIBILITY_ACCESSIBLE_COMPILATION) && defined(__ORBIT_IDL__) -#pragma inhibit pop -#endif - #endif diff --git a/idl/Application.idl b/idl/Application.idl index 528d63c..1253bb4 100644 --- a/idl/Application.idl +++ b/idl/Application.idl @@ -26,17 +26,6 @@ #include #include -#if !defined(__ACCESSIBILITY_APPLICATION_COMPILATION) && defined(__ORBIT_IDL__) -%{ -#pragma include_defs Application.h -%} -#pragma inhibit push -#endif - -#pragma inhibit push -#include "Accessible.idl" -#pragma inhibit pop - module Accessibility { interface Application : Accessible { @@ -83,8 +72,4 @@ module Accessibility { }; }; -#if !defined(__ACCESSIBILITY_APPLICATION_COMPILATION) && defined(__ORBIT_IDL__) -#pragma inhibit pop -#endif - #endif diff --git a/idl/Desktop.idl b/idl/Desktop.idl index 5d63fa2..635fee5 100644 --- a/idl/Desktop.idl +++ b/idl/Desktop.idl @@ -26,17 +26,6 @@ #include #include -#if !defined(__ACCESSIBILITY_DESKTOP_COMPILATION) && defined(__ORBIT_IDL__) -%{ -#pragma include_defs Desktop.h -%} -#pragma inhibit push -#endif - -#pragma inhibit push -#include "Accessible.idl" -#pragma inhibit pop - module Accessibility { interface Desktop : Accessible { /** @@ -46,8 +35,4 @@ module Accessibility { }; }; -#if !defined(__ACCESSIBILITY_DESKTOP_COMPILATION) && defined(__ORBIT_IDL__) -#pragma inhibit pop -#endif - #endif diff --git a/idl/Event.idl b/idl/Event.idl index 3d32618..1d9a2ea 100644 --- a/idl/Event.idl +++ b/idl/Event.idl @@ -25,18 +25,6 @@ #include -#if !defined(__ACCESSIBILITY_EVENT_COMPILATION) && defined(__ORBIT_IDL__) -%{ -#pragma include_defs Accessible.h -#pragma include_defs Event.h -%} -#pragma inhibit push -#endif - -#pragma inhibit push -#include "Accessible.idl" -#pragma inhibit pop - module Accessibility { interface Accessible; @@ -54,8 +42,4 @@ module Accessibility }; -#if !defined(__ACCESSIBILITY_EVENT_COMPILATION) && defined(__ORBIT_IDL__) -#pragma inhibit pop -#endif - #endif diff --git a/idl/Registry.idl b/idl/Registry.idl index 0a2f74c..e2b4a87 100644 --- a/idl/Registry.idl +++ b/idl/Registry.idl @@ -25,6 +25,9 @@ #include #include +#ifndef _ACCESSIBILITY_REGISTRY_IDL_ +#define _ACCESSIBILITY_REGISTRY_IDL_ + module Accessibility { typedef sequence DesktopSeq; @@ -198,3 +201,5 @@ module Accessibility { void generateMouseEvent (in long x, in long y, in string eventName); }; }; + +#endif diff --git a/idl/Relation.idl b/idl/Relation.idl index 018c6b5..d1a526b 100644 --- a/idl/Relation.idl +++ b/idl/Relation.idl @@ -23,13 +23,6 @@ #ifndef _ACCESSIBILITY_RELATION_IDL #define _ACCESSIBILITY_RELATION_IDL -#if !defined(__ACCESSIBILITY_RELATION_COMPILATION) && defined(__ORBIT_IDL__) -%{ -#pragma include_defs Relation.h -%} -#pragma inhibit push -#endif - module Accessibility { enum RelationType { @@ -41,9 +34,7 @@ module Accessibility { }; /* - * * This interface inherits from a base class implementing ref counts. - * */ interface Relation { @@ -52,8 +43,4 @@ module Accessibility { }; }; -#if !defined(__ACCESSIBILITY_RELATION_COMPILATION) && defined(__ORBIT_IDL__) -#pragma inhibit pop -#endif - #endif diff --git a/idl/Role.idl b/idl/Role.idl index 9b2b6c7..8977c2c 100644 --- a/idl/Role.idl +++ b/idl/Role.idl @@ -21,14 +21,7 @@ */ #ifndef _ACCESSIBILITY_ROLE_IDL -#define _ACCESSIBILITY_ROLE_IDL - -#if !defined(__ACCESSIBILITY_ROLE_COMPILATION) && defined(__ORBIT_IDL__) -%{ -#pragma include_defs Role.h -%} -#pragma inhibit push -#endif +#define _ACCESSIBILITY_ROLE_IDL module Accessibility { @@ -211,8 +204,5 @@ module Accessibility { ROLE_LAST_DEFINED }; }; -#if !defined(__ACCESSIBILITY_ROLE_COMPILATION) && defined(__ORBIT_IDL__) -#pragma inhibit pop -#endif #endif diff --git a/idl/State.idl b/idl/State.idl index ab45ede..5ec266c 100644 --- a/idl/State.idl +++ b/idl/State.idl @@ -23,13 +23,6 @@ #ifndef _ACCESSIBILITY_STATE_IDL #define _ACCESSIBILITY_STATE_IDL -#if !defined(__ACCESSIBILITY_STATE_COMPILATION) && defined(__ORBIT_IDL__) -%{ -#pragma include_defs State.h -%} -#pragma inhibit push -#endif - module Accessibility { enum StateType { @@ -119,7 +112,5 @@ module Accessibility { boolean isEmpty (); }; }; -#if !defined(__ACCESSIBILITY_STATE_COMPILATION) && defined(__ORBIT_IDL__) -#pragma inhibit pop -#endif + #endif diff --git a/libspi/Makefile.am b/libspi/Makefile.am index f6a626a..da5a186 100644 --- a/libspi/Makefile.am +++ b/libspi/Makefile.am @@ -20,32 +20,23 @@ libspiinclude_HEADERS = accessible.h \ desktop.h \ listener.h \ registry.h \ - Accessible.h \ - Application.h \ - Desktop.h \ - Event.h \ - Registry.h \ - Relation.h \ - Role.h \ - State.h + Accessibility.h -Accessible_IDLOUT = Accessible.h Accessible-stubs.c Accessible-skels.c Accessible-common.c -Application_IDLOUT = Application.h Application-stubs.c Application-skels.c Application-common.c -Desktop_IDLOUT = Desktop.h Desktop-stubs.c Desktop-skels.c Desktop-common.c -Event_IDLOUT = Event.h Event-stubs.c Event-skels.c Event-common.c -Registry_IDLOUT = Registry.h Registry-stubs.c Registry-skels.c Registry-common.c -Relation_IDLOUT = Relation.h Relation-stubs.c Relation-skels.c Relation-common.c -Role_IDLOUT = Role.h Role-stubs.c Role-skels.c Role-common.c -State_IDLOUT = State.h State-stubs.c State-skels.c State-common.c +IDL_OUT = Accessibility.h Accessibility-stubs.c Accessibility-skels.c Accessibility-common.c -BUILT_SOURCES = $(Accessible_IDLOUT) \ - $(Application_IDLOUT) \ - $(Desktop_IDLOUT) \ - $(Event_IDLOUT) \ - $(Registry_IDLOUT) \ - $(Relation_IDLOUT) \ - $(Role_IDLOUT) \ - $(State_IDLOUT) +IDL = \ + $(top_srcdir)/idl/Accessibility.idl \ + $(top_srcdir)/idl/Accessible.idl \ + $(top_srcdir)/idl/Application.idl \ + $(top_srcdir)/idl/Desktop.idl \ + $(top_srcdir)/idl/Event.idl \ + $(top_srcdir)/idl/Registry.idl \ + $(top_srcdir)/idl/Relation.idl \ + $(top_srcdir)/idl/Role.idl \ + $(top_srcdir)/idl/State.idl + +BUILT_SOURCES = $(IDL_OUT) +CLEANFILES+=$(IDL_OUT) libspi_la_SOURCES = accessible.c \ accessible.h \ @@ -59,30 +50,20 @@ libspi_la_SOURCES = accessible.c \ listener.h \ registry.c \ registry.h \ - $(BUILT_SOURCES) - -IDLFLAGS = -I$(OAF_IDL_DIR) -I$(LIBBONOBO_IDL_DIR) -I$(top_srcdir)/idl --noimodule - -$(Accessible_IDLOUT): $(top_srcdir)/idl/Accessible.idl $(ORBIT_IDL) - $(ORBIT_IDL) -D__ACCESSIBILITY_ACCESSIBLE_COMPILATION $(IDLFLAGS) $(top_srcdir)/idl/Accessible.idl - -$(Application_IDLOUT): $(top_srcdir)/idl/Application.idl $(ORBIT_IDL) - $(ORBIT_IDL) -D__ACCESSIBILITY_APPLICATION_COMPILATION $(IDLFLAGS) $(top_srcdir)/idl/Application.idl - -$(Desktop_IDLOUT): $(top_srcdir)/idl/Desktop.idl $(ORBIT_IDL) - $(ORBIT_IDL) -D__ACCESSIBILITY_DESKTOP_COMPILATION $(IDLFLAGS) $(top_srcdir)/idl/Desktop.idl + $(IDL_OUT) -$(Event_IDLOUT): $(top_srcdir)/idl/Event.idl $(ORBIT_IDL) - $(ORBIT_IDL) -D__ACCESSIBILITY_EVENT_COMPILATION $(IDLFLAGS) $(top_srcdir)/idl/Event.idl +IDLFLAGS = -I$(OAF_IDL_DIR) -I$(LIBBONOBO_IDL_DIR) -I$(top_srcdir)/idl -$(Registry_IDLOUT): $(top_srcdir)/idl/Registry.idl $(ORBIT_IDL) - $(ORBIT_IDL) -D__ACCESSIBILITY_REGISTRY_COMPILATION $(IDLFLAGS) $(top_srcdir)/idl/Registry.idl +$(IDL_OUT) : $(IDL) $(ORBIT_IDL) + $(ORBIT_IDL) -D__ACCESSIBILITY_COMPILATION__ $(IDLFLAGS) $(top_srcdir)/idl/Accessibility.idl -$(Relation_IDLOUT): $(top_srcdir)/idl/Relation.idl $(ORBIT_IDL) - $(ORBIT_IDL) -D__ACCESSIBILITY_RELATION_COMPILATION $(IDLFLAGS) $(top_srcdir)/idl/Relation.idl +Accessibility-imodule.c : $(IDL) $(ORBIT_IDL) + $(ORBIT_IDL) -D__ACCESSIBILITY_COMPILATION__ $(IDLFLAGS) --imodule $(top_srcdir)/idl/Accessibility.idl -$(Role_IDLOUT): $(top_srcdir)/idl/Role.idl $(ORBIT_IDL) - $(ORBIT_IDL) -D__ACCESSIBILITY_ROLE_COMPILATION $(IDLFLAGS) $(top_srcdir)/idl/Role.idl +orbittypelibdir = $(libdir)/orbit +orbittypelib_LTLIBRARIES = Accessibility_module.la -$(State_IDLOUT): $(top_srcdir)/idl/State.idl $(ORBIT_IDL) - $(ORBIT_IDL) -D__ACCESSIBILITY_STATE_COMPILATION $(IDLFLAGS) $(top_srcdir)/idl/State.idl +Accessibility_module_la_LDFLAGS = \ + -export-dynamic -module +Accessibility_module_la_SOURCES = \ + Accessibility-imodule.c diff --git a/libspi/accessible.c b/libspi/accessible.c index eff6d8a..7d6c2c5 100644 --- a/libspi/accessible.c +++ b/libspi/accessible.c @@ -32,7 +32,7 @@ /* * This pulls the CORBA definitions for the "Accessibility::Accessible" server */ -#include "Accessible.h" +#include /* * This pulls the definition for the BonoboObject (Gtk Type) diff --git a/libspi/accessible.h b/libspi/accessible.h index 0d6149e..70742d8 100644 --- a/libspi/accessible.h +++ b/libspi/accessible.h @@ -27,7 +27,7 @@ extern "C" { #include #include -#include +#include #define ACCESSIBLE_TYPE (accessible_get_type ()) #define ACCESSIBLE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), ACCESSIBLE_TYPE, Accessible)) diff --git a/libspi/application.c b/libspi/application.c index 65b4102..2a2f4a2 100644 --- a/libspi/application.c +++ b/libspi/application.c @@ -31,7 +31,7 @@ /* * This pulls the CORBA definitions for the "Accessibility::Accessible" server */ -#include "Desktop.h" +#include /* * This pulls the definition for the BonoboObject (GObject Type) diff --git a/libspi/application.h b/libspi/application.h index 04b747e..c4a9de2 100644 --- a/libspi/application.h +++ b/libspi/application.h @@ -30,7 +30,7 @@ extern "C" { #include #include #include -#include +#include #define APPLICATION_TYPE (application_get_type ()) #define APPLICATION(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), APPLICATION_TYPE, Application)) diff --git a/libspi/atksimpleobject.c b/libspi/atksimpleobject.c index b73334c..66a1fc1 100644 --- a/libspi/atksimpleobject.c +++ b/libspi/atksimpleobject.c @@ -20,6 +20,7 @@ * Boston, MA 02111-1307, USA. */ +#include #include "atksimpleobject.h" static void atk_simple_object_class_init (AtkSimpleObjectClass *klass); diff --git a/libspi/desktop.c b/libspi/desktop.c index b359c05..a67ca65 100644 --- a/libspi/desktop.c +++ b/libspi/desktop.c @@ -33,7 +33,7 @@ /* * This pulls the CORBA definitions for the "Accessibility::Accessible" server */ -#include "Desktop.h" +#include /* * This pulls the definition for the BonoboObject (Gtk Type) diff --git a/libspi/desktop.h b/libspi/desktop.h index bdbd978..a0d3680 100644 --- a/libspi/desktop.h +++ b/libspi/desktop.h @@ -32,7 +32,7 @@ extern "C" { #include #include #include -#include +#include #define DESKTOP_TYPE (desktop_get_type ()) #define DESKTOP(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), DESKTOP_TYPE, Desktop)) diff --git a/libspi/listener.c b/libspi/listener.c index d700aeb..5b708a4 100644 --- a/libspi/listener.c +++ b/libspi/listener.c @@ -31,7 +31,7 @@ #include #include -#include +#include /* * This pulls the definition for the BonoboObject (GType) diff --git a/libspi/listener.h b/libspi/listener.h index e8bc181..d74f221 100644 --- a/libspi/listener.h +++ b/libspi/listener.h @@ -29,7 +29,7 @@ extern "C" { #include #include -#include +#include #define LISTENER_TYPE (listener_get_type ()) #define LISTENER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), LISTENER_TYPE, Listener)) diff --git a/libspi/registry.c b/libspi/registry.c index 6063ce2..506843d 100644 --- a/libspi/registry.c +++ b/libspi/registry.c @@ -34,7 +34,7 @@ /* * This pulls the CORBA definitions for the "Accessibility::Registry" server */ -#include "Registry.h" +#include /* * This pulls the definition for the BonoboObject (GType) diff --git a/libspi/registry.h b/libspi/registry.h index 8876a8a..4b8c990 100644 --- a/libspi/registry.h +++ b/libspi/registry.h @@ -27,7 +27,7 @@ extern "C" { #endif /* __cplusplus */ -#include +#include #include "listener.h" #include "desktop.h" diff --git a/po/Makefile.in.in b/po/Makefile.in.in deleted file mode 100644 index 0636f0c..0000000 --- a/po/Makefile.in.in +++ /dev/null @@ -1,210 +0,0 @@ -# Makefile for program source directory in GNU NLS utilities package. -# Copyright (C) 1995-1997, 2000, 2001 by Ulrich Drepper -# -# This file file be copied and used freely without restrictions. It can -# be used in projects which are not available under the GNU Public License -# but which still want to provide support for the GNU gettext functionality. -# Please note that the actual code is *not* freely available. - -PACKAGE = @PACKAGE@ -VERSION = @VERSION@ - -# These two variables depend on the location of this directory. -subdir = po -top_builddir = .. - -SHELL = /bin/sh -@SET_MAKE@ - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ - -prefix = @prefix@ -exec_prefix = @exec_prefix@ -datadir = @datadir@ -localedir = $(datadir)/locale -gettextsrcdir = $(datadir)/gettext/po - -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -MKINSTALLDIRS = @MKINSTALLDIRS@ -mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac` - -CC = @CC@ -GMSGFMT = @GMSGFMT@ -MSGFMT = @MSGFMT@ -XGETTEXT = @XGETTEXT@ -XML_I18N_UPDATE = @XML_I18N_UPDATE@ -XML_I18N_EXTRACT = @XML_I18N_EXTRACT@ - -MSGMERGE = XML_I18N_EXTRACT=$(XML_I18N_EXTRACT) $(XML_I18N_UPDATE) --dist -GENPOT = XML_I18N_EXTRACT=$(XML_I18N_EXTRACT) $(XML_I18N_UPDATE) --pot - - -DEFS = @DEFS@ -CFLAGS = @CFLAGS@ -CPPFLAGS = @CPPFLAGS@ - -INCLUDES = -I.. -I$(top_srcdir)/intl - -COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) - -POFILES = @POFILES@ -GMOFILES = @GMOFILES@ -DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(PACKAGE).pot \ -$(POFILES) $(GMOFILES) - -POTFILES = \ - -CATALOGS = @CATALOGS@ - -.SUFFIXES: -.SUFFIXES: .c .o .po .pox .gmo .mo - -.c.o: - $(COMPILE) $< - -.po.pox: - $(MAKE) $(PACKAGE).pot - $(MSGMERGE) $< $(srcdir)/$(PACKAGE).pot -o $*.pox - -.po.mo: - $(MSGFMT) -o $@ $< - -.po.gmo: - file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \ - && rm -f $$file && $(GMSGFMT) --statistics -o $$file $< - - -all: all-@USE_NLS@ - -all-yes: $(CATALOGS) -all-no: - -# Note: Target 'all' must not depend on target '$(srcdir)/$(PACKAGE).pot', -# otherwise packages like GCC can not be built if only parts of the source -# have been downloaded. - -$(srcdir)/$(PACKAGE).pot: $(POTFILES) $(srcdir)/POTFILES.in - $(GENPOT) - - -install: install-exec install-data -install-exec: -install-data: install-data-@USE_NLS@ - if test "$(PACKAGE)" = "gettext"; then \ - $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \ - $(INSTALL_DATA) $(srcdir)/Makefile.in.in \ - $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \ - else \ - : ; \ - fi -install-data-no: all -install-data-yes: all - $(mkinstalldirs) $(DESTDIR)$(datadir) - @catalogs='$(CATALOGS)'; \ - for cat in $$catalogs; do \ - cat=`basename $$cat`; \ - lang=`echo $$cat | sed 's/\.gmo$$//'`; \ - dir=$(localedir)/$$lang/LC_MESSAGES; \ - $(mkinstalldirs) $(DESTDIR)$$dir; \ - if test -r $$cat; then \ - $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \ - echo "installing $$cat as $(DESTDIR)$$dir/$(PACKAGE).mo"; \ - else \ - $(INSTALL_DATA) $(srcdir)/$$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \ - echo "installing $(srcdir)/$$cat as" \ - "$(DESTDIR)$$dir/$(PACKAGE).mo"; \ - fi; \ - done - -# Define this as empty until I found a useful application. -installcheck: - -uninstall: - catalogs='$(CATALOGS)'; \ - for cat in $$catalogs; do \ - cat=`basename $$cat`; \ - lang=`echo $$cat | sed 's/\.gmo$$//'`; \ - rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE).mo; \ - done - if test "$(PACKAGE)" = "gettext"; then \ - rm -f $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \ - else \ - : ; \ - fi - -check: all - -dvi info tags TAGS ID: - -mostlyclean: - rm -f core core.* *.pox $(PACKAGE).po *.new.po - rm -fr *.o - -clean: mostlyclean - -distclean: clean - rm -f Makefile Makefile.in POTFILES *.mo - -maintainer-clean: distclean - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." - rm -f $(GMOFILES) - -distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) -dist distdir: - $(MAKE) update-po - @$(MAKE) dist2 -# This is a separate target because 'update-po' must be executed before. -dist2: $(DISTFILES) - dists="$(DISTFILES)"; \ - for file in $$dists; do \ - if test -f $$file; then dir=.; else dir=$(srcdir); fi; \ - cp -p $$dir/$$file $(distdir); \ - done - -update-po: Makefile - $(MAKE) $(PACKAGE).pot - if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; fi; \ - cd $(srcdir); \ - catalogs='$(GMOFILES)'; \ - for cat in $$catalogs; do \ - cat=`basename $$cat`; \ - lang=`echo $$cat | sed 's/\.gmo$$//'`; \ - cp $$lang.po $$lang.old.po; \ - echo "$$lang:"; \ - if $(MSGMERGE) $$lang ; then \ - rm -f $$lang.old.po; \ - else \ - echo "msgmerge for $$cat failed!"; \ - mv $$lang.old.po $$lang.po; \ - fi; \ - done - $(MAKE) update-gmo - -.po: Makefile - $(MAKE) $(PACKAGE).pot; - PATH=`pwd`/../src:$$PATH; \ - echo; printf "$*: "; \ - if $(MSGMERGE) $*; then \ - rm -f $*.old.po; \ - else \ - echo "msgmerge for * failed!"; \ - mv $*.old.po $*.po; \ - fi; \ - msgfmt --statistics $*.po; echo; - - -update-gmo: Makefile $(GMOFILES) - @: - -Makefile: Makefile.in.in $(top_builddir)/config.status POTFILES.in - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \ - $(SHELL) ./config.status - -# Tell versions [3.59,3.63) of GNU make not to export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/registryd/Makefile.am b/registryd/Makefile.am index 800f35f..19017a2 100644 --- a/registryd/Makefile.am +++ b/registryd/Makefile.am @@ -6,7 +6,7 @@ INCLUDES = -I$(top_srcdir) \ -I$(top_srcdir)/libspi \ $(REGISTRYD_CFLAGS) -at_registryd_SOURCES = registryd.c +registryd_SOURCES = registryd.c LDADD = ../libspi/libspi.la $(REGISTRYD_LIBS) diff --git a/registryd/desktop.c b/registryd/desktop.c index b359c05..a67ca65 100644 --- a/registryd/desktop.c +++ b/registryd/desktop.c @@ -33,7 +33,7 @@ /* * This pulls the CORBA definitions for the "Accessibility::Accessible" server */ -#include "Desktop.h" +#include /* * This pulls the definition for the BonoboObject (Gtk Type) diff --git a/registryd/desktop.h b/registryd/desktop.h index bdbd978..a0d3680 100644 --- a/registryd/desktop.h +++ b/registryd/desktop.h @@ -32,7 +32,7 @@ extern "C" { #include #include #include -#include +#include #define DESKTOP_TYPE (desktop_get_type ()) #define DESKTOP(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), DESKTOP_TYPE, Desktop)) diff --git a/registryd/registry.c b/registryd/registry.c index 6063ce2..506843d 100644 --- a/registryd/registry.c +++ b/registryd/registry.c @@ -34,7 +34,7 @@ /* * This pulls the CORBA definitions for the "Accessibility::Registry" server */ -#include "Registry.h" +#include /* * This pulls the definition for the BonoboObject (GType) diff --git a/registryd/registry.h b/registryd/registry.h index 8876a8a..4b8c990 100644 --- a/registryd/registry.h +++ b/registryd/registry.h @@ -27,7 +27,7 @@ extern "C" { #endif /* __cplusplus */ -#include +#include #include "listener.h" #include "desktop.h" diff --git a/test/app.c b/test/app.c index d99498c..9092841 100644 --- a/test/app.c +++ b/test/app.c @@ -24,8 +24,7 @@ #include #include #include -#include "Registry.h" -#include "Event.h" +#include #include "accessible.h" #include "atksimpleobject.h" #include "application.h" diff --git a/test/at.c b/test/at.c index a5fbe90..53ff0cf 100644 --- a/test/at.c +++ b/test/at.c @@ -23,8 +23,7 @@ #include #include #include -#include "Registry.h" -#include "Event.h" +#include #include "accessible.h" #include "listener.h" #include "desktop.h" -- 2.7.4