From 01dd0eb4c2ba4bda8e7cb3693808ae91bf340729 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Wed, 22 Oct 2014 23:10:45 -0400
Subject: [PATCH] Revert "Implement support for ATK_STATE_HAS_TOOLTIP"

This reverts commit ad6de7637b563d9b0efe5abcb44586cfe2be18b8.

This requires new atk API that is not available in 2.14.0.
---
 gtk/a11y/gtkwidgetaccessible.c |  8 ----
 testsuite/a11y/Makefile.am     |  1 -
 testsuite/a11y/tooltips.txt    | 78 ----------------------------------
 testsuite/a11y/tooltips.ui     | 33 --------------
 4 files changed, 120 deletions(-)
 delete mode 100644 testsuite/a11y/tooltips.txt
 delete mode 100644 testsuite/a11y/tooltips.ui

diff --git a/gtk/a11y/gtkwidgetaccessible.c b/gtk/a11y/gtkwidgetaccessible.c
index ffa42a278a..f1167f1d5d 100644
--- a/gtk/a11y/gtkwidgetaccessible.c
+++ b/gtk/a11y/gtkwidgetaccessible.c
@@ -395,9 +395,6 @@ gtk_widget_accessible_ref_state_set (AtkObject *accessible)
           else
             atk_state_set_add_state (state_set, ATK_STATE_VERTICAL);
         }
-
-      if (gtk_widget_get_has_tooltip (widget))
-        atk_state_set_add_state (state_set, ATK_STATE_HAS_TOOLTIP);
     }
   return state_set;
 }
@@ -505,11 +502,6 @@ gtk_widget_accessible_notify_gtk (GObject    *obj,
       state = ATK_STATE_HORIZONTAL;
       value = (gtk_orientable_get_orientation (orientable) == GTK_ORIENTATION_HORIZONTAL);
     }
-  else if (g_strcmp0 (pspec->name, "has-tooltip") == 0)
-    {
-      state = ATK_STATE_HAS_TOOLTIP;
-      value = gtk_widget_get_has_tooltip (widget);
-    }
   else
     return;
 
diff --git a/testsuite/a11y/Makefile.am b/testsuite/a11y/Makefile.am
index 1d9fc055bc..e8ab6068a3 100644
--- a/testsuite/a11y/Makefile.am
+++ b/testsuite/a11y/Makefile.am
@@ -84,7 +84,6 @@ testdata = \
 	headerbar.ui headerbar.txt \
 	tree.ui tree.txt \
 	actionbar.ui actionbar.txt \
-	tooltips.ui tooltips.txt \
 	$(NULL)
 
 test_in_files = \
diff --git a/testsuite/a11y/tooltips.txt b/testsuite/a11y/tooltips.txt
deleted file mode 100644
index e1bc6b8ab4..0000000000
--- a/testsuite/a11y/tooltips.txt
+++ /dev/null
@@ -1,78 +0,0 @@
-window1
-  "frame"
-  index: 0
-  state: enabled resizable sensitive showing visible
-  toolkit: gtk
-  <AtkComponent>
-  layer: window
-  alpha: 1
-  box1
-    "filler"
-    parent: window1
-    index: 0
-    state: enabled horizontal sensitive showing visible
-    toolkit: gtk
-    <AtkComponent>
-    layer: widget
-    alpha: 1
-    button-with-tooltip-text
-      "push button"
-      parent: box1
-      index: 0
-      description: Tooltip1
-      state: enabled focusable sensitive showing visible has-tooltip
-      toolkit: gtk
-      <AtkComponent>
-      layer: widget
-      alpha: 1
-      <AtkImage>
-      image size: -1 x -1
-      image description: (null)
-      <AtkAction>
-      action 0 name: click
-      action 0 description: Clicks the button
-    button-with-has-tooltip-true
-      "push button"
-      parent: box1
-      index: 1
-      state: enabled focusable sensitive showing visible has-tooltip
-      toolkit: gtk
-      <AtkComponent>
-      layer: widget
-      alpha: 1
-      <AtkImage>
-      image size: -1 x -1
-      image description: (null)
-      <AtkAction>
-      action 0 name: click
-      action 0 description: Clicks the button
-    button-without-tooltip
-      "push button"
-      parent: box1
-      index: 2
-      state: enabled focusable sensitive showing visible
-      toolkit: gtk
-      <AtkComponent>
-      layer: widget
-      alpha: 1
-      <AtkImage>
-      image size: -1 x -1
-      image description: (null)
-      <AtkAction>
-      action 0 name: click
-      action 0 description: Clicks the button
-    button-with-has-tooltip-false
-      "push button"
-      parent: box1
-      index: 3
-      state: enabled focusable sensitive showing visible
-      toolkit: gtk
-      <AtkComponent>
-      layer: widget
-      alpha: 1
-      <AtkImage>
-      image size: -1 x -1
-      image description: (null)
-      <AtkAction>
-      action 0 name: click
-      action 0 description: Clicks the button
diff --git a/testsuite/a11y/tooltips.ui b/testsuite/a11y/tooltips.ui
deleted file mode 100644
index 4c5145cbe9..0000000000
--- a/testsuite/a11y/tooltips.ui
+++ /dev/null
@@ -1,33 +0,0 @@
-<interface>
-  <object class='GtkWindow' id='window1'>
-    <property name='visible'>True</property>
-    <child>
-      <object class='GtkBox' id='box1'>
-        <property name='visible'>True</property>
-        <child>
-          <object class='GtkButton' id='button-with-tooltip-text'>
-            <property name='visible'>True</property>
-            <property name="tooltip_text">Tooltip1</property>
-          </object>
-        </child>
-        <child>
-          <object class='GtkButton' id='button-with-has-tooltip-true'>
-            <property name='visible'>True</property>
-            <property name="has_tooltip">True</property>
-          </object>
-         </child>
-        <child>
-          <object class='GtkButton' id='button-without-tooltip'>
-            <property name='visible'>True</property>
-          </object>
-         </child>
-        <child>
-          <object class='GtkButton' id='button-with-has-tooltip-false'>
-            <property name='visible'>True</property>
-            <property name="has_tooltip">False</property>
-          </object>
-         </child>
-      </object>
-    </child>
-  </object>
-</interface>