Hello community,
here is the log from the commit of package at-spi
checked in at Fri Mar 14 17:24:05 CET 2008.
--------
--- GNOME/at-spi/at-spi.changes 2008-03-03 17:28:44.000000000 +0100
+++ /mounts/work_src_done/STABLE/at-spi/at-spi.changes 2008-03-14 02:41:47.945075000 +0100
@@ -1,0 +2,7 @@
+Fri Mar 14 02:44:42 CET 2008 - maw@suse.de
+
+- Update to version 1.22.0:
+ + Bug fixed: bgo#496232
+ + Updated translations.
+
+-------------------------------------------------------------------
Old:
----
at-spi-1.21.92.tar.bz2
New:
----
at-spi-1.22.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ at-spi.spec ++++++
--- /var/tmp/diff_new_pack.v19001/_old 2008-03-14 17:21:49.000000000 +0100
+++ /var/tmp/diff_new_pack.v19001/_new 2008-03-14 17:21:49.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package at-spi (Version 1.21.92)
+# spec file for package at-spi (Version 1.22.0)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -16,7 +16,7 @@
License: GPL v2 or later; LGPL v2.1 or later
Group: Development/Libraries/GNOME
AutoReqProv: on
-Version: 1.21.92
+Version: 1.22.0
Release: 1
Requires: %{name}-lang = %{version}
Summary: Assistive Technology Service Provider Interface
@@ -123,6 +123,10 @@
%doc %{_docdir}/%{name}/reference
%changelog
+* Fri Mar 14 2008 maw@suse.de
+- Update to version 1.22.0:
+ + Bug fixed: bgo#496232
+ + Updated translations.
* Mon Mar 03 2008 maw@suse.de
- Update to version 1.21.92:
+ Bugs fixed: bgo#508147, bgo#517761, bgo#517250, and bgo#512702.
++++++ at-spi-1.21.92.tar.bz2 -> at-spi-1.22.0.tar.bz2 ++++++
++++ 7836 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi-1.21.92/ChangeLog new/at-spi-1.22.0/ChangeLog
--- old/at-spi-1.21.92/ChangeLog 2008-02-25 08:49:01.000000000 +0100
+++ new/at-spi-1.22.0/ChangeLog 2008-03-10 10:43:10.000000000 +0100
@@ -1,3 +1,41 @@
+2008-03-10 Li Yuan
+
+ * NEWS:
+ * README:
+ * configure.in:
+ Uprev/release 1.22.0.
+
+2008-02-27 Ariel Rios
+
+ * idl/Accessibility_Collection.idl:(getMatchesTo,
+ getMatchesFrom) API Change that adds in order querys.
+ * libspi/collection.c:
+ (sort_order_rev_canonical): Method to do querys and get results in
+ canonical reverse. New.
+ (inorder): Help method for getMatchesInOrder.
+ (getMatchesInOrder):New method to get next matches from a given object
+ in order.
+ (getMatchesInBackOrder): New method to get previous matches from a
+ given object in order.
+ (getMatchesFrom), (getMatchesTo): Old impl_getMatches[From/To] to be
+ able to accomodate in order querys.
+ (impl_getMatchesFrom), (impl_getMatchesTo): New implementation that
+ accomodate in order querys.
+ (spi_collection_interface_new),
+ (get_collection_from_servant), (impl_createMatchRule),
+ (child_interface_p), (match_states_all_p), (match_states_any_p),
+ (match_states_none_p), (match_states_lookup), (match_roles_all_p),
+ (match_roles_any_p), (match_roles_none_p), (match_roles_lookup),
+ (match_interfaces_all_p), (match_interfaces_any_p),
+ (match_interfaces_none_p), (match_interfaces_lookup),
+ (match_attributes_all_p), (match_attributes_any_p),
+ (match_attributes_none_p), (match_attributes_lookup), (traverse_p),
+ (sort_order_canonical), (query_exec), (impl_getMatches),
+ (spi_collection_init): Clean code.
+
+ Bug #496232. Work by Ariel Rios and
+ Scott Haeger .
+
2008-02-25 Li Yuan
* NEWS:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi-1.21.92/configure.in new/at-spi-1.22.0/configure.in
--- old/at-spi-1.21.92/configure.in 2008-02-25 08:41:53.000000000 +0100
+++ new/at-spi-1.22.0/configure.in 2008-03-10 10:42:03.000000000 +0100
@@ -1,8 +1,8 @@
AC_INIT(idl/Accessibility.idl)
AT_SPI_MAJOR_VERSION=1
-AT_SPI_MINOR_VERSION=21
-AT_SPI_MICRO_VERSION=92
+AT_SPI_MINOR_VERSION=22
+AT_SPI_MICRO_VERSION=0
AT_SPI_INTERFACE_AGE=0
AT_SPI_BINARY_AGE=0
AT_SPI_VERSION="$AT_SPI_MAJOR_VERSION.$AT_SPI_MINOR_VERSION.$AT_SPI_MICRO_VERSION"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi-1.21.92/gtk-doc.make new/at-spi-1.22.0/gtk-doc.make
--- old/at-spi-1.21.92/gtk-doc.make 2008-02-25 08:44:38.000000000 +0100
+++ new/at-spi-1.22.0/gtk-doc.make 2008-03-10 11:08:25.000000000 +0100
@@ -38,12 +38,7 @@
$(DOC_MODULE).prerequisites \
$(DOC_MODULE).signals
-REPORT_FILES = \
- $(DOC_MODULE)-undocumented.txt \
- $(DOC_MODULE)-undeclared.txt \
- $(DOC_MODULE)-unused.txt
-
-CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS)
+CLEANFILES = $(SCANOBJ_FILES) $(DOC_MODULE)-unused.txt $(DOC_STAMPS)
if ENABLE_GTK_DOC
all-local: html-build.stamp
@@ -84,10 +79,6 @@
tmpl.stamp: tmpl-build.stamp
@true
-tmpl/*.sgml:
- @true
-
-
#### xml ####
sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
@@ -105,11 +96,11 @@
html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
@echo 'gtk-doc: Building HTML'
@-chmod -R u+w $(srcdir)
- rm -rf $(srcdir)/html
+ rm -rf $(srcdir)/html
mkdir $(srcdir)/html
cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
- @echo 'gtk-doc: Fixing cross-references'
+ @echo 'gtk-doc: Fixing cross-references'
cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
touch html-build.stamp
@@ -119,13 +110,8 @@
rm -f *~ *.bak
rm -rf .libs
-distclean-local:
- cd $(srcdir) && \
- rm -rf xml $(REPORT_FILES) \
- $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
-
maintainer-clean-local: clean
- cd $(srcdir) && rm -rf xml html
+ cd $(srcdir) && rm -rf xml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
install-data-local:
installfiles=`echo $(srcdir)/html/*`; \
@@ -139,11 +125,7 @@
done; \
echo '-- Installing $(srcdir)/html/index.sgml' ; \
$(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \
- if test `which gtkdoc-rebase` != ""; then \
- gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \
- fi \
fi
-
uninstall-local:
rm -f $(DESTDIR)$(TARGET_DIR)/*
@@ -166,9 +148,8 @@
-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
-cp $(srcdir)/xml/*.xml $(distdir)/xml
cp $(srcdir)/html/* $(distdir)/html
- cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
- cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
- cd $(distdir) && rm -f $(DISTCLEANFILES)
- -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
+ if test -f $(srcdir)/$(DOC_MODULE).types; then \
+ cp $(srcdir)/$(DOC_MODULE).types $(distdir)/$(DOC_MODULE).types; \
+ fi
.PHONY : dist-hook-local docs
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi-1.21.92/idl/Accessibility_Collection.idl new/at-spi-1.22.0/idl/Accessibility_Collection.idl
--- old/at-spi-1.21.92/idl/Accessibility_Collection.idl 2008-02-25 08:41:05.000000000 +0100
+++ new/at-spi-1.22.0/idl/Accessibility_Collection.idl 2008-02-27 03:49:51.000000000 +0100
@@ -55,6 +55,13 @@
MATCH_LAST_DEFINED
};
+ enum TreeTraversalType {
+
+ TREE_RESTRICT_CHILDREN,
+ TREE_RESTRICT_SIBLING,
+ TREE_INORDER,
+ TREE_LAST_DEFINED
+ };
boolean isAncestorOf (in Accessible object);
@@ -74,21 +81,22 @@
in SortOrder sortby,
in long count,
in boolean traverse);
-
+
AccessibleSet getMatchesTo (in Accessible current_object,
- in MatchRule rule,
- in SortOrder sortby,
- in boolean recurse,
- in long count,
- in boolean traverse);
+ in MatchRule rule,
+ in SortOrder sortby,
+ in TreeTraversalType tree,
+ in boolean recurse,
+ in long count,
+ in boolean traverse);
AccessibleSet getMatchesFrom (in Accessible current_object,
- in MatchRule rule,
- in SortOrder sortby,
- in boolean isrestrict,
- in long count,
- in boolean traverse);
+ in MatchRule rule,
+ in SortOrder sortby,
+ in TreeTraversalType tree,
+ in long count,
+ in boolean traverse);
Accessible getActiveDescendant ();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi-1.21.92/intltool-extract.in new/at-spi-1.22.0/intltool-extract.in
--- old/at-spi-1.21.92/intltool-extract.in 2008-02-25 08:44:38.000000000 +0100
+++ new/at-spi-1.22.0/intltool-extract.in 2008-03-10 11:08:25.000000000 +0100
@@ -32,7 +32,7 @@
## Release information
my $PROGRAM = "intltool-extract";
my $PACKAGE = "intltool";
-my $VERSION = "0.36.3";
+my $VERSION = "0.36.2";
## Loaded modules
use strict;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi-1.21.92/intltool-merge.in new/at-spi-1.22.0/intltool-merge.in
--- old/at-spi-1.21.92/intltool-merge.in 2008-02-25 08:44:38.000000000 +0100
+++ new/at-spi-1.22.0/intltool-merge.in 2008-03-10 11:08:25.000000000 +0100
@@ -35,7 +35,7 @@
## Release information
my $PROGRAM = "intltool-merge";
my $PACKAGE = "intltool";
-my $VERSION = "0.36.3";
+my $VERSION = "0.36.2";
## Loaded modules
use strict;
@@ -292,9 +292,10 @@
{
next if /^#/;
- for my $lang (split)
+ if (/([-a-zA-Z_@.]+)\n/)
{
- chomp ($lang);
+ my $lang = $1;
+
my $po_file = $PO_DIR . "/" . $lang . ".po";
if (-e $po_file) {
$po_files_by_lang{$lang} = $po_file;
@@ -575,7 +576,6 @@
return "&" if $_ == 38;
return "'" if $_ == 39;
return "<" if $_ == 60;
- return ">" if $_ == 62;
return chr $_;
}
@@ -1076,25 +1076,14 @@
close OUTPUT;
print "CREATED $lang/$OUTFILE\n" unless $QUIET_ARG;
}
- if ( ! -d "C" ) {
- mkdir "C" or -d "C" or die "Cannot create subdirectory C: $!\n";
- }
- open OUTPUT, ">C/$OUTFILE" or die "Cannot open C/$OUTFILE: $!\n";
- binmode (OUTPUT) if $^O eq 'MSWin32';
- my $tree = readXml($FILE);
- print_header($FILE, \*OUTPUT);
- parseTree(\*OUTPUT, $tree);
- close OUTPUT;
- print "CREATED C/$OUTFILE\n" unless $QUIET_ARG;
- } else {
- open OUTPUT, ">$OUTFILE" or die "Cannot open $OUTFILE: $!\n";
- binmode (OUTPUT) if $^O eq 'MSWin32';
- my $tree = readXml($FILE);
- print_header($FILE, \*OUTPUT);
- parseTree(\*OUTPUT, $tree);
- close OUTPUT;
- print "CREATED $OUTFILE\n" unless $QUIET_ARG;
- }
+ }
+ open OUTPUT, ">$OUTFILE" or die "Cannot open $OUTFILE: $!\n";
+ binmode (OUTPUT) if $^O eq 'MSWin32';
+ my $tree = readXml($FILE);
+ print_header($FILE, \*OUTPUT);
+ parseTree(\*OUTPUT, $tree);
+ close OUTPUT;
+ print "CREATED $OUTFILE\n" unless $QUIET_ARG;
}
sub keys_merge_translations
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi-1.21.92/intltool-update.in new/at-spi-1.22.0/intltool-update.in
--- old/at-spi-1.21.92/intltool-update.in 2008-02-25 08:44:38.000000000 +0100
+++ new/at-spi-1.22.0/intltool-update.in 2008-03-10 11:08:25.000000000 +0100
@@ -30,7 +30,7 @@
## Release information
my $PROGRAM = "intltool-update";
-my $VERSION = "0.36.3";
+my $VERSION = "0.36.2";
my $PACKAGE = "intltool";
## Loaded modules
@@ -334,7 +334,7 @@
push @buf_i18n_xml, "$File::Find::name" if /\.($xml_support)$/;
push @buf_i18n_ini, "$File::Find::name" if /\.($ini_support)$/;
push @buf_i18n_xml_unmarked, "$File::Find::name" if /\.(schemas(\.in)+)$/;
- }, "$SRCDIR/.." if "$SRCDIR" ne ".";
+ }, "$SRCDIR/..";
open POTFILES, $POTFILES_in or die "$PROGRAM: there's no POTFILES.in!\n";
@buf_potfiles = grep !/^(#|\s*$)/, <POTFILES>;
@@ -434,8 +434,8 @@
last;
}
- ## C_ N_ Q_ and _ are the macros defined in gi8n.h
- if (/[CNQ]?_ *\(QUOTEDTEXT/)
+ ## N_ Q_ and _ are the three macros defined in gi8n.h
+ if (/[NQ]?_ *\(QUOTEDTEXT/)
{
if (defined isNotValidMissing (unpack("x3 A*", $file))) {
## Remove the first 3 chars and add newline
@@ -777,7 +777,7 @@
my $XGETTEXT_KEYWORDS = &FindPOTKeywords;
push @xgettext_argument, $XGETTEXT_KEYWORDS;
my $MSGID_BUGS_ADDRESS = &FindMakevarsBugAddress;
- push @xgettext_argument, "--msgid-bugs-address\=\"$MSGID_BUGS_ADDRESS\"" if $MSGID_BUGS_ADDRESS;
+ push @xgettext_argument, "--msgid-bugs-address\=$MSGID_BUGS_ADDRESS" if $MSGID_BUGS_ADDRESS;
push @xgettext_argument, "--from-code\=$encoding" if ($gettext_support_nonascii);
push @xgettext_argument, $XGETTEXT_ARGS if $XGETTEXT_ARGS;
my $xgettext_command = join ' ', @xgettext_argument;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi-1.21.92/libspi/collection.c new/at-spi-1.22.0/libspi/collection.c
--- old/at-spi-1.21.92/libspi/collection.c 2008-02-25 08:41:05.000000000 +0100
+++ new/at-spi-1.22.0/libspi/collection.c 2008-02-27 03:49:51.000000000 +0100
@@ -35,23 +35,20 @@
SpiCollection *
spi_collection_interface_new (AtkObject *obj)
{
-
SpiCollection *new_collection = g_object_new (SPI_COLLECTION_TYPE, NULL);
spi_base_construct (SPI_BASE (new_collection), G_OBJECT (obj));
return new_collection;
-
}
-
static AtkObject *
get_atkobject_from_servant (PortableServer_Servant servant){
- SpiBase *object = SPI_BASE (bonobo_object_from_servant (servant));
+ SpiBase *object = SPI_BASE (bonobo_object_from_servant (servant));
g_return_val_if_fail (object, NULL);
g_return_val_if_fail (ATK_IS_OBJECT (object->gobj), NULL);
-
+
return ATK_OBJECT (object->gobj);
}
@@ -59,27 +56,25 @@
get_collection_from_servant (PortableServer_Servant servant)
{
SpiBase *object = SPI_BASE (bonobo_object_from_servant (servant));
-
+
g_return_val_if_fail (object, NULL);
g_return_val_if_fail (IS_COLLECTION (object), NULL);
return SPI_COLLECTION (object);
-
}
-
static Accessibility_MatchRule
impl_createMatchRule (PortableServer_Servant servant,
- const Accessibility_StateSet states,
- const Accessibility_Collection_MatchType statematchtype,
- const Accessibility_AttributeSet *attributes,
- const Accessibility_Collection_MatchType attributematchtype,
- const Accessibility_RoleSet *roles,
- const Accessibility_Collection_MatchType rolematchtype,
- const CORBA_char *interfaces,
- const Accessibility_Collection_MatchType interfacematchtype,
- const CORBA_boolean invert,
- CORBA_Environment *ev){
+ const Accessibility_StateSet states,
+ const Accessibility_Collection_MatchType statematchtype,
+ const Accessibility_AttributeSet *attributes,
+ const Accessibility_Collection_MatchType attributematchtype,
+ const Accessibility_RoleSet *roles,
+ const Accessibility_Collection_MatchType rolematchtype,
+ const CORBA_char *interfaces,
+ const Accessibility_Collection_MatchType interfacematchtype,
+ const CORBA_boolean invert,
+ CORBA_Environment *ev){
Accessibility_MatchRule retval = NULL;
@@ -88,7 +83,6 @@
Accessibility_StateSet ss = CORBA_Object_duplicate (states, ev);
gint i;
-
if (mrp != NULL){
CORBA_free (mrp->attributes);
CORBA_free (mrp->roles);
@@ -96,30 +90,29 @@
g_free (mrp);
}
-
- get_collection_from_servant (servant)->_mrp = g_new (MatchRulePrivate, 1);
+
+ get_collection_from_servant (servant)->_mrp = g_new(MatchRulePrivate, 1);
mrp = get_collection_from_servant (servant)->_mrp;
/* states */
-
mrp->states = ss;
mrp->statematchtype = statematchtype;
/* attributes */
-
mrp->attributes = CORBA_sequence_CORBA_string__alloc ();
mrp->attributes->_maximum = attributes->_maximum;
mrp->attributes->_length = attributes->_length;
- mrp->attributes->_buffer = CORBA_sequence_CORBA_string_allocbuf (attributes->_length);
+ mrp->attributes->_buffer =
+ CORBA_sequence_CORBA_string_allocbuf (attributes->_length);
for (i = 0; i < mrp->attributes->_length; i++)
- mrp->attributes->_buffer [i]= CORBA_string_dup (attributes->_buffer [i]);
+ mrp->attributes->_buffer [i] =
+ CORBA_string_dup (attributes->_buffer [i]);
CORBA_sequence_set_release (mrp->attributes, TRUE);
mrp->attributematchtype = attributematchtype;
/* roles */
-
mrp->roles = Accessibility_RoleSet__alloc ();
mrp->roles->_maximum = roles->_maximum;
mrp->roles->_length = roles->_length;
@@ -127,12 +120,11 @@
for (i = 0; i < roles->_length; i++)
mrp->roles->_buffer [i] = roles->_buffer [i];
-
+
CORBA_sequence_set_release (mrp->roles, TRUE);
mrp->rolematchtype = rolematchtype;
/* interfaces */
-
mrp->interfaces = CORBA_string_dup (interfaces);
mrp->interfacematchtype = interfacematchtype;
@@ -141,7 +133,6 @@
retval = CORBA_Object_duplicate (BONOBO_OBJREF (matchrule), ev);
return retval;
-
}
static void impl_freeMatchRule (PortableServer_Servant servant,
@@ -155,34 +146,34 @@
spimatchrule = SPI_COLLECTION (object);
mrp = spimatchrule->_mrp;
-
+
CORBA_free (mrp->attributes);
- CORBA_free (mrp->roles);
+ CORBA_free (mrp->roles);
CORBA_free (mrp->interfaces);
g_free (mrp);
spimatchrule->_mrp = NULL;
}
-
-
static gboolean
-child_interface_p (Accessibility_Accessible child, gchar *repo_id, CORBA_Environment *ev) {
-
+child_interface_p (Accessibility_Accessible child,
+ gchar *repo_id,
+ CORBA_Environment *ev) {
+
CORBA_Object retval;
-
+
retval = Bonobo_Unknown_queryInterface (child, repo_id, ev);
-
- return (retval != CORBA_OBJECT_NIL)? TRUE : FALSE;
+ return (retval != CORBA_OBJECT_NIL)? TRUE : FALSE;
}
#define child_collection_p(ch,ev) (child_interface_p (ch,"IDL:Accessibility/Collection:1.0", ev))
static gboolean
-match_states_all_p (Accessibility_Accessible child, Accessibility_StateSet set, CORBA_Environment *ev){
+match_states_all_p (Accessibility_Accessible child,
+ Accessibility_StateSet set,
+ CORBA_Environment *ev){
-
Accessibility_StateSet chs ;
Accessibility_StateSeq *seq = Accessibility_StateSet_getStates (set, ev);
gint i;
@@ -191,19 +182,19 @@
return TRUE;
chs = Accessibility_Accessible_getState (child, ev);
-
-
+
for (i = 0; i < seq->_length; i++)
if (!Accessibility_StateSet_contains (chs, seq->_buffer [i], ev))
return FALSE;
return TRUE;
-
}
static gboolean
-match_states_any_p (Accessibility_Accessible child, Accessibility_StateSet set, CORBA_Environment *ev){
-
+match_states_any_p (Accessibility_Accessible child,
+ Accessibility_StateSet set,
+ CORBA_Environment *ev){
+
Accessibility_StateSet chs;
Accessibility_StateSeq *seq = Accessibility_StateSet_getStates (set, ev);
gint i;
@@ -218,11 +209,12 @@
return TRUE;
return FALSE;
-
}
static gboolean
-match_states_none_p (Accessibility_Accessible child, Accessibility_StateSet set, CORBA_Environment *ev){
+match_states_none_p (Accessibility_Accessible child,
+ Accessibility_StateSet set,
+ CORBA_Environment *ev){
Accessibility_StateSet chs;
Accessibility_StateSeq *seq = Accessibility_StateSet_getStates (set, ev);
@@ -237,11 +229,12 @@
return FALSE;
return TRUE;
-
}
static gboolean
-match_states_lookup (Accessibility_Accessible child, MatchRulePrivate *mrp, CORBA_Environment *ev){
+match_states_lookup (Accessibility_Accessible child,
+ MatchRulePrivate *mrp,
+ CORBA_Environment *ev){
switch (mrp->statematchtype){
case Accessibility_Collection_MATCH_ALL :
@@ -263,11 +256,12 @@
}
return FALSE;
-
}
static gboolean
-match_roles_all_p (Accessibility_Accessible child, Accessibility_RoleSet *roles, CORBA_Environment *ev){
+match_roles_all_p (Accessibility_Accessible child,
+ Accessibility_RoleSet *roles,
+ CORBA_Environment *ev){
Accessibility_Role role;
@@ -285,9 +279,10 @@
}
-
static gboolean
-match_roles_any_p (Accessibility_Accessible child, Accessibility_RoleSet *roles, CORBA_Environment *ev){
+match_roles_any_p (Accessibility_Accessible child,
+ Accessibility_RoleSet *roles,
+ CORBA_Environment *ev){
Accessibility_Role role;
int i;
@@ -302,11 +297,12 @@
return TRUE;
return FALSE;
-
}
static gboolean
-match_roles_none_p (Accessibility_Accessible child, Accessibility_RoleSet *roles, CORBA_Environment *ev){
+match_roles_none_p (Accessibility_Accessible child,
+ Accessibility_RoleSet *roles,
+ CORBA_Environment *ev){
Accessibility_Role role ;
int i;
@@ -321,12 +317,12 @@
return FALSE;
return TRUE;
-
}
-
static gboolean
-match_roles_lookup (Accessibility_Accessible child, MatchRulePrivate *mrp, CORBA_Environment *ev){
+match_roles_lookup (Accessibility_Accessible child,
+ MatchRulePrivate *mrp,
+ CORBA_Environment *ev){
switch (mrp->rolematchtype){
case Accessibility_Collection_MATCH_ALL :
@@ -347,16 +343,15 @@
default : break;
}
-
return FALSE;
-
}
-
#define split_ifaces(ifaces) (g_strsplit (ifaces, ";", 0))
static gboolean
-match_interfaces_all_p (Accessibility_Accessible obj, gchar *interfaces, CORBA_Environment *ev){
+match_interfaces_all_p (Accessibility_Accessible obj,
+ gchar *interfaces,
+ CORBA_Environment *ev){
gchar **ifaces;
gint i, length;
@@ -372,12 +367,12 @@
return FALSE;
}
return TRUE;
-
-
}
static gboolean
-match_interfaces_any_p (Accessibility_Accessible obj, gchar *interfaces, CORBA_Environment *ev){
+match_interfaces_any_p (Accessibility_Accessible obj,
+ gchar *interfaces,
+ CORBA_Environment *ev){
gchar **ifaces;
gint i, length;
@@ -392,12 +387,13 @@
g_free (ifaces);
return TRUE;
}
-
return FALSE;
}
static gboolean
-match_interfaces_none_p (Accessibility_Accessible obj, gchar *interfaces, CORBA_Environment *ev){
+match_interfaces_none_p (Accessibility_Accessible obj,
+ gchar *interfaces,
+ CORBA_Environment *ev){
gchar **ifaces = split_ifaces (interfaces);
gint i, length = g_strv_length (ifaces);
@@ -410,12 +406,12 @@
return FALSE;
return TRUE;
-
-
}
static gboolean
-match_interfaces_lookup (Accessibility_Accessible child, MatchRulePrivate *mrp, CORBA_Environment *ev){
+match_interfaces_lookup (Accessibility_Accessible child,
+ MatchRulePrivate *mrp,
+ CORBA_Environment *ev){
switch (mrp->interfacematchtype){
@@ -423,12 +419,12 @@
if (match_interfaces_all_p (child, mrp->interfaces, ev))
return TRUE;
break;
-
+
case Accessibility_Collection_MATCH_ANY :
if (match_interfaces_any_p (child, mrp->interfaces, ev))
return TRUE;
break;
-
+
case Accessibility_Collection_MATCH_NONE :
if (match_interfaces_none_p (child, mrp->interfaces, ev))
return TRUE;
@@ -443,7 +439,9 @@
#define split_attributes(attributes) (g_strsplit (attributes, ";", 0))
static gboolean
-match_attributes_all_p (Accessibility_Accessible child, Accessibility_AttributeSet *attributes, CORBA_Environment *ev){
+match_attributes_all_p (Accessibility_Accessible child,
+ Accessibility_AttributeSet *attributes,
+ CORBA_Environment *ev){
int i, k;
Accessibility_AttributeSet *oa ;
@@ -456,7 +454,8 @@
for (i = 0; i < attributes->_length; i++){
for (k = 0; k < oa->_length; k++)
- if (!g_ascii_strcasecmp (oa->_buffer [k], attributes->_buffer [i])){
+ if (!g_ascii_strcasecmp (oa->_buffer [k],
+ attributes->_buffer [i])){
flag = TRUE;
break;
}
@@ -469,7 +468,9 @@
}
static gboolean
-match_attributes_any_p (Accessibility_Accessible child, Accessibility_AttributeSet *attributes, CORBA_Environment *ev){
+match_attributes_any_p (Accessibility_Accessible child,
+ Accessibility_AttributeSet *attributes,
+ CORBA_Environment *ev){
int i, k;
@@ -482,18 +483,21 @@
for (i = 0; i < attributes->_length; i++)
for (k = 0; k < oa->_length; k++)
- if (!g_ascii_strcasecmp (oa->_buffer [k], attributes->_buffer[i]))
+ if (!g_ascii_strcasecmp (oa->_buffer [k],
+ attributes->_buffer[i]))
return TRUE;
return FALSE;
}
static gboolean
-match_attributes_none_p (Accessibility_Accessible child, Accessibility_AttributeSet *attributes, CORBA_Environment *ev){
+match_attributes_none_p (Accessibility_Accessible child,
+ Accessibility_AttributeSet *attributes,
+ CORBA_Environment *ev){
int i, k;
Accessibility_AttributeSet *oa;
gboolean flag = FALSE;
-
+
if (attributes->_length == 0 || attributes == NULL)
return TRUE;
@@ -501,7 +505,8 @@
for (i = 0; i < attributes->_length; i++){
for (k = 0; k < oa->_length; k++)
- if (!g_ascii_strcasecmp (oa->_buffer [k], attributes->_buffer [i]))
+ if (!g_ascii_strcasecmp (oa->_buffer [k],
+ attributes->_buffer [i]))
return FALSE;
}
return TRUE;
@@ -529,11 +534,7 @@
default : break;
}
-
return FALSE;
-
-
-
}
static gboolean
@@ -544,50 +545,109 @@
if (traverse)
return TRUE;
else return !child_collection_p (child, ev);
-
}
static int
sort_order_canonical (MatchRulePrivate *mrp, GList *ls,
gint kount, gint max,
- Accessibility_Accessible obj, glong index, gboolean flag,
+ Accessibility_Accessible obj, glong index, gboolean flag,
Accessibility_Accessible pobj, CORBA_boolean recurse,
CORBA_boolean traverse, CORBA_Environment *ev){
-
gint i = index;
glong acount = Accessibility_Accessible__get_childCount (obj, ev);
gboolean prev = pobj? TRUE : FALSE;
-
+
for (; i < acount && (max == 0 || kount < max); i++){
- Accessibility_Accessible child = Accessibility_Accessible_getChildAtIndex (obj, i, ev);
+ Accessibility_Accessible child =
+ Accessibility_Accessible_getChildAtIndex (obj, i, ev);
-
if (prev && CORBA_Object_is_equivalent (child, pobj, ev)){
-
return kount;
-
}
- if (flag && match_interfaces_lookup (child, mrp, ev) && match_states_lookup (child, mrp, ev)
+ if (flag && match_interfaces_lookup (child, mrp, ev)
+ && match_states_lookup (child, mrp, ev)
&& match_roles_lookup (child, mrp, ev)
&& match_attributes_lookup (child, mrp, ev)
){
ls = g_list_append (ls, child);
-
kount++;
}
-
+
if (!flag)
flag = TRUE;
-
if (recurse && traverse_p (child, traverse, ev))
- kount = sort_order_canonical (mrp, ls, kount, max, child, 0, TRUE, pobj, recurse, traverse, ev);
+ kount = sort_order_canonical (mrp, ls, kount,
+ max, child, 0, TRUE,
+ pobj, recurse, traverse, ev);
}
return kount;
}
+static int
+sort_order_rev_canonical (MatchRulePrivate *mrp, GList *ls,
+ gint kount, gint max,
+ Accessibility_Accessible obj, gboolean flag,
+ Accessibility_Accessible pobj, CORBA_Environment *ev){
+ Accessibility_Accessible nextobj;
+ Accessibility_Accessible parent;
+ glong indexinparent;
+
+ /* This breaks us out of the recursion. */
+ if (obj == CORBA_OBJECT_NIL
+ || CORBA_Object_is_equivalent (obj, pobj, ev))
+ {
+ return kount;
+ }
+
+ /* Add to the list if it matches */
+ if (flag && match_interfaces_lookup (obj, mrp, ev)
+ && match_states_lookup (obj, mrp, ev)
+ && match_roles_lookup (obj, mrp, ev)
+ && match_attributes_lookup (obj, mrp, ev))
+ {
+ ls = g_list_append (ls, obj);
+ kount++;
+ }
+
+ if(!flag) flag = TRUE;
+
+ /* Get the current nodes index in it's parent and the parent object. */
+ indexinparent = Accessibility_Accessible_getIndexInParent (obj, ev);
+ parent = Accessibility_Accessible__get_parent (obj, ev);
+
+ if(indexinparent > 0)
+ {
+ /* there are still some siblings to visit so get the previous sibling
+ and get it's last descendant.
+ First, get the previous sibling */
+ nextobj = Accessibility_Accessible_getChildAtIndex (parent,
+ indexinparent-1,
+ ev);
+
+ /* Now, drill down the right side to the last descendant */
+ while(Accessibility_Accessible__get_childCount (nextobj, ev) > 0)
+ {
+ nextobj = Accessibility_Accessible_getChildAtIndex (nextobj,
+ Accessibility_Accessible__get_childCount (nextobj, ev)-1, ev);
+
+ }
+ /* recurse with the last descendant */
+ kount = sort_order_rev_canonical (mrp, ls, kount, max,
+ nextobj, TRUE, pobj, ev);
+ }
+ else
+ {
+ /* no more siblings so next node must be the parent */
+ kount = sort_order_rev_canonical (mrp, ls, kount, max,
+ parent, TRUE, pobj, ev);
+
+ }
+ return kount;
+}
+
static int
query_exec (MatchRulePrivate *mrp, Accessibility_Collection_SortOrder sortby,
GList *ls, gint kount, gint max,
@@ -596,14 +656,20 @@
Accessibility_Accessible pobj,
CORBA_boolean recurse, CORBA_boolean traverse,
CORBA_Environment *ev){
+
switch (sortby) {
- case Accessibility_Collection_SORT_ORDER_CANONICAL : kount = sort_order_canonical (mrp, ls, 0, max, obj, index, flag, pobj, recurse, traverse, ev);
+ case Accessibility_Collection_SORT_ORDER_CANONICAL :
+ kount = sort_order_canonical(mrp, ls, 0, max, obj, index, flag,
+ pobj, recurse, traverse, ev);
break;
case Accessibility_Collection_SORT_ORDER_REVERSE_CANONICAL :
- kount = sort_order_canonical (mrp, ls, 0, max, obj, index, flag, pobj, recurse, traverse, ev);
- break;
-
- default: kount = 0; g_warning ("Sort method not implemented yet"); break;
+ kount = sort_order_canonical(mrp, ls, 0, max, obj, index, flag,
+ pobj, recurse, traverse, ev);
+ break;
+ default:
+ kount = 0;
+ g_warning ("Sort method not implemented yet");
+ break;
}
return kount;
@@ -632,19 +698,20 @@
}
static Accessibility_AccessibleSet *
-impl_getMatchesFrom (PortableServer_Servant servant,
- const Accessibility_Accessible current_object,
- const Accessibility_MatchRule rule,
- const Accessibility_Collection_SortOrder sortby,
- const CORBA_boolean isrestrict,
- CORBA_long count,
- const CORBA_boolean traverse,
- CORBA_Environment *ev){
+getMatchesFrom (PortableServer_Servant servant,
+ const Accessibility_Accessible current_object,
+ const Accessibility_MatchRule rule,
+ const Accessibility_Collection_SortOrder sortby,
+ const CORBA_boolean isrestrict,
+ CORBA_long count,
+ const CORBA_boolean traverse,
+ CORBA_Environment *ev){
GList *ls = NULL;
Accessibility_Accessible parent;
MatchRulePrivate *mrp;
- glong index = Accessibility_Accessible_getIndexInParent (current_object, ev);
+ glong index =
+ Accessibility_Accessible_getIndexInParent (current_object, ev);
gint kount = 0;
ls = g_list_append (ls, current_object);
@@ -652,12 +719,13 @@
if (!isrestrict){
parent = Accessibility_Accessible__get_parent (current_object, ev);
- kount = query_exec (mrp, sortby, ls, 0, count, parent, index, FALSE, CORBA_OBJECT_NIL, TRUE, traverse, ev);
-
+ kount = query_exec (mrp, sortby, ls, 0, count, parent, index,
+ FALSE, CORBA_OBJECT_NIL, TRUE, traverse, ev);
}
else
- kount = query_exec (mrp, sortby, ls, 0,count, current_object, 0, FALSE, CORBA_OBJECT_NIL, TRUE, traverse, ev);
-
+ kount = query_exec (mrp, sortby, ls, 0, count,
+ current_object, 0, FALSE, CORBA_OBJECT_NIL,
+ TRUE, traverse, ev);
ls = g_list_next (ls);
@@ -667,50 +735,215 @@
return _accessible_list_to_set (ls, kount);
}
+/*
+ inorder traversal from a given object in the hierarchy
+*/
+
+static int
+inorder (Accessibility_Accessible collection, MatchRulePrivate *mrp,
+ GList *ls, gint kount, gint max,
+ Accessibility_Accessible obj,
+ gboolean flag,
+ Accessibility_Accessible pobj,
+ CORBA_boolean traverse,
+ CORBA_Environment *ev){
+
+ int i = 0;
+
+ /* First, look through the children recursively. */
+ kount = sort_order_canonical (mrp, ls, kount, max, obj, 0, TRUE,
+ CORBA_OBJECT_NIL, TRUE, TRUE, ev);
+
+ /* Next, we look through the right subtree */
+ while ((max == 0 || kount < max)
+ && ! CORBA_Object_is_equivalent (obj, collection, ev))
+ {
+
+ i = Accessibility_Accessible_getIndexInParent (obj, ev);
+ Accessibility_Accessible parent =
+ Accessibility_Accessible__get_parent (obj, ev);
+ kount = sort_order_canonical (mrp, ls, kount, max, parent,
+ i+1, TRUE, FALSE, TRUE, TRUE, ev);
+ obj = parent;
+ }
+
+ if (kount < max)
+ {
+ kount = sort_order_canonical (mrp, ls, kount, max,
+ obj, i + 1, TRUE, FALSE,
+ TRUE, TRUE, ev);
+ }
+
+ return kount;
+}
+
+/*
+ GetMatchesInOrder: get matches from a given object in an inorder traversal.
+*/
static Accessibility_AccessibleSet *
-impl_getMatchesTo (PortableServer_Servant servant,
- const Accessibility_Accessible current_object,
- const Accessibility_MatchRule rule,
- const Accessibility_Collection_SortOrder sortby,
- const CORBA_boolean recurse,
- CORBA_long count,
- const CORBA_boolean traverse,
- CORBA_Environment *ev){
+getMatchesInOrder (PortableServer_Servant servant,
+ const Accessibility_Accessible current_object,
+ const Accessibility_MatchRule rule,
+ const Accessibility_Collection_SortOrder sortby,
+ const CORBA_boolean recurse,
+ CORBA_long count,
+ const CORBA_boolean traverse,
+ CORBA_Environment *ev){
+ GList *ls = NULL;
+ AtkObject *aobj;
+ Accessibility_Accessible obj, collection;
+ MatchRulePrivate *mrp;
+ gint kount = 0;
+
+ ls = g_list_append (ls, current_object);
+ mrp = get_collection_from_servant (servant)->_mrp;
+
+ aobj = get_atkobject_from_servant (servant);
+ obj = spi_accessible_new_return (aobj, FALSE, ev);
+
+ kount = inorder (obj, mrp, ls, 0, count,
+ current_object, TRUE, CORBA_OBJECT_NIL, traverse, ev);
+
+ ls = g_list_next (ls);
+
+ if (sortby == Accessibility_Collection_SORT_ORDER_REVERSE_CANONICAL)
+ ls = g_list_reverse (ls);
+ return _accessible_list_to_set (ls, kount);
+}
+
+/*
+ GetMatchesInOrder: get matches from a given object in an inorder traversal.
+*/
+static Accessibility_AccessibleSet *
+getMatchesInBackOrder (PortableServer_Servant servant,
+ const Accessibility_Accessible current_object,
+ const Accessibility_MatchRule rule,
+ const Accessibility_Collection_SortOrder sortby,
+ CORBA_long count,
+ CORBA_Environment *ev){
GList *ls = NULL;
AtkObject *aobj;
- Accessibility_Accessible obj;
+ Accessibility_Accessible collection;
MatchRulePrivate *mrp;
- gint kount = 0;
+ gint kount = 0;
+
+ ls = g_list_append (ls, current_object);
+ mrp = get_collection_from_servant (servant)->_mrp;
+ aobj = get_atkobject_from_servant (servant);
+ collection = spi_accessible_new_return (aobj, FALSE, ev);
+
+ kount = sort_order_rev_canonical (mrp, ls, 0, count, current_object,
+ FALSE, collection, ev);
+
+ ls = g_list_next (ls);
+
+ if (sortby == Accessibility_Collection_SORT_ORDER_REVERSE_CANONICAL)
+ ls = g_list_reverse (ls);
+
+ return _accessible_list_to_set (ls, kount);
+}
+
+
+static Accessibility_AccessibleSet *
+getMatchesTo (PortableServer_Servant servant,
+ const Accessibility_Accessible current_object,
+ const Accessibility_MatchRule rule,
+ const Accessibility_Collection_SortOrder sortby,
+ const CORBA_boolean recurse,
+ const CORBA_boolean isrestrict,
+ CORBA_long count,
+ const CORBA_boolean traverse,
+ CORBA_Environment *ev){
+
+ GList *ls = NULL;
+ AtkObject *aobj;
+ Accessibility_Accessible obj;
+ MatchRulePrivate *mrp;
+ gint kount = 0;
ls = g_list_append (ls, current_object);
mrp = get_collection_from_servant (servant)->_mrp;
-
-
+
if (recurse){
obj = Accessibility_Accessible__get_parent (current_object, ev);
- kount = query_exec (mrp, sortby, ls, 0, count, obj, 0, TRUE, current_object, TRUE, traverse, ev);
+ kount = query_exec (mrp, sortby, ls, 0, count,
+ obj, 0, TRUE, current_object, TRUE, traverse, ev);
}
- else{
+ else{
aobj = get_atkobject_from_servant (servant);
obj = spi_accessible_new_return (aobj, FALSE, ev);
- kount = query_exec (mrp, sortby, ls, 0, count, obj, 0, TRUE, current_object, TRUE, traverse, ev);
+ kount = query_exec (mrp, sortby, ls, 0, count,
+ obj, 0, TRUE, current_object, TRUE, traverse, ev);
}
ls = g_list_next (ls);
- if (sortby == Accessibility_Collection_SORT_ORDER_REVERSE_CANONICAL)
+ if (sortby != Accessibility_Collection_SORT_ORDER_REVERSE_CANONICAL)
ls = g_list_reverse (ls);
-
+
return _accessible_list_to_set (ls, kount);
}
+static Accessibility_AccessibleSet *
+impl_getMatchesFrom (PortableServer_Servant servant,
+ const Accessibility_Accessible current_object,
+ const Accessibility_MatchRule rule,
+ const Accessibility_Collection_SortOrder sortby,
+ const Accessibility_Collection_TreeTraversalType tree,
+ CORBA_long count,
+ const CORBA_boolean traverse,
+ CORBA_Environment *ev){
+
+ switch (tree){
+ case Accessibility_Collection_TREE_RESTRICT_CHILDREN :
+ return getMatchesFrom (servant, current_object,
+ rule, sortby, TRUE, count, traverse, ev);
+ break;
+ case Accessibility_Collection_TREE_RESTRICT_SIBLING :
+ return getMatchesFrom (servant, current_object,
+ rule, sortby, FALSE, count, traverse, ev);
+ break;
+ case Accessibility_Collection_TREE_INORDER :
+ return getMatchesInOrder (servant, current_object,
+ rule, sortby, TRUE, count, traverse, ev);
+ break;
+ default : return CORBA_OBJECT_NIL;
+ }
+}
+static Accessibility_AccessibleSet *
+impl_getMatchesTo (PortableServer_Servant servant,
+ const Accessibility_Accessible current_object,
+ const Accessibility_MatchRule rule,
+ const Accessibility_Collection_SortOrder sortby,
+ const Accessibility_Collection_TreeTraversalType tree,
+ const CORBA_boolean recurse,
+ CORBA_long count,
+ const CORBA_boolean traverse,
+ CORBA_Environment *ev){
+
+ switch (tree){
+ case Accessibility_Collection_TREE_RESTRICT_CHILDREN :
+ return getMatchesTo (servant, current_object,
+ rule, sortby, recurse, TRUE, count, traverse, ev);
+ break;
+ case Accessibility_Collection_TREE_RESTRICT_SIBLING :
+ return getMatchesTo (servant, current_object,
+ rule, sortby, recurse, FALSE, count, traverse, ev);
+ break;
+ case Accessibility_Collection_TREE_INORDER :
+ return getMatchesInBackOrder (servant, current_object,
+ rule, sortby, count, ev);
+ break;
+ default : return CORBA_OBJECT_NIL;
+ }
+}
static Accessibility_AccessibleSet *
impl_getMatches (PortableServer_Servant servant,
@@ -729,7 +962,8 @@
ls = g_list_prepend (ls, obj);
mrp = get_collection_from_servant (servant)->_mrp;
- kount = query_exec (mrp, sortby, ls, 0, count, obj, 0, TRUE, CORBA_OBJECT_NIL, TRUE, traverse, ev);
+ kount = query_exec (mrp, sortby, ls, 0, count,
+ obj, 0, TRUE, CORBA_OBJECT_NIL, TRUE, traverse, ev);
ls = g_list_next (ls);
@@ -766,7 +1000,7 @@
spi_collection_init (SpiCollection *collection)
{
- //collection->_mrp = g_new (MatchRulePrivate, 1);
+ /* collection->_mrp = g_new (MatchRulePrivate, 1); */
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi-1.21.92/missing new/at-spi-1.22.0/missing
--- old/at-spi-1.21.92/missing 2008-02-25 08:44:45.000000000 +0100
+++ new/at-spi-1.22.0/missing 2008-03-10 11:08:27.000000000 +0100
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2005-06-08.21
+scriptversion=2006-05-10.23
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
@@ -33,6 +33,8 @@
fi
run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -44,7 +46,7 @@
msg="missing on your system"
-case "$1" in
+case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -77,6 +79,7 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -106,7 +109,7 @@
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
# the program).
-case "$1" in
+case $1 in
lex|yacc)
# Not GNU programs, they don't have --version.
;;
@@ -135,7 +138,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case "$1" in
+case $1 in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -164,7 +167,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -192,8 +195,8 @@
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
@@ -214,25 +217,25 @@
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
@@ -244,18 +247,18 @@
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
@@ -267,11 +270,9 @@
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- fi
- if [ -f "$file" ]; then
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
@@ -289,11 +290,17 @@
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
# ... or it is derived from the source name (dir/f.texi becomes f.info)
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
@@ -317,13 +324,13 @@
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi-1.21.92/NEWS new/at-spi-1.22.0/NEWS
--- old/at-spi-1.21.92/NEWS 2008-02-25 08:44:14.000000000 +0100
+++ new/at-spi-1.22.0/NEWS 2008-03-10 12:40:17.000000000 +0100
@@ -1,3 +1,8 @@
+What's new in at-spi-1.22.0:
+
+* Translation update.
+* Bugfixes: #496232.
+
What's new in at-spi-1.21.92:
* bugfixes: #508147, #517761, #517250, #512702.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi-1.21.92/po/ChangeLog new/at-spi-1.22.0/po/ChangeLog
--- old/at-spi-1.21.92/po/ChangeLog 2007-06-05 09:16:59.000000000 +0200
+++ new/at-spi-1.22.0/po/ChangeLog 2008-02-28 07:45:56.000000000 +0100
@@ -1,3 +1,9 @@
+2008-02-28 Li Yuan
+
+ * POTFILES.skip:
+ Added Accessibility_Registry.server.in to POTFILES.skip since
+ we have translation strings in Accessibility_Registry.server.in.in.
+
2006-03-30 Guntupalli Karunakar
* dz.po: Added Dzongkha translation.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi-1.21.92/po/POTFILES.skip new/at-spi-1.22.0/po/POTFILES.skip
--- old/at-spi-1.21.92/po/POTFILES.skip 2007-06-05 09:16:59.000000000 +0200
+++ new/at-spi-1.22.0/po/POTFILES.skip 2008-02-28 07:38:32.000000000 +0100
@@ -1,3 +1,4 @@
# List of source files containing strings that need not be translated.
# Please keep this file sorted alphabetically.
atk-bridge/bridge.c
+registryd/Accessibility_Registry.server.in
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi-1.21.92/README new/at-spi-1.22.0/README
--- old/at-spi-1.21.92/README 2008-02-25 08:42:03.000000000 +0100
+++ new/at-spi-1.22.0/README 2008-03-10 10:42:03.000000000 +0100
@@ -1,6 +1,6 @@
README
-at-spi version 1.21.92
+at-spi version 1.22.0
This version of at-spi requires atk 1.17.0 or later.
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org