Change FSF Address

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

diff --git a/gtk/a11y/gtkcomboboxaccessible.c b/gtk/a11y/gtkcomboboxaccessible.c
index 58f8763630cf6b22598288ca9557bf8f6a005be5..940d530d87c67576c79238f36611f7c2bb946c62 100644 (file)
--- a/gtk/a11y/gtkcomboboxaccessible.c
+++ b/gtk/a11y/gtkcomboboxaccessible.c
@@ -12,9 +12,7 @@
  * 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"
@@ -26,7 +24,7 @@
 static void atk_action_interface_init    (AtkActionIface    *iface);
 static void atk_selection_interface_init (AtkSelectionIface *iface);
 
-G_DEFINE_TYPE_WITH_CODE (GtkComboBoxAccessible, gtk_combo_box_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE,
+G_DEFINE_TYPE_WITH_CODE (GtkComboBoxAccessible, _gtk_combo_box_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE,
                          G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION, atk_action_interface_init)
                          G_IMPLEMENT_INTERFACE (ATK_TYPE_SELECTION, atk_selection_interface_init))
 
@@ -47,7 +45,7 @@ changed_cb (GtkWidget *widget)
     {
       accessible->old_selection = index;
       g_object_notify (G_OBJECT (obj), "accessible-name");
-      g_signal_emit_by_name (obj, "selection_changed");
+      g_signal_emit_by_name (obj, "selection-changed");
     }
 }
 
@@ -59,7 +57,7 @@ gtk_combo_box_accessible_initialize (AtkObject *obj,
   GtkComboBoxAccessible *accessible;
   AtkObject *popup;
 
-  ATK_OBJECT_CLASS (gtk_combo_box_accessible_parent_class)->initialize (obj, data);
+  ATK_OBJECT_CLASS (_gtk_combo_box_accessible_parent_class)->initialize (obj, data);
 
   combo_box = GTK_COMBO_BOX (data);
   accessible = GTK_COMBO_BOX_ACCESSIBLE (obj);
@@ -86,10 +84,10 @@ gtk_combo_box_accessible_finalize (GObject *object)
 
   g_free (combo_box->name);
 
-  G_OBJECT_CLASS (gtk_combo_box_accessible_parent_class)->finalize (object);
+  G_OBJECT_CLASS (_gtk_combo_box_accessible_parent_class)->finalize (object);
 }
 
-static const gchar*
+static const gchar *
 gtk_combo_box_accessible_get_name (AtkObject *obj)
 {
   GtkWidget *widget;
@@ -101,7 +99,7 @@ gtk_combo_box_accessible_get_name (AtkObject *obj)
   gint n_columns;
   gint i;
 
-  name = ATK_OBJECT_CLASS (gtk_combo_box_accessible_parent_class)->get_name (obj);
+  name = ATK_OBJECT_CLASS (_gtk_combo_box_accessible_parent_class)->get_name (obj);
   if (name)
     return name;
 
@@ -117,7 +115,7 @@ gtk_combo_box_accessible_get_name (AtkObject *obj)
       n_columns = gtk_tree_model_get_n_columns (model);
       for (i = 0; i < n_columns; i++)
         {
-          GValue value = { 0, };
+          GValue value = G_VALUE_INIT;
 
           gtk_tree_model_get_value (model, &iter, i, &value);
           if (G_VALUE_HOLDS_STRING (&value))
@@ -186,7 +184,7 @@ gtk_combo_box_accessible_ref_child (AtkObject *obj,
 }
 
 static void
-gtk_combo_box_accessible_class_init (GtkComboBoxAccessibleClass *klass)
+_gtk_combo_box_accessible_class_init (GtkComboBoxAccessibleClass *klass)
 {
   GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
   AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
@@ -200,7 +198,7 @@ gtk_combo_box_accessible_class_init (GtkComboBoxAccessibleClass *klass)
 }
 
 static void
-gtk_combo_box_accessible_init (GtkComboBoxAccessible *combo_box)
+_gtk_combo_box_accessible_init (GtkComboBoxAccessible *combo_box)
 {
   combo_box->old_selection = -1;
   combo_box->name = NULL;
@@ -222,18 +220,17 @@ gtk_combo_box_accessible_do_action (AtkAction *action,
   if (!gtk_widget_get_sensitive (widget) || !gtk_widget_get_visible (widget))
     return FALSE;
 
-  if (i == 0)
-    {
-      combo_box = GTK_COMBO_BOX (widget);
-      g_object_get (combo_box, "popup-shown", &popup_shown, NULL);
-      if (popup_shown)
-        gtk_combo_box_popdown (combo_box);
-      else
-        gtk_combo_box_popup (combo_box);
-      return TRUE;
-    }
-  else
+  if (i != 0)
     return FALSE;
+
+  combo_box = GTK_COMBO_BOX (widget);
+  g_object_get (combo_box, "popup-shown", &popup_shown, NULL);
+  if (popup_shown)
+    gtk_combo_box_popdown (combo_box);
+  else
+    gtk_combo_box_popup (combo_box);
+
+  return TRUE;
 }
 
 static gint
@@ -274,7 +271,7 @@ gtk_combo_box_accessible_get_keybinding (AtkAction *action,
     {
       target = atk_relation_get_target (relation);
       target_object = g_ptr_array_index (target, 0);
-      widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (target_object));
+      label = gtk_accessible_get_widget (GTK_ACCESSIBLE (target_object));
     }
   g_object_unref (set);
   if (GTK_IS_LABEL (label))