Change FSF Address

[~andy/gtk] / gtk / a11y / gtkexpanderaccessible.c

diff --git a/gtk/a11y/gtkexpanderaccessible.c b/gtk/a11y/gtkexpanderaccessible.c
index 3ad5bd281db0d0240174a1b194f9da16204e1131..9cd6a0ec738e9272e26b985fb5f0eec4fa227301 100644 (file)
--- a/gtk/a11y/gtkexpanderaccessible.c
+++ b/gtk/a11y/gtkexpanderaccessible.c
@@ -12,20 +12,17 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
 
-#include <string.h>
 #include <gtk/gtk.h>
 #include "gtkexpanderaccessible.h"
 
 static void atk_action_interface_init (AtkActionIface *iface);
 
-G_DEFINE_TYPE_WITH_CODE (GtkExpanderAccessible, gtk_expander_accessible, GAIL_TYPE_CONTAINER,
+G_DEFINE_TYPE_WITH_CODE (GtkExpanderAccessible, _gtk_expander_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE,
                          G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION, atk_action_interface_init))
 
 static const gchar *
@@ -51,7 +48,7 @@ gtk_expander_accessible_get_name (AtkObject *obj)
   if (widget == NULL)
     return NULL;
 
-  name = ATK_OBJECT_CLASS (gtk_expander_accessible_parent_class)->get_name (obj);
+  name = ATK_OBJECT_CLASS (_gtk_expander_accessible_parent_class)->get_name (obj);
   if (name != NULL)
     return name;
 
@@ -79,7 +76,7 @@ gtk_expander_accessible_get_n_children (AtkObject *obj)
   if (gtk_expander_get_label_widget (GTK_EXPANDER (widget)))
     count -= 1;
 
-  return count; 
+  return count;
 }
 
 static AtkObject *
@@ -132,7 +129,7 @@ static void
 gtk_expander_accessible_initialize (AtkObject *obj,
                                     gpointer   data)
 {
-  ATK_OBJECT_CLASS (gtk_expander_accessible_parent_class)->initialize (obj, data);
+  ATK_OBJECT_CLASS (_gtk_expander_accessible_parent_class)->initialize (obj, data);
 
   obj->role = ATK_ROLE_TOGGLE_BUTTON;
 }
@@ -147,25 +144,25 @@ gtk_expander_accessible_notify_gtk (GObject    *obj,
   expander = GTK_EXPANDER (obj);
   atk_obj = gtk_widget_get_accessible (GTK_WIDGET (expander));
 ;
-  if (strcmp (pspec->name, "label") == 0)
+  if (g_strcmp0 (pspec->name, "label") == 0)
     {
       if (atk_obj->name == NULL)
         g_object_notify (G_OBJECT (atk_obj), "accessible-name");
-      g_signal_emit_by_name (atk_obj, "visible_data_changed");
+      g_signal_emit_by_name (atk_obj, "visible-data-changed");
     }
-  else if (strcmp (pspec->name, "expanded") == 0)
+  else if (g_strcmp0 (pspec->name, "expanded") == 0)
     {
       atk_object_notify_state_change (atk_obj, ATK_STATE_CHECKED,
                                       gtk_expander_get_expanded (expander));
       atk_object_notify_state_change (atk_obj, ATK_STATE_EXPANDED,
                                       gtk_expander_get_expanded (expander));
-      g_signal_emit_by_name (atk_obj, "visible_data_changed");
+      g_signal_emit_by_name (atk_obj, "visible-data-changed");
     }
   else
-    GAIL_WIDGET_CLASS (gtk_expander_accessible_parent_class)->notify_gtk (obj, pspec);
+    GTK_WIDGET_ACCESSIBLE_CLASS (_gtk_expander_accessible_parent_class)->notify_gtk (obj, pspec);
 }
 
-static AtkStateSet*
+static AtkStateSet *
 gtk_expander_accessible_ref_state_set (AtkObject *obj)
 {
   AtkStateSet *state_set;
@@ -176,7 +173,7 @@ gtk_expander_accessible_ref_state_set (AtkObject *obj)
   if (widget == NULL)
     return NULL;
 
-  state_set = ATK_OBJECT_CLASS (gtk_expander_accessible_parent_class)->ref_state_set (obj);
+  state_set = ATK_OBJECT_CLASS (_gtk_expander_accessible_parent_class)->ref_state_set (obj);
 
   expander = GTK_EXPANDER (widget);
 
@@ -192,10 +189,10 @@ gtk_expander_accessible_ref_state_set (AtkObject *obj)
 }
 
 static void
-gtk_expander_accessible_class_init (GtkExpanderAccessibleClass *klass)
+_gtk_expander_accessible_class_init (GtkExpanderAccessibleClass *klass)
 {
   AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
-  GailWidgetClass *widget_class = (GailWidgetClass*)klass;
+  GtkWidgetAccessibleClass *widget_class = (GtkWidgetAccessibleClass*)klass;
 
   widget_class->notify_gtk = gtk_expander_accessible_notify_gtk;
 
@@ -208,7 +205,7 @@ gtk_expander_accessible_class_init (GtkExpanderAccessibleClass *klass)
 }
 
 static void
-gtk_expander_accessible_init (GtkExpanderAccessible *expander)
+_gtk_expander_accessible_init (GtkExpanderAccessible *expander)
 {
 }
 
@@ -226,7 +223,7 @@ gtk_expander_accessible_do_action (AtkAction *action,
     return FALSE;
 
   if (i != 0)
-     return FALSE;
+    return FALSE;
 
   gtk_widget_activate (widget);
   return TRUE;