← Back to branch summary

~bratsche/ubuntu/maverick/gtk+2.0/menu-activation-fix

« back to all changes in this revision

Viewing changes to gtk/tests/builder.c

  • Committer: Bazaar Package Importer
  • Author(s): Robert Ancell
  • Date: 2010-07-22 21:41:30 UTC
  • mfrom: (1.11.7 upstream) (72.1.16 experimental)
  • Revision ID: james.westby@ubuntu.com-20100722214130-5uzyvpb9g4m0ts2c
Tags: 2.21.5-1ubuntu1
* Merge with Debian experimental, Ubuntu changes:
* debian/control.in:
  - Add introspection build-depends
  - Add Vcs-Bzr link
  - Add gir1.0-gtk-2.0 package
  - libgtk2.0-dev replaces gir-repository-dev
  - Conflict with appmenu-gtk (<< 0.1.3) to prevent menu proxy breakage
* debian/rules:
  - Build with --enable-introspection
  - Add gir1.0-gtk-2.0 package to BINARY_ARCH_PKGS
  - Add dh_girepository call
  - Disable devhelp files
* debian/dh_gtkmodules.in:
  - Remove obsolete script content
* debian/libgtk2.0-0.symbols:
  - Add Ubuntu specific symbols
* debian/libgtk2.0-dev.install.in:
  - Add gir files
* debian/libgtk2.0-doc.install.in
  - Disable devhelp files
* debian/gir1.0-gtk-2.0.install.in
  - Introspection package
* debian/patches/043_menu_proxy.patch
  - Add GtkMenuProxy support for remoting menus.
* debian/patches/062_dnd_menubar.patch:
  - Allow click on menubars for dnd
* debian/patches/063_treeview_almost_fixed.patch:
  - Add an ubuntu-almost-fixed-height-mode property, (required for
    software-center)
* debian/patches/071_no_offscreen_widgets_grabbing.patch:
  - Don't let offscreen widgets do grabbing
* debian/patches/072_indicator_menu_update.patch:
  - change by Cody Russell to send an update event on menu changes,
    should make the bluetooth indicator refresh correctly
* debian/patches/091_bugzilla_tooltip_refresh.patch:
  - Upstream bugzilla change to have better looking tooltips the gtk theme
    need to set "new-tooltip-style" to use those
* debian/watch:
  - Watch for unstable versions

Show diffs side-by-side

added added

removed removed

Lines of Context:
gtk/tests/builder.c
1494
1494
}
1495
1495
 
1496
1496
static void
 
1497
test_message_dialog (void)
 
1498
{
 
1499
  GtkBuilder * builder;
 
1500
  const gchar buffer1[] =
 
1501
    "<interface>"
 
1502
    "  <object class=\"GtkMessageDialog\" id=\"dialog1\">"
 
1503
    "    <child internal-child=\"message_area\">"
 
1504
    "      <object class=\"GtkVBox\" id=\"dialog-message-area\">"
 
1505
    "        <child>"
 
1506
    "          <object class=\"GtkExpander\" id=\"expander\"/>"
 
1507
    "        </child>"
 
1508
    "      </object>"
 
1509
    "    </child>"
 
1510
    "  </object>"
 
1511
    "</interface>";
 
1512
 
 
1513
  GObject *dialog1;
 
1514
  GObject *expander;
 
1515
 
 
1516
  builder = builder_new_from_string (buffer1, -1, NULL);
 
1517
  dialog1 = gtk_builder_get_object (builder, "dialog1");
 
1518
  expander = gtk_builder_get_object (builder, "expander");
 
1519
  g_assert (GTK_IS_EXPANDER (expander));
 
1520
  g_assert (gtk_widget_get_parent (GTK_WIDGET (expander)) == gtk_message_dialog_get_message_area (GTK_MESSAGE_DIALOG (dialog1)));
 
1521
 
 
1522
  gtk_widget_destroy (GTK_WIDGET (dialog1));
 
1523
  g_object_unref (builder);
 
1524
}
 
1525
 
 
1526
static void
1497
1527
test_accelerators (void)
1498
1528
{
1499
1529
  GtkBuilder *builder;
2586
2616
  g_test_add_func ("/Builder/AddObjects", test_add_objects);
2587
2617
  g_test_add_func ("/Builder/Menus", test_menus);
2588
2618
  g_test_add_func ("/Builder/MessageArea", test_message_area);
 
2619
  g_test_add_func ("/Builder/MessageDialog", test_message_dialog);
2589
2620
 
2590
2621
  return g_test_run();
2591
2622
}