Bugfix for remote spi_accessible objects, in accessible.c.

Added a diagnostic message to magnifier.

git-svn-id: http://svn.gnome.org/svn/at-spi/trunk@204 e2bd861d-eb25-0410-b326-f6ed22b6b98c

diff --git a/ChangeLog b/ChangeLog
index ae22c96..8d755f6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-01-09  Bill Haneman <bill.haneman@sun.com>
+
+       * libspi/accessible.c: (spi_accessible_new) :
+       Move the test for SPI_IS_REMOTE_OBJECT to
+       spi_accessible_new_return, fixing a bug and compile time warning.
+       
 2002-01-08  Michael Meeks  <michael@ximian.com>
 
        * registryd/registry.c (parse_event_type): remove strndup.

diff --git a/libspi/accessible.c b/libspi/accessible.c
index 445b5fd..39bde6a 100644 (file)
--- a/libspi/accessible.c
+++ b/libspi/accessible.c
@@ -452,10 +452,6 @@ spi_accessible_new (AtkObject *o)
        return retval;
       }
 
-   else if (SPI_IS_REMOTE_OBJECT (o))
-     {
-       retval = spi_remote_object_get_accessible (SPI_REMOTE_OBJECT (o)); 
-     }
    else
      {
        retval = g_object_new (SPI_ACCESSIBLE_TYPE, NULL);
@@ -543,18 +539,26 @@ spi_accessible_new_return (AtkObject         *o,
                           CORBA_Environment *ev)
 {
   SpiAccessible *accessible;
+  Accessibility_Accessible retval;
 
   if (!o)
     {
       return CORBA_OBJECT_NIL;
     }
-
-  accessible = spi_accessible_new (o);
+  else if (SPI_IS_REMOTE_OBJECT (o))
+    {
+      retval = spi_remote_object_get_accessible (SPI_REMOTE_OBJECT (o)); 
+    }
+  else
+    {
+      accessible = spi_accessible_new (o);
+      retval = CORBA_Object_duplicate (BONOBO_OBJREF (accessible), ev); 
+    }
 
   if (release_ref)
     {
       g_object_unref (G_OBJECT (o));
     }
-
-  return CORBA_Object_duplicate (BONOBO_OBJREF (accessible), ev);
+  
+  return retval;
 }

diff --git a/util/magnifier.c b/util/magnifier.c
index 31acb01..19c52cb 100644 (file)
--- a/util/magnifier.c
+++ b/util/magnifier.c
@@ -241,10 +241,12 @@ int main (int argc, char** argv){
   else magnifier->mag_data->mag_height = DisplayHeight (magnifier->mag_data->target_display, screen_num);
   gtk_window_set_decorated(GTK_WINDOW (window), FALSE);
   gtk_widget_show_all (window);
-
+  
   gdk_window_move(window->window,
                  gdk_screen_width() - magnifier->mag_data->mag_width,
                  gdk_screen_height() - magnifier->mag_data->mag_height);
+  g_print ("setting size to %d by %d pixels\n",
+          magnifier->mag_data->mag_width, magnifier->mag_data->mag_height);
   gdk_window_resize (window->window, magnifier->mag_data->mag_width, magnifier->mag_data->mag_height);
   magnifier->mag_data->output_window = window;
   if (global_options.fullscreen) gdk_window_stick (window->window);