Merge lp:~themuso/notify-osd/fix-accessibility into lp:notify-osd/oneiric

[Luke Yelavich]

[Mirco Müller (macslow)]

Mostly ok, but please always initialize every variable declared.

122 + AtkRegistry *default_registry = atk_get_default_registry ();
123 + AtkObjectFactory *factory;
124 + AtkObject *accessible;

review: Needs Fixing

[lp:~themuso/notify-osd/fix-accessibility]

446. By Luke Yelavich on 2012-01-05

Initialize declared variables

[Luke Yelavich (themuso)]

Done.

review: Needs Resubmitting

[Mirco Müller (macslow)]

All fine now. Passes also "make check" and all stand-alone tests.

review: Approve

=== modified file 'src/bubble-window-accessible.c'
--- src/bubble-window-accessible.c	2010-10-05 17:54:42 +0000
+++ src/bubble-window-accessible.c	2012-01-05 00:37:29 +0000
@@ -63,70 +63,9 @@
 
 static void* bubble_window_accessible_parent_class;
 
-GType
-bubble_window_accessible_get_type (void)
-{
-    static GType type = 0;
-    
-    if (!type) 
-    {
-        GTypeInfo tinfo = 
-        {
-            sizeof (BubbleWindowAccessibleClass),
-            (GBaseInitFunc) bubble_window_accessible_init, /* base init */
-            (GBaseFinalizeFunc) bubble_window_accessible_finalize, /* base finalize */
-            (GClassInitFunc) bubble_window_accessible_class_init, /* class init */
-            (GClassFinalizeFunc) NULL, /* class finalize */
-            NULL, /* class data */
-            sizeof (BubbleWindowAccessible), /* instance size */
-            0, /* nb preallocs */
-            NULL, /* instance init */
-            NULL /* value table */
-        };
-                
-        const GInterfaceInfo atk_value_info = 
-        {
-            (GInterfaceInitFunc) atk_value_interface_init,
-            (GInterfaceFinalizeFunc) NULL,
-            NULL
-        };
-
-        const GInterfaceInfo atk_text_info = 
-        {
-            (GInterfaceInitFunc) atk_text_interface_init,
-            (GInterfaceFinalizeFunc) NULL,
-            NULL
-        };
-        
-        /*
-         * Figure out the size of the class and instance
-         * we are deriving from
-         */
-        AtkObjectFactory *factory;
-        GType derived_type;
-        GTypeQuery query;
-        GType derived_atk_type;
-        
-        derived_type = g_type_parent (BUBBLE_TYPE_WINDOW);  
-        
-        factory = atk_registry_get_factory (atk_get_default_registry (),
-                                            derived_type);
-        derived_atk_type = atk_object_factory_get_accessible_type (factory);
-        
-        g_type_query (derived_atk_type, &query);
-        tinfo.class_size = query.class_size;
-        tinfo.instance_size = query.instance_size;
-        
-        type = g_type_register_static (derived_atk_type,
-                                       "BubbleWindowAccessible", &tinfo, 0);
-
-        g_type_add_interface_static (type, ATK_TYPE_VALUE, &atk_value_info);
-
-        g_type_add_interface_static (type, ATK_TYPE_TEXT, &atk_text_info);
-    }
-    
-    return type;
-}
+G_DEFINE_TYPE_WITH_CODE (BubbleWindowAccessible, bubble_window_accessible, GTK_TYPE_ACCESSIBLE,
+                         G_IMPLEMENT_INTERFACE (ATK_TYPE_TEXT, atk_text_interface_init)
+                         G_IMPLEMENT_INTERFACE (ATK_TYPE_VALUE, atk_value_interface_init))
 
 static void
 atk_value_interface_init (AtkValueIface* iface)
@@ -204,6 +143,7 @@
                       G_CALLBACK (bubble_message_body_inserted_event),
                       obj);
 
+    atk_object_set_role (obj, ATK_ROLE_NOTIFICATION);
 }
 
 AtkObject*

=== modified file 'src/bubble-window.c'
--- src/bubble-window.c	2009-02-27 20:00:53 +0000
+++ src/bubble-window.c	2012-01-05 00:37:29 +0000
@@ -72,13 +72,14 @@
 bubble_window_get_accessible (GtkWidget *widget)
 {
   static gboolean first_time = TRUE;
+  static GQuark quark_accessible_object;
 
   if (first_time) 
     {
-      AtkObjectFactory *factory;
-      AtkRegistry *registry;
-      GType derived_type;
-      GType derived_atk_type;
+      AtkObjectFactory *factory = NULL;
+      AtkRegistry *registry = NULL;
+      GType derived_type = NULL;
+      GType derived_atk_type = NULL;
 
       /*
        * Figure out whether accessibility is enabled by looking at the
@@ -91,19 +92,24 @@
       factory = atk_registry_get_factory (registry,
                                           derived_type);
       derived_atk_type = atk_object_factory_get_accessible_type (factory);
-
-      if (g_type_is_a (derived_atk_type, GTK_TYPE_ACCESSIBLE)) 
-        {
-			/*
-			 * Specify what factory to use to create accessible
-			 * objects
-			 */
-			atk_registry_set_factory_type (registry,
-										   BUBBLE_TYPE_WINDOW,
-										   BUBBLE_WINDOW_TYPE_ACCESSIBLE_FACTORY);
-
-		}
+      atk_registry_set_factory_type (registry,
+                                     BUBBLE_TYPE_WINDOW,
+                                     BUBBLE_WINDOW_TYPE_ACCESSIBLE_FACTORY);
+      quark_accessible_object = g_quark_from_static_string ("gtk-accessible-object");
       first_time = FALSE;
     }
-  return GTK_WIDGET_CLASS (bubble_window_parent_class)->get_accessible (widget);
+
+    AtkRegistry *default_registry = atk_get_default_registry ();
+    AtkObjectFactory *factory = NULL;
+    AtkObject *accessible = g_object_get_qdata (G_OBJECT (widget),
+                                                quark_accessible_object);
+    if (accessible)
+        return accessible;
+    factory = atk_registry_get_factory (default_registry,
+                                        G_TYPE_FROM_INSTANCE (widget));
+    accessible = atk_object_factory_create_accessible (factory,
+                                                       G_OBJECT (widget));
+    g_object_set_qdata (G_OBJECT (widget), quark_accessible_object,
+                        accessible);
+    return accessible;
 }