testsuite: Remove GtkAccelGroup usage

testsuite/gtk/builder.c

@@ -1294,7 +1294,6 @@ test_cell_view (void)
     "      <object class=\"GtkCellView\" id=\"cellview1\">"
     "        <property name=\"visible\">True</property>"
     "        <property name=\"model\">liststore1</property>"
-    "        <accelerator key=\"f\" modifiers=\"GDK_CONTROL_MASK\" signal=\"grab_focus\"/>"
     "        <child>"
     "          <object class=\"GtkCellRendererText\" id=\"renderer1\"/>"
     "          <attributes>"
@@ -1409,62 +1408,6 @@ test_message_dialog (void)
   g_object_unref (builder);
 }
 
-static void
-test_accelerators (void)
-{
-  GtkBuilder *builder;
-  const gchar *buffer =
-    "<interface>"
-    "  <object class=\"GtkWindow\" id=\"window1\">"
-    "    <child>"
-    "      <object class=\"GtkButton\" id=\"button1\">"
-    "        <accelerator key=\"q\" modifiers=\"GDK_CONTROL_MASK\" signal=\"clicked\"/>"
-    "      </object>"
-    "    </child>"
-    "  </object>"
-    "</interface>";
-  const gchar *buffer2 =
-    "<interface>"
-    "  <object class=\"GtkWindow\" id=\"window1\">"
-    "    <child>"
-    "      <object class=\"GtkTreeView\" id=\"treeview1\">"
-    "        <signal name=\"cursor-changed\" handler=\"gtk_main_quit\"/>"
-    "        <accelerator key=\"f\" modifiers=\"GDK_CONTROL_MASK\" signal=\"grab_focus\"/>"
-    "      </object>"
-    "    </child>"
-    "  </object>"
-    "</interface>";
-  GObject *window1;
-  GSList *accel_groups;
-  GObject *accel_group;
-  
-  builder = builder_new_from_string (buffer, -1, NULL);
-  window1 = gtk_builder_get_object (builder, "window1");
-  g_assert (window1);
-  g_assert (GTK_IS_WINDOW (window1));
-
-  accel_groups = gtk_accel_groups_from_object (window1);
-  g_assert (g_slist_length (accel_groups) == 1);
-  accel_group = g_slist_nth_data (accel_groups, 0);
-  g_assert (accel_group);
-
-  gtk_widget_destroy (GTK_WIDGET (window1));
-  g_object_unref (builder);
-
-  builder = builder_new_from_string (buffer2, -1, NULL);
-  window1 = gtk_builder_get_object (builder, "window1");
-  g_assert (window1);
-  g_assert (GTK_IS_WINDOW (window1));
-
-  accel_groups = gtk_accel_groups_from_object (window1);
-  g_assert (g_slist_length (accel_groups) == 1);
-  accel_group = g_slist_nth_data (accel_groups, 0);
-  g_assert (accel_group);
-
-  gtk_widget_destroy (GTK_WIDGET (window1));
-  g_object_unref (builder);
-}
-
 static void
 test_widget (void)
 {
@@ -2045,9 +1988,6 @@ test_menus (void)
   const gchar *buffer =
     "<interface>"
     "  <object class=\"GtkWindow\" id=\"window1\">"
-    "    <accel-groups>"
-    "      <group name=\"accelgroup1\"/>"
-    "    </accel-groups>"
     "    <child>"
     "      <object class=\"GtkBox\" id=\"vbox1\">"
     "        <property name=\"visible\">True</property>"
@@ -2078,15 +2018,11 @@ test_menus (void)
     "      </object>"
     "    </child>"
     "  </object>"
-    "<object class=\"GtkAccelGroup\" id=\"accelgroup1\"/>"
     "</interface>";
 
   const gchar *buffer1 =
     "<interface>"
     "  <object class=\"GtkWindow\" id=\"window1\">"
-    "    <accel-groups>"
-    "      <group name=\"accelgroup1\"/>"
-    "    </accel-groups>"
     "    <child>"
     "      <object class=\"GtkBox\" id=\"vbox1\">"
     "        <property name=\"visible\">True</property>"
@@ -2110,7 +2046,6 @@ test_menus (void)
     "      </object>"
     "    </child>"
     "  </object>"
-    "<object class=\"GtkAccelGroup\" id=\"accelgroup1\"/>"
     "</interface>";
   GtkBuilder *builder;
   GtkWidget *window, *item;
@@ -2727,7 +2662,6 @@ main (int argc, char **argv)
 #endif
   g_test_add_func ("/Builder/CellView", test_cell_view);
   g_test_add_func ("/Builder/Dialog", test_dialog);
-  g_test_add_func ("/Builder/Accelerators", test_accelerators);
   g_test_add_func ("/Builder/Widget", test_widget);
   g_test_add_func ("/Builder/Value From String", test_value_from_string);
   g_test_add_func ("/Builder/Reference Counting", test_reference_counting);

testsuite/reftests/inherit-and-initial.ref.ui

@@ -51,7 +51,6 @@ Duis eu lectus quam. Vivamus eget metus a mauris molestie venenatis pulvinar ele
 Nulla facilisi. Pellentesque at dolor sit amet purus dapibus pulvinar molestie quis neque.
 Suspendisse feugiat quam quis dolor accumsan cursus. </property>
   </object>
-  <object class="GtkAccelGroup" id="accelgroup1"/>
   <object class="GtkWindow" id="window">
     <property name="can_focus">False</property>
     <property name="type">popup</property>
@@ -1946,8 +1945,5 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
         </child>
       </object>
     </child>
-    <accel-groups>
-      <group name="accelgroup1"/>
-    </accel-groups>
   </object>
 </interface>

testsuite/reftests/inherit-and-initial.ui

@@ -51,7 +51,6 @@ Duis eu lectus quam. Vivamus eget metus a mauris molestie venenatis pulvinar ele
 Nulla facilisi. Pellentesque at dolor sit amet purus dapibus pulvinar molestie quis neque.
 Suspendisse feugiat quam quis dolor accumsan cursus. </property>
   </object>
-  <object class="GtkAccelGroup" id="accelgroup1"/>
   <object class="GtkWindow" id="window">
     <property name="can_focus">False</property>
     <property name="type">popup</property>
@@ -1790,8 +1789,5 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
         </child>
       </object>
     </child>
-    <accel-groups>
-      <group name="accelgroup1"/>
-    </accel-groups>
   </object>
 </interface>