Hello community,
here is the log from the commit of package libgail-gnome
checked in at Wed Aug 16 01:42:37 CEST 2006.
--------
--- GNOME/libgail-gnome/libgail-gnome.changes 2006-01-25 21:32:18.000000000 +0100
+++ libgail-gnome/libgail-gnome.changes 2006-08-15 22:42:26.000000000 +0200
@@ -1,0 +2,6 @@
+Tue Aug 15 22:41:11 CEST 2006 - jhargadon@suse.de
+
+- update to version 1.1.3
+- configure.in, NEWS, README: Rev to 1.1.3
+
+-------------------------------------------------------------------
Old:
----
libgail-gnome-1.1.2.tar.bz2
New:
----
libgail-gnome-1.1.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libgail-gnome.spec ++++++
--- /var/tmp/diff_new_pack.0eDR79/_old 2006-08-16 01:41:38.000000000 +0200
+++ /var/tmp/diff_new_pack.0eDR79/_new 2006-08-16 01:41:38.000000000 +0200
@@ -1,19 +1,19 @@
#
-# spec file for package libgail-gnome (Version 1.1.2)
+# spec file for package libgail-gnome (Version 1.1.3)
#
-# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
-# Please submit bugfixes or comments via http://bugs.opensuse.org
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
Name: libgail-gnome
BuildRequires: at-spi-devel gail-devel gnome-panel-devel gnutls-devel libgnomeprintui-devel libwnck-devel mDNSResponder-devel update-desktop-files
-Version: 1.1.2
-Release: 2
+Version: 1.1.3
+Release: 1
URL: http://www.gnome.org/
Group: System/GUI/GNOME
License: LGPL
@@ -84,6 +84,9 @@
/opt/gnome/%{_lib}/pkgconfig/*.pc
%changelog -n libgail-gnome
+* Tue Aug 15 2006 - jhargadon@suse.de
+- update to version 1.1.3
+- configure.in, NEWS, README: Rev to 1.1.3
* Wed Jan 25 2006 - mls@suse.de
- converted neededforbuild to BuildRequires
* Wed Nov 30 2005 - gekker@suse.de
++++++ libgail-gnome-1.1.2.tar.bz2 -> libgail-gnome-1.1.3.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libgail-gnome-1.1.2/ChangeLog new/libgail-gnome-1.1.3/ChangeLog
--- old/libgail-gnome-1.1.2/ChangeLog 2005-11-18 17:51:59.000000000 +0100
+++ new/libgail-gnome-1.1.3/ChangeLog 2006-01-27 18:44:08.000000000 +0100
@@ -1,7 +1,22 @@
-2005-11-18 Bill Haneman
+2006-01-28 Bill Haneman
+
+ * configure.in, NEWS, README: Rev to 1.1.3.
+
+ * gail-gnome/bonobo-accessibility-init.c:
+ (impl_bonobo_control_frame_get_parent_accessible):
+ Revert this change, as it was incorrect. This method
+ should return the parent object after all.
+ * gail-gnome/bonobo_socket_atk_object.c:
+ (bonobo_socket_atk_object_get_accessible):
+ Revert previous change.
+
+2005-11-18 Bill Haneman
+
Consistency fixes for parent-child hierarchy
- of embedded widgets.
+ of embedded widgets (bug #321814).
+
+ * configure.in, README, NEWS: Revved to 1.1.2.
* gail-gnome/bonobo-accessibility-init.c:
(impl_bonobo_control_frame_get_parent_accessible):
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libgail-gnome-1.1.2/NEWS new/libgail-gnome-1.1.3/NEWS
--- old/libgail-gnome-1.1.2/NEWS 2005-11-18 17:53:54.000000000 +0100
+++ new/libgail-gnome-1.1.3/NEWS 2005-11-18 18:12:02.000000000 +0100
@@ -2,7 +2,7 @@
===========================
* Important bugfix for parent/child hierarchy of embedded
- objects.
+ objects (bugzilla #321814)
What's new in version 1.1.1:
===========================
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libgail-gnome-1.1.2/configure new/libgail-gnome-1.1.3/configure
--- old/libgail-gnome-1.1.2/configure 2005-11-18 17:55:38.000000000 +0100
+++ new/libgail-gnome-1.1.3/configure 2006-01-30 17:42:17.000000000 +0100
@@ -1503,9 +1503,9 @@
GAIL_GNOME_MAJOR_VERSION=1
GAIL_GNOME_MINOR_VERSION=1
-GAIL_GNOME_MICRO_VERSION=2
-GAIL_GNOME_INTERFACE_AGE=2
-GAIL_GNOME_BINARY_AGE=2
+GAIL_GNOME_MICRO_VERSION=3
+GAIL_GNOME_INTERFACE_AGE=3
+GAIL_GNOME_BINARY_AGE=3
GAIL_GNOME_VERSION=$GAIL_GNOME_MAJOR_VERSION.$GAIL_GNOME_MINOR_VERSION.$GAIL_GNOME_MICRO_VERSION
am__api_version="1.4"
ac_aux_dir=
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libgail-gnome-1.1.2/configure.in new/libgail-gnome-1.1.3/configure.in
--- old/libgail-gnome-1.1.2/configure.in 2005-11-18 17:52:59.000000000 +0100
+++ new/libgail-gnome-1.1.3/configure.in 2006-01-27 18:45:36.000000000 +0100
@@ -6,9 +6,9 @@
GAIL_GNOME_MAJOR_VERSION=1
GAIL_GNOME_MINOR_VERSION=1
-GAIL_GNOME_MICRO_VERSION=2
-GAIL_GNOME_INTERFACE_AGE=2
-GAIL_GNOME_BINARY_AGE=2
+GAIL_GNOME_MICRO_VERSION=3
+GAIL_GNOME_INTERFACE_AGE=3
+GAIL_GNOME_BINARY_AGE=3
GAIL_GNOME_VERSION=$GAIL_GNOME_MAJOR_VERSION.$GAIL_GNOME_MINOR_VERSION.$GAIL_GNOME_MICRO_VERSION
AM_INIT_AUTOMAKE(libgail-gnome, $GAIL_GNOME_VERSION)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libgail-gnome-1.1.2/gail-gnome/bonobo-accessibility-init.c new/libgail-gnome-1.1.3/gail-gnome/bonobo-accessibility-init.c
--- old/libgail-gnome-1.1.2/gail-gnome/bonobo-accessibility-init.c 2005-11-18 17:45:16.000000000 +0100
+++ new/libgail-gnome-1.1.3/gail-gnome/bonobo-accessibility-init.c 2006-01-30 19:51:27.000000000 +0100
@@ -48,6 +48,8 @@
{
BonoboControlFrame *control_frame = BONOBO_CONTROL_FRAME (bonobo_object_from_servant (servant));
AtkObject *atko;
+ AtkObject *parent;
+ SpiAccessible *co = NULL;
dprintf ("Bonobo::ControlFame::getParentAccessible [%p]\n", control_frame);
@@ -56,8 +58,11 @@
atko = gtk_widget_get_accessible (
bonobo_control_frame_get_widget (control_frame));
- return CORBA_Object_duplicate (
- BONOBO_OBJREF (spi_accessible_new (atko)), ev);
+ parent = atk_object_get_parent (atko);
+
+ if (parent) co = spi_accessible_new (parent);
+
+ return (co != NULL) ? CORBA_Object_duplicate (BONOBO_OBJREF (co), ev) : CORBA_OBJECT_NIL;
}
static Bonobo_Unknown
@@ -65,13 +70,17 @@
CORBA_Environment *ev)
{
BonoboControl *control = BONOBO_CONTROL (bonobo_object_from_servant (servant));
+ BonoboControlAccessible *co = NULL;
dprintf ("Bonobo::Control::getAccessible [%p]\n", control);
g_return_val_if_fail (control != NULL, CORBA_OBJECT_NIL);
- return CORBA_Object_duplicate (
- BONOBO_OBJREF (bonobo_control_accessible_new (control)), ev);
+ co = bonobo_control_accessible_new (control);
+
+ if (co != NULL) g_assert (BONOBO_IS_CONTROL_ACCESSIBLE (co));
+
+ return (co != NULL) ? CORBA_Object_duplicate (BONOBO_OBJREF (co), ev) : CORBA_OBJECT_NIL;
}
static void
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libgail-gnome-1.1.2/gail-gnome/bonobo-control-accessible.c new/libgail-gnome-1.1.3/gail-gnome/bonobo-control-accessible.c
--- old/libgail-gnome-1.1.2/gail-gnome/bonobo-control-accessible.c 2002-04-19 12:01:38.000000000 +0200
+++ new/libgail-gnome-1.1.3/gail-gnome/bonobo-control-accessible.c 2006-01-30 20:38:21.000000000 +0100
@@ -66,12 +66,18 @@
GtkWidget *widget;
AtkObject *atko;
+ dprintf ("bonobo_control_accessible_new [%p]\n", control);
+
g_return_val_if_fail (BONOBO_IS_CONTROL (control), NULL);
/* FIXME: should use bonobo_control_get_plug_here */
widget = bonobo_control_get_widget (control);
- g_assert (GTK_IS_PLUG (widget->parent));
+ if (!GTK_IS_PLUG (widget->parent))
+ {
+ dprintf ("PLUG IS GONE\n");
+ return NULL;
+ }
atko = gtk_widget_get_accessible (widget->parent);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libgail-gnome-1.1.2/gail-gnome/bonobo-control-frame-accessible.c new/libgail-gnome-1.1.3/gail-gnome/bonobo-control-frame-accessible.c
--- old/libgail-gnome-1.1.2/gail-gnome/bonobo-control-frame-accessible.c 2002-04-19 12:01:38.000000000 +0200
+++ new/libgail-gnome-1.1.3/gail-gnome/bonobo-control-frame-accessible.c 2006-01-30 19:39:00.000000000 +0100
@@ -27,9 +27,12 @@
impl_bonobo_control_frame_accessible_get_child_count (PortableServer_Servant servant,
CORBA_Environment *ev)
{
- BonoboControlFrameAccessible *frame_accessible =
- BONOBO_CONTROL_FRAME_ACCESSIBLE (bonobo_object_from_servant (servant));
-
+ BonoboControlFrameAccessible *frame_accessible = NULL;
+ if (BONOBO_IS_CONTROL_FRAME_ACCESSIBLE (bonobo_object_from_servant (servant)))
+ {
+ frame_accessible =
+ BONOBO_CONTROL_FRAME_ACCESSIBLE (bonobo_object_from_servant (servant));
+ }
dprintf ("Accessibility::Accessible::_get_ChildCount [%p]\n", frame_accessible);
g_return_val_if_fail (frame_accessible != NULL, 0);
@@ -44,8 +47,12 @@
CORBA_long index,
CORBA_Environment *ev)
{
- BonoboControlFrameAccessible *frame_accessible =
- BONOBO_CONTROL_FRAME_ACCESSIBLE (bonobo_object_from_servant (servant));
+ BonoboControlFrameAccessible *frame_accessible = NULL;
+ if (BONOBO_IS_CONTROL_FRAME_ACCESSIBLE (bonobo_object_from_servant (servant)))
+ {
+ frame_accessible =
+ BONOBO_CONTROL_FRAME_ACCESSIBLE (bonobo_object_from_servant (servant));
+ }
Bonobo_Control control;
dprintf ("Accessibility::Accessible::getChildAtIndex [%p]\n", frame_accessible);
@@ -56,6 +63,8 @@
control = bonobo_control_frame_get_control (frame_accessible->control_frame);
+ g_return_val_if_fail (control != NULL, CORBA_OBJECT_NIL);
+
return Bonobo_Control_getAccessible (control, ev);
}
@@ -85,6 +94,8 @@
GtkWidget *widget;
AtkObject *atko;
+ dprintf ("bonobo_control_frame_accessible_new [%p]\n", control_frame);
+
g_return_val_if_fail (control_frame != NULL, NULL);
widget = bonobo_control_frame_get_widget (control_frame);
g_assert (widget != NULL);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libgail-gnome-1.1.2/gail-gnome/bonobo_socket_atk_object.c new/libgail-gnome-1.1.3/gail-gnome/bonobo_socket_atk_object.c
--- old/libgail-gnome-1.1.2/gail-gnome/bonobo_socket_atk_object.c 2005-09-28 14:34:26.000000000 +0200
+++ new/libgail-gnome-1.1.3/gail-gnome/bonobo_socket_atk_object.c 2006-01-30 20:40:08.000000000 +0100
@@ -23,6 +23,8 @@
#include
#include "bonobo_socket_atk_object.h"
#include "gail-gnome-debug.h"
+#include
+#include
static GQuark quark_private_frame = 0;
@@ -45,18 +47,25 @@
g_return_val_if_fail (BONOBO_IS_SOCKET_ATK_OBJECT (remote), CORBA_OBJECT_NIL);
frame = bonobo_socket_atk_object_get_frame (BONOBO_SOCKET_ATK_OBJECT (remote));
- g_return_val_if_fail (BONOBO_IS_CONTROL_FRAME (frame), CORBA_OBJECT_NIL);
+
+ if (!BONOBO_IS_CONTROL_FRAME (frame))
+ {
+ dprintf ("CONTROL FRAME IS GONE\n");
+ return CORBA_OBJECT_NIL;
+ }
control = bonobo_control_frame_get_control (frame);
g_return_val_if_fail (control != CORBA_OBJECT_NIL, CORBA_OBJECT_NIL);
CORBA_exception_init (&env);
- retval = Bonobo_ControlFrame_getParentAccessible (control, &env);
+ retval = Bonobo_Control_getAccessible (control, &env);
g_return_val_if_fail (retval != CORBA_OBJECT_NIL, CORBA_OBJECT_NIL);
if (BONOBO_EX (&env))
+ {
+ dprintf ("%s\n", bonobo_exception_get_text (&env));
retval = CORBA_OBJECT_NIL;
-
+ }
CORBA_exception_free (&env);
return retval;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libgail-gnome-1.1.2/test/test-gail-gnome.c new/libgail-gnome-1.1.3/test/test-gail-gnome.c
--- old/libgail-gnome-1.1.2/test/test-gail-gnome.c 2002-04-19 12:01:38.000000000 +0200
+++ new/libgail-gnome-1.1.3/test/test-gail-gnome.c 2006-01-27 17:14:30.000000000 +0100
@@ -59,7 +59,7 @@
setup_outproc_control (void)
{
AtkObject *atko;
- outproc_widget = bonobo_widget_new_control ("OAFIID:Bonobo_Sample_Entry", NULL);
+ outproc_widget = bonobo_widget_new_control ("OAFIID:GNOME_ClockApplet", NULL);
atko = gtk_widget_get_accessible (outproc_widget);
atk_object_set_name (atko, "outproc control");
gtk_widget_show (GTK_WIDGET (outproc_widget));
@@ -72,6 +72,7 @@
AtkObject *socket_obj;
Accessibility_Accessible accessible;
Accessibility_Accessible parent;
+ Accessibility_Accessible child;
Accessibility_Accessible tmp;
CORBA_long num_children;
CORBA_Environment env;
@@ -94,20 +95,53 @@
parent = Accessibility_Accessible__get_parent (accessible, &env);
g_assert (env._major == CORBA_NO_EXCEPTION);
g_assert (accessible != CORBA_OBJECT_NIL);
-
- num_children = Accessibility_Accessible__get_childCount (accessible, &env);
- g_assert (env._major == CORBA_NO_EXCEPTION);
- g_assert (num_children == 1);
+ fprintf (stderr, "parent: [%p] [%s]\n",
+ parent, Accessibility_Accessible_getRoleName (parent, &env));
num_children = Accessibility_Accessible__get_childCount (parent, &env);
g_assert (env._major == CORBA_NO_EXCEPTION);
g_assert (num_children == 1);
+ fprintf (stderr, "remote accessible (1 of %d children) [%p] [%s]\n",
+ num_children, accessible, Accessibility_Accessible_getRoleName (accessible, &env));
+
tmp = Accessibility_Accessible_getChildAtIndex (parent, 0, &env);
g_assert (env._major == CORBA_NO_EXCEPTION);
g_assert (CORBA_Object_is_equivalent (accessible, tmp, &env));
g_assert (env._major == CORBA_NO_EXCEPTION);
+ num_children = Accessibility_Accessible__get_childCount (accessible, &env);
+ g_assert (env._major == CORBA_NO_EXCEPTION);
+ g_assert (num_children == 1);
+
+ child = Accessibility_Accessible_getChildAtIndex (accessible, 0, &env);
+ g_assert (env._major == CORBA_NO_EXCEPTION);
+ fprintf (stderr, "child: (1 of %d) [%p] [%s]\n",
+ num_children, child, Accessibility_Accessible_getRoleName (child, &env));
+
+ parent = Accessibility_Accessible__get_parent (child, &env);
+ g_assert (env._major == CORBA_NO_EXCEPTION);
+ g_assert (parent != CORBA_OBJECT_NIL);
+ g_assert (CORBA_Object_is_equivalent (accessible, parent, &env));
+ g_assert (env._major == CORBA_NO_EXCEPTION);
+
+ num_children = Accessibility_Accessible__get_childCount (child, &env);
+ g_assert (env._major == CORBA_NO_EXCEPTION);
+
+ if (num_children > 0)
+ {
+ tmp = Accessibility_Accessible_getChildAtIndex (child, 0, &env);
+ g_assert (env._major == CORBA_NO_EXCEPTION);
+ fprintf (stderr, "grandchild: (1 of %d) [%p] [%s]\n",
+ num_children, tmp, Accessibility_Accessible_getRoleName (tmp, &env));
+
+ parent = Accessibility_Accessible__get_parent (tmp, &env);
+ g_assert (env._major == CORBA_NO_EXCEPTION);
+ g_assert (parent != CORBA_OBJECT_NIL);
+ g_assert (CORBA_Object_is_equivalent (child, parent, &env));
+ g_assert (env._major == CORBA_NO_EXCEPTION);
+ }
+ fprintf (stderr, "parent-child relationships OK.\n");
CORBA_exception_free (&env);
}
@@ -124,11 +158,17 @@
test_spi_stuff (BONOBO_WIDGET (inproc_widget));
test_spi_stuff (BONOBO_WIDGET (outproc_widget));
-
- gtk_main ();
- gtk_widget_destroy (inproc_widget);
+ fprintf (stderr, "destroying components...\n");
+}
+
+gboolean
+end_test (void *data)
+{
gtk_widget_destroy (outproc_widget);
+ gtk_widget_destroy (inproc_widget);
+ gtk_main_quit ();
+ return FALSE;
}
int
@@ -145,9 +185,14 @@
argc, argv, NULL);
SPI_init ();
-
+
test_gail_gnome ();
+ /* If you want to at-poke this test program instead of run batch, comment this out! */
+ g_idle_add (end_test, NULL);
+
+ gtk_main ();
+
if ((leaked = SPI_exit ()))
g_error ("Leaked %d SPI handles", leaked);
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org