[g-a-devel]gnome-mag final patch ...
- From: Michael Meeks <michael ximian com>
- To: Bill Haneman <bill haneman sun com>
- Cc: accessibility mailing list <gnome-accessibility-devel gnome org>
- Subject: [g-a-devel]gnome-mag final patch ...
- Date: 15 Aug 2002 17:16:00 +0100
Hi Bill,
Here's what I committed, it doesn't fix the .pc file to refer to the
installed generated stubs and skels, since I don't know if that's a good
idea - my gnopernicus patch just uses the IDL directly. Oh, and we don't
install the headers anyway currently - just build the libgnome-mag
library [ interesting ].
HTH,
Michael.
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gnome-mag/ChangeLog,v
retrieving revision 1.7
diff -u -p -u -r1.7 ChangeLog
--- ChangeLog 15 Aug 2002 13:34:56 -0000 1.7
+++ ChangeLog 15 Aug 2002 16:17:56 -0000
@@ -1,5 +1,18 @@
2002-08-15 Michael Meeks <michael ximian com>
+ * magnifier/Makefile.am: rename server file.
+ move stuff into libexec, process twice.
+
+ * magnifier/Magnifier.server.in.in: namespace it, update to
+ libexec.
+
+ * idl/Magnifier.idl: include Bonobo_Unknown only.
+ Also, this file needs renaming to Accessibility_Magnifier
+
+ * idl/GNOME_Magnifier.idl: and rename to this / re-namespace.
+
+2002-08-15 Michael Meeks <michael ximian com>
+
* gnome-mag-1.0.pc.in (idldir): get it right.
2002-08-13 Michael Meeks <michael ximian com>
Index: gnome-mag-1.0.pc.in
===================================================================
RCS file: /cvs/gnome/gnome-mag/gnome-mag-1.0.pc.in,v
retrieving revision 1.2
diff -u -p -u -r1.2 gnome-mag-1.0.pc.in
--- gnome-mag-1.0.pc.in 15 Aug 2002 13:34:57 -0000 1.2
+++ gnome-mag-1.0.pc.in 15 Aug 2002 16:17:56 -0000
@@ -4,9 +4,9 @@ libdir= libdir@
includedir= includedir@
idldir= datadir@/idl/gnome-mag-1.0
-Name: libspi
-Description: Accessibility Technology software library
-Requires: libbonobo-2.0 atk gtk+-2.0
+Name: gnome-mag
+Description: Gnome Screen Magnifier
+Requires: libbonobo-2.0 gtk+-2.0
Version: @VERSION@
Libs: -L${libdir} -lspi
-Cflags: -I${includedir}/at-spi-1.0
+Cflags: -I${includedir}/gnome-mag-1.0
Index: idl/GNOME_Magnifier.idl
===================================================================
RCS file: /cvs/gnome/gnome-mag/idl/GNOME_Magnifier.idl,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 GNOME_Magnifier.idl
--- idl/GNOME_Magnifier.idl 9 May 2002 13:12:55 -0000 1.1.1.1
+++ idl/GNOME_Magnifier.idl 15 Aug 2002 16:17:56 -0000
@@ -20,12 +20,12 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef _ACCESSIBILITY_MAGNIFIER_IDL
-#define _ACCESSIBILITY_MAGNIFIER_IDL
+#ifndef _GNOME_MAGNIFIER_IDL
+#define _GNOME_MAGNIFIER_IDL
-#include <Bonobo.idl>
+#include <Bonobo_Unknown.idl>
-module Accessibility {
+module GNOME {
interface Magnifier : Bonobo::Unknown {
Index: idl/Magnifier.idl
===================================================================
RCS file: idl/Magnifier.idl
diff -N idl/Magnifier.idl
--- idl/Magnifier.idl 9 May 2002 13:12:55 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,154 +0,0 @@
-/*
- * AT-SPI - Assistive Technology Service Provider Interface
- * (Gnome Accessibility Project; http://developer.gnome.org/projects/gap)
- *
- * Copyright 2001 Sun Microsystems 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_MAGNIFIER_IDL
-#define _ACCESSIBILITY_MAGNIFIER_IDL
-
-#include <Bonobo.idl>
-
-module Accessibility {
-
- interface Magnifier : Bonobo::Unknown {
-
- /**
- * void setMagFactor: sets the current x and y magnification ratio.
- * @zoom_region: the index of the affected zoom region.
- * @magX: the magnification factor in the x direction for the specified region.
- * @magY: the magnification factor in the x direction for the specified region.
- **/
- oneway void setMagFactor (in short zoom_region, in float magX, in float magY);
-
- /**
- * #attribute SourceDisplay: a @string containing the X display name
- * containing the region to be magnified.
- **/
- attribute string SourceDisplay;
-
- /**
- * #attribute TargetDisplay: a @string containing the X display name
- * where the magnifier pixels are to be displayed.
- **/
- attribute string TargetDisplay;
-
- /**
- * oneway void setROI:
- * Sets the region of interest for the magnifier.
- * @zoom_region: the index of the affected zoom region.
- * @x1: the minimum X coordinate of the ROI bounding box
- * @x2: the maximum X coordinate of the ROI bounding box
- * @y1: the minimum Y coordinate of the ROI bounding box
- * @y2: the maximum Y coordinate of the ROI bounding box
- **/
- oneway void setROI (in short zoom_region,
- in long x1, in long y1, in long x2, in long y2);
-
- /**
- * oneway void setROI:
- * Sets the region of interest for the zoom region.
- * If the zoom region was previously 'unmanaged', this associates
- * it with the ROI.
- * @zoom_region: the index of the affected zoom region.
- * @x1: the minimum X coordinate of the ROI bounding box
- * @x2: the maximum X coordinate of the ROI bounding box
- * @y1: the minimum Y coordinate of the ROI bounding box
- * @y2: the maximum Y coordinate of the ROI bounding box
- **/
- oneway void markDirty (in short zoom_region,
- in long x1, in long y1, in long x2, in long y2);
-
- /**
- * oneway void markUnmanaged:
- * Mark a zoom region as 'unmanaged', meaning that it should not
- * attempt to get pixels from the source display but will have its
- * pixels drawn by a client.
- * @zoom_region: the index of the affected zoom region.
- **/
- oneway void markUnmanaged (in short zoom_region);
-
- /**
- * short createZoomRegion:
- * Creates a new zoom region for the magnifier.
- * The new region is initially unmanaged'.
- * @zx: the scale factor in the x direction for the new zoom region
- * @zy: the scale factor in the y direction for the new zoom region
- * @x1: the minimum X coordinate of the zoomed area bounding box
- * @x2: the maximum X coordinate of the zoomed area bounding box
- * @y1: the minimum Y coordinate of the zoomed area bounding box
- * @y2: the maximum Y coordinate of the zoomed area bounding box
- **/
- short createZoomRegion (in float zx, in float zy,
- in long x1, in long y1,
- in long x2, in long y2);
-
- /**
- * boolean getZoomRegionParams:
- * Queries a specific zoom region for its parameters.
- * returns: FALSE if the specified zoom region does not exist.
- * @zoom_region: the index specifying which zoom region to query.
- * @zx: the scale factor in the x direction for the new zoom region
- * @zy: the scale factor in the y direction for the new zoom region
- * @x1: the minimum X coordinate of the zoomed area bounding box
- * @x2: the maximum X coordinate of the zoomed area bounding box
- * @y1: the minimum Y coordinate of the zoomed area bounding box
- * @y2: the maximum Y coordinate of the zoomed area bounding box
- **/
- boolean getZoomRegionParams (in short zoom_region,
- out float zx, out float zy,
- out long x1, out long y1,
- out long x2, out long y2);
-
- /**
- * void resizeZoomRegion:
- * Resizes the specified zoom region on the target display.
- * @zoom_region: the index of the affected zoom region.
- * @x1: the minimum X coordinate of the zoomed area bounding box
- * @x2: the maximum X coordinate of the zoomed area bounding box
- * @y1: the minimum Y coordinate of the zoomed area bounding box
- * @y2: the maximum Y coordinate of the zoomed area bounding box
- **/
- oneway void resizeZoomRegion (in short zoom_region,
- in long x1, in long y1,
- in long x2, in long y2);
-
- /**
- * void destroyZoomRegion:
- * Remove the specified zoom region from the magnifier.
- **/
- oneway void destroyZoomRegion (in short zoom_region);
-
- /**
- * void clearAllZoomRegions:
- * Clears and destroys all currently defined zoom regions.
- **/
- void clearAllZoomRegions ();
-
- /**
- * void exit:
- * Unmap the current magnifier from the display.
- **/
- void exit ();
-
- };
-};
-
-#endif
-
Index: idl/Makefile.am
===================================================================
RCS file: /cvs/gnome/gnome-mag/idl/Makefile.am,v
retrieving revision 1.2
diff -u -p -u -r1.2 Makefile.am
--- idl/Makefile.am 15 Aug 2002 13:34:58 -0000 1.2
+++ idl/Makefile.am 15 Aug 2002 16:17:56 -0000
@@ -1,5 +1,5 @@
idldir = $(datadir)/idl/gnome-mag-1.0
-idl_DATA = Magnifier.idl
+idl_DATA = GNOME_Magnifier.idl
EXTRA_DIST=$(idl_DATA)
Index: magnifier/GNOME_Magnifier.server.in
===================================================================
RCS file: magnifier/GNOME_Magnifier.server.in
diff -N magnifier/GNOME_Magnifier.server.in
--- magnifier/GNOME_Magnifier.server.in 9 May 2002 13:12:56 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,10 +0,0 @@
-<oaf_info>
- <oaf_server iid="OAFIID:Accessibility_Util_Magnifier:proto0.1"
- type="exe" location="magnifier -vz 2">
- <oaf_attribute name="repo_ids" type="stringv">
- <item value="IDL:Accessibility/Magnifier:1.0"/>
- </oaf_attribute>
- <oaf_attribute name="name" type="string" value="Magnifier"/>
- <oaf_attribute name="description" type="string" value="Simple Screen Magnification Service"/>
- </oaf_server>
-</oaf_info>
Index: magnifier/GNOME_Magnifier.server.in.in
===================================================================
RCS file: /cvs/gnome/gnome-mag/magnifier/GNOME_Magnifier.server.in.in,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 GNOME_Magnifier.server.in.in
--- magnifier/GNOME_Magnifier.server.in.in 9 May 2002 13:12:56 -0000 1.1.1.1
+++ magnifier/GNOME_Magnifier.server.in.in 15 Aug 2002 16:17:56 -0000
@@ -1,6 +1,6 @@
<oaf_info>
<oaf_server iid="OAFIID:Accessibility_Util_Magnifier:proto0.1"
- type="exe" location="magnifier -vz 2">
+ type="exe" location="@LIBEXECDIR@/magnifier -vz 2">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:Accessibility/Magnifier:1.0"/>
</oaf_attribute>
Index: magnifier/Magnifier.server.in
===================================================================
RCS file: magnifier/Magnifier.server.in
diff -N magnifier/Magnifier.server.in
--- magnifier/Magnifier.server.in 9 May 2002 13:12:56 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,10 +0,0 @@
-<oaf_info>
- <oaf_server iid="OAFIID:Accessibility_Util_Magnifier:proto0.1"
- type="exe" location="magnifier -vz 2">
- <oaf_attribute name="repo_ids" type="stringv">
- <item value="IDL:Accessibility/Magnifier:1.0"/>
- </oaf_attribute>
- <oaf_attribute name="name" type="string" value="Magnifier"/>
- <oaf_attribute name="description" type="string" value="Simple Screen Magnification Service"/>
- </oaf_server>
-</oaf_info>
Index: magnifier/Makefile.am
===================================================================
RCS file: /cvs/gnome/gnome-mag/magnifier/Makefile.am,v
retrieving revision 1.2
diff -u -p -u -r1.2 Makefile.am
--- magnifier/Makefile.am 26 Jul 2002 15:50:50 -0000 1.2
+++ magnifier/Makefile.am 15 Aug 2002 16:17:56 -0000
@@ -2,22 +2,22 @@ NULL =
lib_LTLIBRARIES = libgnome-mag.la
-bin_PROGRAMS = magnifier
+libexec_PROGRAMS = magnifier
libgnome_mag_la_SOURCES = \
- Magnifier-common.c \
- Magnifier-stubs.c
+ GNOME_Magnifier-common.c \
+ GNOME_Magnifier-stubs.c
libgnome_mag_la_DEPENDENCIES = \
- Magnifier.h
+ GNOME_Magnifier.h
magnifier_SOURCES = magnifier.c \
mag_image.c \
mag_image.h \
magnifier.h \
- Magnifier.h \
- Magnifier-skels.c \
- Magnifier-common.c
+ GNOME_Magnifier.h \
+ GNOME_Magnifier-skels.c \
+ GNOME_Magnifier-common.c
INCLUDES = \
$(DEPS_CFLAGS) \
@@ -27,14 +27,14 @@ INCLUDES = \
CFLAGS += $(DEPS_CFLAGS)
-IDL_OUT = Magnifier.h Magnifier-skels.c Magnifier-stubs.c Magnifier-common.c
+IDL_OUT = GNOME_Magnifier.h GNOME_Magnifier-skels.c GNOME_Magnifier-stubs.c GNOME_Magnifier-common.c
-IDL = $(top_srcdir)/idl/Magnifier.idl
+IDL = $(top_srcdir)/idl/GNOME_Magnifier.idl
BUILT_SOURCES = $(IDL_OUT)
CLEANFILES+=$(IDL_OUT)
-mag_control.c magnifier.h : Magnifier.h
+mag_control.c magnifier.h : GNOME_Magnifier.h
IDLFLAGS = -I$(BONOBO_ACTIVATION_IDL_DIR) \
-I$(LIBBONOBO_IDL_DIR) \
@@ -44,12 +44,15 @@ orbittypelibdir = $(libdir)/orbit
LDADD = $(DEPS_LIBS) $(X_LIBS) $(POPT_LIBS)
-serverinfodir = $(libdir)/bonobo/servers
-serverinfo_DATA = Magnifier.server
+server_in_files = GNOME_Magnifier.server.in.in
+serverdir = $(libdir)/bonobo/servers
+server_DATA = $(server_in_files:.server.in.in=.server)
+$(server_in_files:.server.in.in=.server.in): $(server_in_files)
+ sed -e "s|\ LIBEXECDIR\@|$(libexecdir)|" $< > $@
@INTLTOOL_SERVER_RULE@
-EXTRA_DIST = Magnifier.server.in $(serverinfo_DATA)
+EXTRA_DIST = GNOME_Magnifier.server.in $(server_in_files)
$(IDL_OUT) : $(IDL) $(ORBIT_IDL)
$(ORBIT_IDL) $(IDLFLAGS) $(IDL)
Index: magnifier/magnifier.c
===================================================================
RCS file: /cvs/gnome/gnome-mag/magnifier/magnifier.c,v
retrieving revision 1.7
diff -u -p -u -r1.7 magnifier.c
--- magnifier/magnifier.c 30 Jun 2002 21:36:37 -0000 1.7
+++ magnifier/magnifier.c 15 Aug 2002 16:17:57 -0000
@@ -614,7 +614,7 @@ static void
magnifier_class_init (MagnifierClass *klass)
{
GObjectClass * object_class = (GObjectClass *) klass;
- POA_Accessibility_Magnifier__epv *epv = &klass->epv;
+ POA_GNOME_Magnifier__epv *epv = &klass->epv;
/*
object_class->finalize = magnifier_finalize;
*/
@@ -673,7 +673,7 @@ magnifier_get_type (void)
*/
type = bonobo_type_unique (
PARENT_TYPE,
- POA_Accessibility_Magnifier__init,
+ POA_GNOME_Magnifier__init,
NULL,
G_STRUCT_OFFSET (MagnifierClass, epv),
&tinfo,
Index: magnifier/magnifier.h
===================================================================
RCS file: /cvs/gnome/gnome-mag/magnifier/magnifier.h,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 magnifier.h
--- magnifier/magnifier.h 9 May 2002 13:12:56 -0000 1.1.1.1
+++ magnifier/magnifier.h 15 Aug 2002 16:17:57 -0000
@@ -29,7 +29,7 @@ extern "C" {
#endif /* __cplusplus */
#include <bonobo/bonobo-object.h>
-#include "Magnifier.h"
+#include "GNOME_Magnifier.h"
#include "mag_image.h" /* TODO: remove this include */
#define MAGNIFIER_TYPE (magnifier_get_type ())
@@ -45,11 +45,11 @@ typedef struct {
typedef struct {
BonoboObjectClass parent_class;
- POA_Accessibility_Magnifier__epv epv;
+ POA_GNOME_Magnifier__epv epv;
} MagnifierClass;
-GType magnifier_get_type (void);
-Magnifier *magnifier_new (int argc, char **argv);
+GType magnifier_get_type (void);
+Magnifier *magnifier_new (int argc, char **argv);
#ifdef __cplusplus
}
--
mmeeks gnu org <><, Pseudo Engineer, itinerant idiot
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
