[g-a-devel]gnopernicus bits ... & patch
- From: Michael Meeks <michael ximian com>
- To: Draghi Puterity <mp baum de>
- Cc: accessibility mailing list <gnome-accessibility-devel gnome org>
- Subject: [g-a-devel]gnopernicus bits ... & patch
- Date: 15 Aug 2002 18:22:29 +0100
Hi guys,
Just playing with gnopernicus, adding gnome-mag support -
since I imagine the idl building / autoconf bits can be quite tough to
get right. I attach the patch. With it the mag_conf thing throws up a
magnifier - how much works I don't know, but it's better than before.
You need HEAD gnome-mag to get anywhere though.
Also included a load of warning fixes. It seems no-one builds
gnopi '-Wall'. This is a really important thing to do, as many warnings
point to critical bugs. To do this you need to do:
export CFLAGS='-Wall -g'
./autogen # or configure
And then when it's built make clean and re-make, and you'll
see the warning spew. It's well worth having a warning free build. It
makes it easy for me to find bugs.
So; I also have some comments, and things I didn't fix.
Firstly, the code is covered in C++ style '//' comments, these
are not portable, and illegal ANSI C, gcc just happens to support
them.
Some stylistic points [ how could I escape them ;-] it's
generally regarded as bad style to use:
Type* var;
since this results in confusion:
Type* var, this_is_not_a_var_star;
Instead it's nicer for begginners to see:
Type *var;
Another minor nit; it's nice for methods to begin on the first
character of a line, so people can grep for method implementations
fast ( '^my_method' ) so:
int brl_ser_exit_glib_poll ()
becomes
int
brl_ser_exit_glib_poll ()
In braille/libbrl/baumbrl.c I'm warned about:
baumbrl.c:244: warning: zero-length format string
kcix += sprintf (&baumdd.KeyCodes[kcix], "");
What is this intended to do ?
Also this code fragment:
for(i = 0 ; i < g_slist_length(zoomer_id_list); i++)
{
mag = (Magnifier*) mag_config_load((gchar*)
g_slist_nth_data(zoomer_id_list,i));
zoomers_list = mag_add_magnifier_to_list(zoomers_list,mag);
mag = NULL;
}
is bad style; it has a high order, since g_slist_length and
n'th both walk the list extensively. Instead you want to bin the 'i'
and use a simple iteration like this:
GSList *l;
for (l = zoomer_id_list; l; l = l->next) {
char *name = l->data;
... fiddle with name ...
}
Notice also that there is no need to explicitely coerce a
(void *) in C.
There seems to be a mis-understanding of how C works in terms
of variable scoping:
void mag_free_slist(GSList *list)
{
g_slist_foreach(list,mag_free_node,NULL);
g_slist_free(list);
list = NULL;
}
Here 'list' is assigned to NULL at the end; I imagine hoping
that when a caller does:
mag_free_slist (my_list);
that 'my_list' will be NULL at the end; this is not the case.
Indeed the 'list=NULL' is a dead statement, that affects only the
local method stack, and will be optimized away.
Another good tip, is adding lots of
pre-conditions. ie. no-matter how much you think that a pointer will
be non-NULL when it's passed to you, at the top of the method do:
g_return_if_fail (magnifier != NULL);
it makes everything far easier to debug.
Anyway; my gnopernicus demo went well; thanks for the great
work - oh, and have you added a build sheriff notice to HACKING /
README yet ? it'd be great to snapshot gnopernicus.
So; may I commit ?
Regards,
Michael.
? gnopi/gnopi_files/Braille_Settings/Makefile.in
? gnopi/gnopi_files/General_Settings/Makefile
The way BTW to get rid of all these in a diff / update is to add a
.cvsignore file containing the file names; see other projects for good
templates.
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gnopernicus/ChangeLog,v
retrieving revision 1.37
diff -u -p -u -r1.37 ChangeLog
--- ChangeLog 8 Aug 2002 15:37:24 -0000 1.37
+++ ChangeLog 15 Aug 2002 17:22:27 -0000
@@ -1,3 +1,45 @@
+2002-08-15 Michael Meeks <michael ximian com>
+
+ * gnopi/magui.c (magnifier_setting_value_add_to_widgets):
+ nail segv.
+
+ * gnopi/magconf.c (mag_load_all): don't double free
+ various lists, tolerate odd results from gconf.
+
+ * srlow/libsrlow/SRObject.c (sro_get_accelerator):
+ initialize tmp3 before using it.
+
+ * srutil/SREvent.c: include spi.h
+
+ * magnifier/test/tester.c (main): correct sig,
+ return.
+
+ * braille/test/brlinp.c (brl_in_characters):
+ prune unintl'd bits.
+
+ * braille/libbrl/sercomm.c (brl_ser_start_timer):
+ upd to squash warning, C compiler pads with 0's.
+ (brl_ser_exit_glib_poll): return a random number.
+
+ * srconf/test/testlibsrconf.c (main): fix
+ a pointer silly.
+
+ * Makefile.am (SUBDIRS): add magnifier.
+
+ * magnifier/libmag/Makefile.am: build IDL,
+ don't distribute it, add deps etc.
+
+ * magnifier/libmag/mag_ctrl.h: upd.
+
+ * magnifier/libmag/mag_ctrl.c: renamespace to
+ GNOME_Magnifier.
+
+2002-08-13 Michael Meeks <michael ximian com>
+
+ * configure.in: re-enable libmag bits and add
+ gnome-mag-1.0 dependency - see 'gnome-mag'.
+ (GNOME_MAG_IDLDIR): export.
+
2002-08-08 Adi Dascal <ad baum ro>
* brlmon/braille_fonts:
Index: Makefile.am
===================================================================
RCS file: /cvs/gnome/gnopernicus/Makefile.am,v
retrieving revision 1.7
diff -u -p -u -r1.7 Makefile.am
--- Makefile.am 8 Aug 2002 15:37:24 -0000 1.7
+++ Makefile.am 15 Aug 2002 17:22:27 -0000
@@ -1,4 +1,4 @@
-SUBDIRS= srutil srconf braille speech srlow kbd_mouse srcore gnopi brlmon docs
+SUBDIRS= srutil srconf braille speech srlow kbd_mouse srcore magnifier gnopi brlmon docs
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = gnopernicus-1.0.pc
Index: configure.in
===================================================================
RCS file: /cvs/gnome/gnopernicus/configure.in,v
retrieving revision 1.21
diff -u -p -u -r1.21 configure.in
--- configure.in 8 Aug 2002 15:37:24 -0000 1.21
+++ configure.in 15 Aug 2002 17:22:28 -0000
@@ -181,14 +181,12 @@ dnl +-----------------------------------
dnl | magnifier |
dnl +-------------------------------------------------------------------------+
dnl Temporary (until the headers from libat-util will be installed)
-#PKG_CHECK_MODULES(LIBMAG, \
-# glib-2.0 >= $GLIB_REQUIRED \
-# libxml-2.0 >= $LIBXML_REQUIRED \
-# cspi-1.0 >= $CSPI_REQUIRED \
-# libbonobo-2.0 >= $BONOBO_REQUIRED \
-# libat-util-1.0 >= $AT_UTIL_REQUIRED)
-#AC_SUBST(LIBMAG_LIBS)
-#AC_SUBST(LIBMAG_CFLAGS)
+PKG_CHECK_MODULES(LIBMAG, \
+ libxml-2.0 >= $LIBXML_REQUIRED \
+ cspi-1.0 >= $CSPI_REQUIRED \
+ gnome-mag-1.0)
+AC_SUBST(LIBMAG_LIBS)
+AC_SUBST(LIBMAG_CFLAGS)
dnl +-------------------------------------------------------------------------+
dnl | speech |
@@ -329,6 +327,9 @@ kbd_mouse/Makefile
kbd_mouse/libke/Makefile
kbd_mouse/test/Makefile
docs/Makefile
+magnifier/Makefile
+magnifier/libmag/Makefile
+magnifier/test/Makefile
])
echo "gnopernicus setup:
Index: braille/libbrl/sercomm.c
===================================================================
RCS file: /cvs/gnome/gnopernicus/braille/libbrl/sercomm.c,v
retrieving revision 1.8
diff -u -p -u -r1.8 sercomm.c
--- braille/libbrl/sercomm.c 25 Apr 2002 15:36:27 -0000 1.8
+++ braille/libbrl/sercomm.c 15 Aug 2002 17:22:28 -0000
@@ -277,7 +277,7 @@ void brl_ser_sig_alarm ( int sig )
int brl_ser_start_timer (long Interval)
{
// struct sigaction sa = {brl_ser_sig_alarm, 0, 0, 0};
- struct sigaction sa = {brl_ser_sig_alarm, 0, 0, 0};
+ struct sigaction sa = {brl_ser_sig_alarm};
struct itimerval iv = {{0, 10000}, {0, 10000}}; // default 10 ms periodic
if (Interval)
@@ -358,6 +358,7 @@ int brl_ser_exit_glib_poll ()
{
glib_poll = FALSE;
if (gioch) g_io_channel_unref (gioch);
+ return 0; /* FIXME */
}
Index: braille/test/brlinp.c
===================================================================
RCS file: /cvs/gnome/gnopernicus/braille/test/brlinp.c,v
retrieving revision 1.3
diff -u -p -u -r1.3 brlinp.c
--- braille/test/brlinp.c 25 Apr 2002 15:37:51 -0000 1.3
+++ braille/test/brlinp.c 15 Aug 2002 17:22:28 -0000
@@ -155,10 +155,7 @@ void brl_in_characters (void *ctx, const
{
// char ts[128];
-
- int i;
gchar* tch;
- gchar** tokens;
tch = g_strndup(ch, len);
// tch = g_strstrip(tch);
Index: braille/test/remote.c
===================================================================
RCS file: /cvs/gnome/gnopernicus/braille/test/remote.c,v
retrieving revision 1.2
diff -u -p -u -r1.2 remote.c
--- braille/test/remote.c 15 Jul 2002 14:26:50 -0000 1.2
+++ braille/test/remote.c 15 Aug 2002 17:22:28 -0000
@@ -2,6 +2,7 @@
#include <libxml/parser.h>
#include "brlxmlapi.h"
#include "brlinp.h"
+#include "remoteinit.h"
#include <sys/types.h>
#include <sys/socket.h>
@@ -59,7 +60,6 @@ typedef struct
void brl_input_event (BrlInEvent* brl_in_event)
{
- gint n;
BrlPackage package;
package.source[0]='\0';
Index: gnopi/magconf.c
===================================================================
RCS file: /cvs/gnome/gnopernicus/gnopi/magconf.c,v
retrieving revision 1.10
diff -u -p -u -r1.10 magconf.c
--- gnopi/magconf.c 15 Jul 2002 14:27:30 -0000 1.10
+++ gnopi/magconf.c 15 Aug 2002 17:22:29 -0000
@@ -580,22 +580,30 @@ void mag_remove_id(const gchar *id)
GSList* mag_load_all()
{
- gint i,j;
Magnifier *mag;
Magnifier *rvm;
gchar *id;
GSList *rv;
+ GSList *l;
if (zoomer_id_list != NULL) mag_free_slist (zoomer_id_list);
+ zoomer_id_list = NULL;
if (zoomers_list != NULL) mag_free_magnifier_list (zoomers_list);
+ zoomers_list = NULL;
rv = mag_ids_load();
if (rv == NULL) return rv;
-
- for(i = 0 ; i < g_slist_length(zoomer_id_list); i++)
+
+ for (l = zoomer_id_list; l; l = l->next)
{
- mag = (Magnifier*) mag_config_load((gchar*) g_slist_nth_data(zoomer_id_list,i));
+ char *path = l->data;
+ if (path[0] == '\0')
+ {
+ g_warning("Acute gconf oddness");
+ continue;
+ }
+ mag = (Magnifier*) mag_config_load(path);
zoomers_list = mag_add_magnifier_to_list(zoomers_list,mag);
mag = NULL;
}
Index: gnopi/magui.c
===================================================================
RCS file: /cvs/gnome/gnopernicus/gnopi/magui.c,v
retrieving revision 1.5
diff -u -p -u -r1.5 magui.c
--- gnopi/magui.c 15 Jul 2002 14:27:30 -0000 1.5
+++ gnopi/magui.c 15 Aug 2002 17:22:29 -0000
@@ -87,6 +87,9 @@ void
magnifier_setting_value_add_to_widgets(Magnifier *magnifier)
{
gchar buf[5];
+
+ g_return_if_fail (magnifier != NULL);
+
if (w_magnifier_settings == NULL) return;
gtk_spin_button_set_value(GTK_SPIN_BUTTON(sp_factor),
magnifier->zoomfactor);
Index: magnifier/libmag/Makefile.am
===================================================================
RCS file: /cvs/gnome/gnopernicus/magnifier/libmag/Makefile.am,v
retrieving revision 1.2
diff -u -p -u -r1.2 Makefile.am
--- magnifier/libmag/Makefile.am 17 Apr 2002 13:50:25 -0000 1.2
+++ magnifier/libmag/Makefile.am 15 Aug 2002 17:22:29 -0000
@@ -17,11 +17,11 @@ libmagincludedir =$(includedir)/gnoperni
libmagdir=$(libdir)/gnopernicus-1.0
libmaginclude_HEADERS = magxmlapi.h
-
+
libmag_la_SOURCES = magxmlapi.h \
magxml.h \
magxml.c \
mag.h \
mag.c \
mag_ctrl.h \
- mag_ctrl.c
\ No newline at end of file
+ mag_ctrl.c
Index: magnifier/libmag/mag.c
===================================================================
RCS file: /cvs/gnome/gnopernicus/magnifier/libmag/mag.c,v
retrieving revision 1.4
diff -u -p -u -r1.4 mag.c
--- magnifier/libmag/mag.c 17 Apr 2002 13:50:25 -0000 1.4
+++ magnifier/libmag/mag.c 15 Aug 2002 17:22:30 -0000
@@ -86,6 +86,8 @@ void mag_zoomer_content(MagZoomer* mag_z
sleep(2);
#endif
}
+
+#if 0
/* __ MAG CB ___________ ______________________________________________________*/
static void call_mag_event_cb (char* buffer)
{
@@ -105,7 +107,7 @@ static void call_mag_event_cb (char* buf
}
}
-
+#endif
/* __ MAG ZOOMER METHODS ______________________________________________________*/
Index: magnifier/libmag/mag_ctrl.c
===================================================================
RCS file: /cvs/gnome/gnopernicus/magnifier/libmag/mag_ctrl.c,v
retrieving revision 1.2
diff -u -p -u -r1.2 mag_ctrl.c
--- magnifier/libmag/mag_ctrl.c 17 Apr 2002 13:50:25 -0000 1.2
+++ magnifier/libmag/mag_ctrl.c 15 Aug 2002 17:22:30 -0000
@@ -1,5 +1,6 @@
#include "mag_ctrl.h"
-#include "bonobo/Bonobo.h"
+#include <bonobo/bonobo-exception.h>
+#include <bonobo-activation/bonobo-activation.h>
static CORBA_Environment ev;
@@ -20,10 +21,10 @@ check_return_value (CORBA_Environment* e
}
-Accessibility_Magnifier
+GNOME_Magnifier
get_magnifier()
{
- Accessibility_Magnifier magnifier = NULL;
+ GNOME_Magnifier magnifier = NULL;
gboolean is_error = FALSE;
CORBA_Object oclient;
char *obj_id;
@@ -48,7 +49,7 @@ get_magnifier()
is_error = TRUE;
}
- magnifier = (Accessibility_Magnifier) oclient;
+ magnifier = (GNOME_Magnifier) oclient;
/* bonobo_activate (); ? */
}
@@ -59,9 +60,9 @@ get_magnifier()
void
magnifier_exit()
{
- Accessibility_Magnifier magnifier = get_magnifier();
+ GNOME_Magnifier magnifier = get_magnifier();
- Accessibility_Magnifier_exit(magnifier,&ev);
+ GNOME_Magnifier_exit(magnifier,&ev);
magnifier = NULL;
check_return_value (&ev);
@@ -70,71 +71,70 @@ magnifier_exit()
void
magnifier_set_roi(int zoom_region, int x, int y, int w, int h)
{
- Accessibility_Magnifier magnifier = get_magnifier();
+ GNOME_Magnifier magnifier = get_magnifier();
if (magnifier)
- Accessibility_Magnifier_setROI (magnifier,
- (const CORBA_short) zoom_region,
- (const CORBA_long) x,
- (const CORBA_long) y,
- (const CORBA_long) x+w,
- (const CORBA_long) y+h,
- &ev);
+ GNOME_Magnifier_setROI (magnifier,
+ (const CORBA_short) zoom_region,
+ (const CORBA_long) x,
+ (const CORBA_long) y,
+ (const CORBA_long) x+w,
+ (const CORBA_long) y+h,
+ &ev);
}
void
magnifier_resize_region (int zoom_region, int x1, int y1, int x2, int y2)
{
- Accessibility_Magnifier magnifier = get_magnifier();
+ GNOME_Magnifier magnifier = get_magnifier();
if (magnifier)
- Accessibility_Magnifier_resizeZoomRegion (magnifier,
- (const CORBA_short) zoom_region,
- (const CORBA_long) x1,
- (const CORBA_long) y1,
- (const CORBA_long) x2,
- (const CORBA_long) y2,
- &ev);
+ GNOME_Magnifier_resizeZoomRegion (magnifier,
+ (const CORBA_short) zoom_region,
+ (const CORBA_long) x1,
+ (const CORBA_long) y1,
+ (const CORBA_long) x2,
+ (const CORBA_long) y2,
+ &ev);
}
void
magnifier_clear_all_regions ()
{
- Accessibility_Magnifier magnifier = get_magnifier();
+ GNOME_Magnifier magnifier = get_magnifier();
if (magnifier)
- Accessibility_Magnifier_clearAllZoomRegions (magnifier,
- &ev);
+ GNOME_Magnifier_clearAllZoomRegions (magnifier, &ev);
}
int
magnifier_create_region (float zx, float zy, int x1, int y1, int x2, int y2)
{
- Accessibility_Magnifier magnifier = get_magnifier();
+ GNOME_Magnifier magnifier = get_magnifier();
int retval = -1;
if (magnifier)
- retval = Accessibility_Magnifier_createZoomRegion (magnifier,
- (const CORBA_float) zx,
- (const CORBA_float) zy,
- (const CORBA_long) x1,
- (const CORBA_long) y1,
- (const CORBA_long) x2,
- (const CORBA_long) y2,
- &ev);
+ retval = GNOME_Magnifier_createZoomRegion (magnifier,
+ (const CORBA_float) zx,
+ (const CORBA_float) zy,
+ (const CORBA_long) x1,
+ (const CORBA_long) y1,
+ (const CORBA_long) x2,
+ (const CORBA_long) y2,
+ &ev);
return retval;
}
void
magnifier_set_magnification (int zoom_region, float mag_factor_x, float mag_factor_y)
{
- Accessibility_Magnifier magnifier = get_magnifier();
+ GNOME_Magnifier magnifier = get_magnifier();
if (magnifier)
- Accessibility_Magnifier_setMagFactor (magnifier,
- (const CORBA_short) zoom_region,
- (const CORBA_float) mag_factor_x,
- (const CORBA_float) mag_factor_y,
- &ev);
+ GNOME_Magnifier_setMagFactor (magnifier,
+ (const CORBA_short) zoom_region,
+ (const CORBA_float) mag_factor_x,
+ (const CORBA_float) mag_factor_y,
+ &ev);
}
Index: magnifier/libmag/mag_ctrl.h
===================================================================
RCS file: /cvs/gnome/gnopernicus/magnifier/libmag/mag_ctrl.h,v
retrieving revision 1.1
diff -u -p -u -r1.1 mag_ctrl.h
--- magnifier/libmag/mag_ctrl.h 17 Apr 2002 13:50:25 -0000 1.1
+++ magnifier/libmag/mag_ctrl.h 15 Aug 2002 17:22:30 -0000
@@ -1,19 +1,20 @@
#ifndef MAG_CTRL_H_
#define MAG_CTRL_H_
-#include "at-util/Magnifier.h"
+#include "GNOME_Magnifier.h"
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
-Accessibility_Magnifier get_magnifier (void);
+GNOME_Magnifier get_magnifier (void);
void magnifier_set_roi (int zoom_region, int x1, int y1, int x2, int y2);
void magnifier_set_magnification (int zoom_region, float mag_factor_x, float mag_factor_y);
void magnifier_resize_region (int zoom_region, int x1, int y1, int x2, int y2);
int magnifier_create_region (float zx, float zy, int x1, int y1, int x2, int y2);
void magnifier_clear_all_regions (void);
void magnifier_exit(void);
+
#ifdef __cplusplus
}
#endif /* __cplusplus */
Index: magnifier/libmag/magxml.c
===================================================================
RCS file: /cvs/gnome/gnopernicus/magnifier/libmag/magxml.c,v
retrieving revision 1.5
diff -u -p -u -r1.5 magxml.c
--- magnifier/libmag/magxml.c 17 Apr 2002 13:50:25 -0000 1.5
+++ magnifier/libmag/magxml.c 15 Aug 2002 17:22:30 -0000
@@ -33,7 +33,6 @@ static MagParserState previous_state = M
static int unknown_depth = 0 ;
static MagZoomer* current_mag_zoomer = NULL ;
-static MagZoomer* existant_mag_zoomer = NULL ;
static gboolean found = FALSE ;
/* __ SAX CALLBACKS ___________________________________________________________*/
@@ -57,7 +56,6 @@ void mag_startElement (void *ctx, const
{
gchar* attr_val;
gchar* tattr_val;
- MagZoomer* rv = NULL;
found = FALSE;
#ifdef MAG_XML_DEBUG
Index: magnifier/test/tester.c
===================================================================
RCS file: /cvs/gnome/gnopernicus/magnifier/test/tester.c,v
retrieving revision 1.4
diff -u -p -u -r1.4 tester.c
--- magnifier/test/tester.c 17 Apr 2002 13:51:11 -0000 1.4
+++ magnifier/test/tester.c 15 Aug 2002 17:22:30 -0000
@@ -1,8 +1,10 @@
#include <stdio.h>
+#include <stdlib.h>
#include "magxmlapi.h"
#include <gtk/gtk.h>
-main ()
+int
+main (int argc, char **argv)
{
FILE* fp;
int len;
@@ -77,4 +79,6 @@ main ()
printf ("*** Press CTRL + C to end ***\n");
while (1) ;
+
+ return 0;
}
Index: srconf/test/testlibsrconf.c
===================================================================
RCS file: /cvs/gnome/gnopernicus/srconf/test/testlibsrconf.c,v
retrieving revision 1.5
diff -u -p -u -r1.5 testlibsrconf.c
--- srconf/test/testlibsrconf.c 15 Jul 2002 14:29:24 -0000 1.5
+++ srconf/test/testlibsrconf.c 15 Aug 2002 17:22:30 -0000
@@ -34,7 +34,7 @@ static void testfcnt(SREvent *event,unsi
int main(int argc, char *argv[])
{
- gchar **text;
+ gchar *text;
fprintf(stderr, "\ntestlibsrconf started...\n");
fprintf(stderr, "\nSPI init...\n");
@@ -54,7 +54,7 @@ int main(int argc, char *argv[])
fprintf(stderr, "\nTest the receiving...\n");
fprintf(stderr, "\nSPI entry loop...\n");
- srconf_get_data("KE_Mode",CFGT_STRING,text,"Kbd_mouse");
+ srconf_get_data("KE_Mode",CFGT_STRING,&text,"Kbd_mouse");
fprintf(stderr,"BBD:%s\n",*text);
Index: srlow/libsrlow/SRObject.c
===================================================================
RCS file: /cvs/gnome/gnopernicus/srlow/libsrlow/SRObject.c,v
retrieving revision 1.24
diff -u -p -u -r1.24 SRObject.c
--- srlow/libsrlow/SRObject.c 8 Aug 2002 15:37:48 -0000 1.24
+++ srlow/libsrlow/SRObject.c 15 Aug 2002 17:22:31 -0000
@@ -3369,8 +3369,6 @@ sro_get_accelerator (SRObject *obj,
SRLong index)
{
gboolean rv = FALSE;
- gchar** split;
- gchar* split2;
AccessibleAction *acc_action;
Accessible *acc;
long acc_count, i;
@@ -3396,7 +3394,7 @@ sro_get_accelerator (SRObject *obj,
if (tmp && tmp[0])
{
gchar *tmp2 = tmp;
- gchar *tmp3;
+ gchar *tmp3 = NULL;
tmp2 = strstr (tmp2, ";");
if (tmp2)
@@ -3757,8 +3755,6 @@ get_acc_role_from_main_widget (Accessibl
gint level,
gboolean stop)
{
- int i;
-
srl_return_val_if_fail (acc && array && *array, FALSE);
srl_return_val_if_fail (level >= 0 || level == -1, FALSE);
@@ -3865,7 +3861,6 @@ get_parent_with_location (Accessible *ac
SRRectangle *location)
{
Accessible *parent;
- SRRectangle location_;
srl_return_val_if_fail (acc, FALSE);
srl_return_val_if_fail (location, FALSE);
Index: srutil/SREvent.c
===================================================================
RCS file: /cvs/gnome/gnopernicus/srutil/SREvent.c,v
retrieving revision 1.4
diff -u -p -u -r1.4 SREvent.c
--- srutil/SREvent.c 18 Mar 2002 21:16:26 -0000 1.4
+++ srutil/SREvent.c 15 Aug 2002 17:22:31 -0000
@@ -1,4 +1,5 @@
#include "SREvent.h"
+#include <cspi/spi.h>
/*
*
--
mmeeks gnu org <><, Pseudo Engineer, itinerant idiot
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
