summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2010-06-07 14:25:23 -0400
committerMatthias Clasen <mclasen@redhat.com>2010-06-07 15:55:47 -0400
commit4eff96cc44e5ee9362a1c55f10da303310590bea (patch)
tree1bbacc17ff2388e8e444e63bbf6e59921a7c820c
parent4bee126f8e45052defd4c1aa24ea3794d2d3caa4 (diff)
downloadgtk+-wip/gapplication.tar.gz
Rework the icon and title setting to set defaultswip/gapplication
So that they apply do all windows, but don't override explicitly set icons/titles on added windows. Also add some extra complications to testapplication to excercise multiple windows and lauching from a desktop file.
-rw-r--r--tests/Makefile.am3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 0d0da2ed3c..f181048b95 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -8,7 +8,8 @@ INCLUDES = \
-DGDK_DISABLE_DEPRECATED \
-DGTK_DISABLE_DEPRECATED \
$(GTK_DEBUG_FLAGS) \
- $(GTK_DEP_CFLAGS)
+ $(GTK_DEP_CFLAGS) \
+ $(GDK_DEP_CFLAGS)
DEPS = \
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \