Fremantle deprecated widgets marked, HILDON_DISABLE_DEPRECATED

* configure.ac: Added an AM_CONDITIONAL in order to use in the
	Makefile.am, that way we can choose not to compile some examples
	and tests of the deprecated widgets.

	* examples/Makefile.am: Divided the sources in deprecated and
	non-deprecated.

	* src/Makefile.am: Added undef statement of the deprecated
	symbol to the enums file generation process.

	* src/hildon-color-chooser-dialog.c
	* src/hildon-color-chooser-dialog.h
	* src/hildon-color-button.c
	* src/hildon-color-button.h
	* src/hildon-color-chooser.c
	* src/hildon-color-chooser.h
	* src/hildon-controlbar.c
	* src/hildon-controlbar.h
	* src/hildon-date-editor.c
	* src/hildon-date-editor.h
	* src/hildon-hvolumebar.c
	* src/hildon-hvolumebar.h
	* src/hildon-private.c
	* src/hildon-private.h
	* src/hildon-range-editor.c
	* src/hildon-range-editor.h
	* src/hildon-seekbar.c
	* src/hildon-seekbar.h
	* src/hildon-time-editor.c
	* src/hildon-time-editor.h
	* src/hildon-time-picker.c
	* src/hildon-time-picker.h
	* src/hildon-volumebar.c
	* src/hildon-volumebar.h
	* src/hildon-vvolumebar.c
	* src/hildon-vvolumebar.h
	* src/hildon-bread-crumb-trail.h
	* src/hildon-bread-crumb-trail.c
	* src/hildon-calendar-popup.c
	* src/hildon-calendar-popup.h
	* src/hildon-weekday-picker.c:
	* src/hildon-weekday-picker.h:
	* src/hildon-bread-crumb-widget.c:
	* src/hildon-bread-crumb-widget.h:
	* src/hildon-bread-crumb.c:
	* src/hildon-bread-crumb.h:
	* src/hildon-calendar.c:
	* src/hildon-calendar.h:
	* src/hildon-caption.c:
	* src/hildon-code-dialog.c:
	* src/hildon-code-dialog.h:
	* src/hildon-font-selection-dialog.c:
	* src/hildon-font-selection-dialog.h:
	* src/hildon-get-password-dialog.c:
	* src/hildon-get-password-dialog.h:
	* src/hildon-login-dialog.c:
	* src/hildon-login-dialog.h:
	* src/hildon-number-editor.c:
	* src/hildon-number-editor.h:
	* src/hildon-set-password-dialog.c:
	* src/hildon-set-password-dialog.h:
	* src/hildon-sort-dialog.c:
	* src/hildon-sort-dialog.h: This is the list of deprecated
	widgets.

	* src/hildon-touch-selector.c:
	* src/hildon-window.c: Added undef statement to avoid compilation
	warnings

	* tests/Makefile.am: Divided the sources in deprecated and
	non-deprecated.

	* tests/check_test.c,
	(configure_tests): Marked the deprecated code that was adding
	suites with deprecated tests.

diff --git a/ChangeLog b/ChangeLog
index 1f2161d..a5bf8f5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,83 @@
+2008-10-30  Alejandro G. Castro         <alex@igalia.com>
+
+       Fremantle deprecated widgets marked, HILDON_DISABLE_DEPRECATED
+
+       * configure.ac: Added an AM_CONDITIONAL in order to use in the
+       Makefile.am, that way we can choose not to compile some examples
+       and tests of the deprecated widgets.
+
+       * examples/Makefile.am: Divided the sources in deprecated and
+       non-deprecated.
+
+       * src/Makefile.am: Added undef statement of the deprecated
+       symbol to the enums file generation process.
+
+       * src/hildon-color-chooser-dialog.c
+       * src/hildon-color-chooser-dialog.h
+       * src/hildon-color-button.c
+       * src/hildon-color-button.h
+       * src/hildon-color-chooser.c
+       * src/hildon-color-chooser.h
+       * src/hildon-controlbar.c
+       * src/hildon-controlbar.h
+       * src/hildon-date-editor.c
+       * src/hildon-date-editor.h
+       * src/hildon-hvolumebar.c
+       * src/hildon-hvolumebar.h
+       * src/hildon-private.c
+       * src/hildon-private.h
+       * src/hildon-range-editor.c
+       * src/hildon-range-editor.h
+       * src/hildon-seekbar.c
+       * src/hildon-seekbar.h
+       * src/hildon-time-editor.c
+       * src/hildon-time-editor.h
+       * src/hildon-time-picker.c
+       * src/hildon-time-picker.h
+       * src/hildon-volumebar.c
+       * src/hildon-volumebar.h
+       * src/hildon-vvolumebar.c
+       * src/hildon-vvolumebar.h
+       * src/hildon-bread-crumb-trail.h
+       * src/hildon-bread-crumb-trail.c
+       * src/hildon-calendar-popup.c
+       * src/hildon-calendar-popup.h
+       * src/hildon-weekday-picker.c:
+       * src/hildon-weekday-picker.h:
+       * src/hildon-bread-crumb-widget.c:
+       * src/hildon-bread-crumb-widget.h:
+       * src/hildon-bread-crumb.c:
+       * src/hildon-bread-crumb.h:
+       * src/hildon-calendar.c:
+       * src/hildon-calendar.h:
+       * src/hildon-caption.c:
+       * src/hildon-code-dialog.c:
+       * src/hildon-code-dialog.h:
+       * src/hildon-font-selection-dialog.c:
+       * src/hildon-font-selection-dialog.h:
+       * src/hildon-get-password-dialog.c:
+       * src/hildon-get-password-dialog.h:
+       * src/hildon-login-dialog.c:
+       * src/hildon-login-dialog.h:
+       * src/hildon-number-editor.c:
+       * src/hildon-number-editor.h:
+       * src/hildon-set-password-dialog.c:
+       * src/hildon-set-password-dialog.h:
+       * src/hildon-sort-dialog.c:
+       * src/hildon-sort-dialog.h: This is the list of deprecated
+       widgets.
+
+       * src/hildon-touch-selector.c:
+       * src/hildon-window.c: Added undef statement to avoid compilation
+       warnings
+
+       * tests/Makefile.am: Divided the sources in deprecated and
+       non-deprecated.
+
+       * tests/check_test.c,
+       (configure_tests): Marked the deprecated code that was adding
+       suites with deprecated tests.
+
 2008-10-30  Claudio Saavedra  <csaavedra@igalia.com>
 
        * src/hildon-touch-selector.c: (_default_print_func): Do not

diff --git a/configure.ac b/configure.ac
index 63bee82..36de2b0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -170,6 +170,8 @@ if test x$enable_deprecated = xno; then
     DISABLE_DEPRECATED="-DHILDON_DISABLE_DEPRECATED"
 fi
 
+AM_CONDITIONAL([HILDON_DISABLE_DEPRECATED], test "x$enable_deprecated" = "xno")
+
 # Check support (c unit test)
 PKG_CHECK_MODULES(CHECK, check , [BUILD_TESTS="yes"], [BUILD_TESTS="no"])
 AM_CONDITIONAL(BUILD_TESTS, test "x$BUILD_TESTS" = "xyes")

diff --git a/examples/Makefile.am b/examples/Makefile.am
index 7af58b8..f5f4657 100644 (file)
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1,45 +1,22 @@
 MAINTAINERCLEANFILES                   = Makefile.in
 
 if BUILD_EXAMPLES
-noinst_PROGRAMS                                = hildon-window-example                         \
+EXAMPLES                               = hildon-window-example                         \
                                          hildon-banner-example                         \
                                          hildon-banner-long-example                    \
                                          hildon-caption-example                        \
-                                         hildon-weekday-picker-example                 \
-                                         hildon-sort-dialog-example                    \
-                                         hildon-controlbar-example                     \
                                          hildon-note-example                           \
-                                         hildon-time-picker-example                    \
-                                         hildon-color-chooser-example                  \
-                                         hildon-color-button-example                   \
-                                         hildon-login-dialog-example                   \
-                                         hildon-time-editor-example                    \
                                          hildon-icon-sizes-example                     \
                                          hildon-insensitive-example                    \
-                                         hildon-get-password-dialog-example            \
-                                         hildon-set-password-dialog-example            \
                                          hildon-window-menu-example                    \
                                          hildon-window-cmn-menu-example                \
-                                         hildon-vvolumebar-example                     \
                                          hildon-toolbar-example                        \
-                                         hildon-code-dialog-example                    \
-                                         hildon-hvolumebar-example                     \
-                                         hildon-hvolumebar-insensitive-example         \
-                                         hildon-hvolumebar-insensitive-map-example     \
                                          hildon-lookup-example                         \
-                                         hildon-number-editor-example                  \
                                          hildon-scrolled-window-example                \
-                                         hildon-color-pop-example                      \
-                                         hildon-thumb-scrollbar-example                \
-                                         hildon-date-editor-example                    \
-                                         hildon-bread-crumb-trail-example              \
                                          hildon-finger-example                         \
-                                         hildon-seekbar-example                        \
                                          hildon-find-toolbar-example                   \
                                          hildon-edit-toolbar-example                   \
                                          hildon-wizard-dialog-example                  \
-                                         hildon-hvolumebar-timer-example               \
-                                         hildon-toolbar-seekbar-example                \
                                          hildon-pannable-area-example                  \
                                          hildon-pannable-area-example-2                \
                                          hildon-pannable-area-example-3                \
@@ -62,6 +39,38 @@ noinst_PROGRAMS                              = hildon-window-example                         \
                                          hildon-touch-selector-multi-cells-example     \
                                          hildon-touch-selector-entry-example
 
+DEPRECATED_EXAMPLES                    = hildon-weekday-picker-example                 \
+                                         hildon-sort-dialog-example                    \
+                                         hildon-controlbar-example                     \
+                                         hildon-time-picker-example                    \
+                                         hildon-color-chooser-example                  \
+                                         hildon-color-button-example                   \
+                                         hildon-login-dialog-example                   \
+                                         hildon-time-editor-example                    \
+                                         hildon-get-password-dialog-example            \
+                                         hildon-set-password-dialog-example            \
+                                         hildon-vvolumebar-example                     \
+                                         hildon-code-dialog-example                    \
+                                         hildon-hvolumebar-example                     \
+                                         hildon-hvolumebar-insensitive-example         \
+                                         hildon-hvolumebar-insensitive-map-example     \
+                                         hildon-number-editor-example                  \
+                                         hildon-color-pop-example                      \
+                                         hildon-thumb-scrollbar-example                \
+                                         hildon-date-editor-example                    \
+                                         hildon-bread-crumb-trail-example              \
+                                         hildon-seekbar-example                        \
+                                         hildon-toolbar-seekbar-example                \
+                                         hildon-hvolumebar-timer-example
+
+
+if HILDON_DISABLE_DEPRECATED
+noinst_PROGRAMS                        = $(EXAMPLES)
+else
+noinst_PROGRAMS                        = $(EXAMPLES)                           \
+                                         $(DEPRECATED_EXAMPLES)
+endif
+
 # Hildon window
 hildon_window_example_LDADD            = $(HILDON_OBJ_LIBS)
 hildon_window_example_CFLAGS           = $(HILDON_OBJ_CFLAGS)

diff --git a/src/Makefile.am b/src/Makefile.am
index 543e28d..a464f3e 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -204,6 +204,7 @@ hildon-enum-types.h: @REBUILD@ $(libhildon_$(API_VERSION_MAJOR)_public_headers)
 
 hildon-enum-types.c: @REBUILD@ $(libhildon_$(API_VERSION_MAJOR)_public_headers) Makefile
        (cd $(srcdir) && glib-mkenums                           \
+       --fhead "#undef HILDON_DISABLE_DEPRECATED\n"               \
        --fhead "#include \"hildon.h\"\n"                       \
        --fhead "#include <glib-object.h>"                      \
        --fprod "\n/* enumerations from \"@filename@\" */"      \

diff --git a/src/hildon-bread-crumb-trail.c b/src/hildon-bread-crumb-trail.c
index 1ab736d..7a188e2 100644 (file)
--- a/src/hildon-bread-crumb-trail.c
+++ b/src/hildon-bread-crumb-trail.c
@@ -37,6 +37,8 @@
  * implemented if needed. See #HildonBreadCrumb for more details.
  */
 
+#undef HILDON_DISABLE_DEPRECATED
+
 #include <gdk/gdkkeysyms.h>
 
 #include "hildon-marshalers.h"

diff --git a/src/hildon-bread-crumb-trail.h b/src/hildon-bread-crumb-trail.h
index 9978599..09dded1 100644 (file)
--- a/src/hildon-bread-crumb-trail.h
+++ b/src/hildon-bread-crumb-trail.h
@@ -23,6 +23,8 @@
  *
  */
 
+#ifndef HILDON_DISABLE_DEPRECATED
+
 #ifndef __HILDON_BREAD_CRUMB_TRAIL_H__
 #define __HILDON_BREAD_CRUMB_TRAIL_H__
 
@@ -85,3 +87,4 @@ G_END_DECLS
 
 #endif
 
+#endif /* HILDON_DISABLE_DEPRECATED */

diff --git a/src/hildon-bread-crumb-widget.c b/src/hildon-bread-crumb-widget.c
index 3ad72f5..ba538c8 100644 (file)
--- a/src/hildon-bread-crumb-widget.c
+++ b/src/hildon-bread-crumb-widget.c
@@ -23,6 +23,8 @@
  *
  */
 
+#undef HILDON_DISABLE_DEPRECATED
+
 #include "hildon-bread-crumb-widget.h"
 #include "hildon-defines.h"
 

diff --git a/src/hildon-bread-crumb-widget.h b/src/hildon-bread-crumb-widget.h
index d795e7d..6714edc 100644 (file)
--- a/src/hildon-bread-crumb-widget.h
+++ b/src/hildon-bread-crumb-widget.h
@@ -23,6 +23,8 @@
  *
  */
 
+#ifndef HILDON_DISABLE_DEPRECATED
+
 #ifndef __HILDON_BREAD_CRUMB_WIDGET_H__
 #define __HILDON_BREAD_CRUMB_WIDGET_H__
 
@@ -73,3 +75,5 @@ void _hildon_bread_crumb_widget_set_icon_position (HildonBreadCrumbWidget *bread
 G_END_DECLS
 
 #endif
+
+#endif /* HILDON_DISABLE_DEPRECATED */

diff --git a/src/hildon-bread-crumb.c b/src/hildon-bread-crumb.c
index 528e349..bc96b37 100644 (file)
--- a/src/hildon-bread-crumb.c
+++ b/src/hildon-bread-crumb.c
@@ -31,6 +31,8 @@
  * for the #HildonBreadCrumbTrail widget.
  */
 
+#undef HILDON_DISABLE_DEPRECATED
+
 #include "hildon-bread-crumb.h"
 
 static void hildon_bread_crumb_base_init (gpointer g_class);

diff --git a/src/hildon-bread-crumb.h b/src/hildon-bread-crumb.h
index f4e0a4d..d834b76 100644 (file)
--- a/src/hildon-bread-crumb.h
+++ b/src/hildon-bread-crumb.h
@@ -23,6 +23,8 @@
  *
  */
 
+#ifndef HILDON_DISABLE_DEPRECATED
+
 #ifndef __HILDON_BREAD_CRUMB_H__
 #define __HILDON_BREAD_CRUMB_H__
 
@@ -58,3 +60,5 @@ void hildon_bread_crumb_activated (HildonBreadCrumb *bread_crumb);
 G_END_DECLS
 
 #endif
+
+#endif /* HILDON_DISABLE_DEPRECATED */

diff --git a/src/hildon-calendar-popup.c b/src/hildon-calendar-popup.c
index 52ac089..fcc32b1 100644 (file)
--- a/src/hildon-calendar-popup.c
+++ b/src/hildon-calendar-popup.c
@@ -60,6 +60,9 @@
  *
  */
 
+
+#undef                                          HILDON_DISABLE_DEPRECATED
+
 #ifdef                                          HAVE_CONFIG_H
 #include                                        <config.h>
 #endif

diff --git a/src/hildon-calendar-popup.h b/src/hildon-calendar-popup.h
index 938e35b..3429d8e 100644 (file)
--- a/src/hildon-calendar-popup.h
+++ b/src/hildon-calendar-popup.h
@@ -22,6 +22,8 @@
  *
  */
 
+#ifndef                                         HILDON_DISABLE_DEPRECATED
+
 #ifndef                                         __HILDON_CALENDAR_POPUP_H__
 #define                                         __HILDON_CALENDAR_POPUP_H__
 
@@ -85,3 +87,5 @@ hildon_calendar_popup_get_date                  (HildonCalendarPopup *cal,
 G_END_DECLS
 
 #endif                                          /* __HILDON_CALENDAR_POPUP_H__ */
+
+#endif                                          /* HILDON_DISABLE_DEPRECATED */

diff --git a/src/hildon-calendar.c b/src/hildon-calendar.c
index de5ea10..7692274 100644 (file)
--- a/src/hildon-calendar.c
+++ b/src/hildon-calendar.c
@@ -47,6 +47,8 @@
  *
  */
 
+#undef                                          HILDON_DISABLE_DEPRECATED
+
 #ifdef                                          HAVE_CONFIG_H
 #include                                        <config.h>
 #endif

diff --git a/src/hildon-calendar.h b/src/hildon-calendar.h
index d504b2c..3e38fd8 100644 (file)
--- a/src/hildon-calendar.h
+++ b/src/hildon-calendar.h
@@ -33,6 +33,8 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
+#ifndef                                         HILDON_DISABLE_DEPRECATED
+
 #ifndef                                         __HILDON_CALENDAR_H__
 #define                                         __HILDON_CALENDAR_H__
 
@@ -174,3 +176,5 @@ hildon_calendar_thaw                            (HildonCalendar *calendar);
 G_END_DECLS
 
 #endif                                          /* __HILDON_CALENDAR_H__ */
+
+#endif                                          /* HILDON_DISABLE_DEPRECATED */

diff --git a/src/hildon-code-dialog.c b/src/hildon-code-dialog.c
index 481bb68..9305a5b 100644 (file)
--- a/src/hildon-code-dialog.c
+++ b/src/hildon-code-dialog.c
@@ -34,6 +34,8 @@
 
 /* FIXME We need property access in this widget */
 
+#undef                                          HILDON_DISABLE_DEPRECATED
+
 #ifdef                                          HAVE_CONFIG_H
 #include                                        <config.h>
 #endif

diff --git a/src/hildon-code-dialog.h b/src/hildon-code-dialog.h
index 8ea15c0..e693b1a 100644 (file)
--- a/src/hildon-code-dialog.h
+++ b/src/hildon-code-dialog.h
@@ -22,6 +22,8 @@
  *
  */
 
+#ifndef                                         HILDON_DISABLE_DEPRECATED
+
 #ifndef                                         __HILDON_CODE_DIALOG_H__
 #define                                         __HILDON_CODE_DIALOG_H__
 
@@ -86,3 +88,5 @@ hildon_code_dialog_set_input_sensitive          (HildonCodeDialog *dialog,
 G_END_DECLS
 
 #endif                                          /* __HILDON_CODE_DIALOG_H__ */
+
+#endif                                          /* HILDON_DISABLE_DEPRECATED */

diff --git a/src/hildon-color-button.c b/src/hildon-color-button.c
index 8f66a11..b9c4a69 100644 (file)
--- a/src/hildon-color-button.c
+++ b/src/hildon-color-button.c
@@ -45,6 +45,8 @@
  * 
  */
 
+#undef                                          HILDON_DISABLE_DEPRECATED
+
 #ifdef                                          HAVE_CONFIG_H
 #include                                        <config.h>
 #endif

diff --git a/src/hildon-color-button.h b/src/hildon-color-button.h
index cc07fe4..603b16d 100644 (file)
--- a/src/hildon-color-button.h
+++ b/src/hildon-color-button.h
@@ -22,6 +22,8 @@
  *
  */
 
+#ifndef                                         HILDON_DISABLE_DEPRECATED
+
 #ifndef                                         __HILDON_COLOR_BUTTON_H__
 #define                                         __HILDON_COLOR_BUTTON_H__
 
@@ -92,6 +94,4 @@ G_END_DECLS
 
 #endif                                          /* __HILDON_COLOR_BUTTON_H__ */
 
-
-
-
+#endif                                          /* HILDON_DISABLE_DEPRECATED */

diff --git a/src/hildon-color-chooser-dialog.c b/src/hildon-color-chooser-dialog.c
index e8b2d7c..191aa58 100644 (file)
--- a/src/hildon-color-chooser-dialog.c
+++ b/src/hildon-color-chooser-dialog.c
@@ -38,6 +38,8 @@
  *
  */
 
+#undef                                          HILDON_DISABLE_DEPRECATED
+
 #ifdef                                          HAVE_CONFIG_H
 #include                                        <config.h>
 #endif

diff --git a/src/hildon-color-chooser-dialog.h b/src/hildon-color-chooser-dialog.h
index 9edaf80..0deeed7 100644 (file)
--- a/src/hildon-color-chooser-dialog.h
+++ b/src/hildon-color-chooser-dialog.h
@@ -23,6 +23,8 @@
  *
  */
 
+#ifndef                                         HILDON_DISABLE_DEPRECATED
+
 #ifndef                                         __HILDON_COLOR_CHOOSER_DIALOG_H__
 #define                                         __HILDON_COLOR_CHOOSER_DIALOG_H__
 
@@ -74,3 +76,5 @@ hildon_color_chooser_dialog_get_color           (HildonColorChooserDialog *dialo
                                                  GdkColor *color);
 
 #endif                                          /* __HILDON_COLOR_CHOOSER_DIALOG_H__ */
+
+#endif                                          /* HILDON_DISABLE_DEPRECATED */

diff --git a/src/hildon-color-chooser.c b/src/hildon-color-chooser.c
index 6a9a877..737e844 100644 (file)
--- a/src/hildon-color-chooser.c
+++ b/src/hildon-color-chooser.c
@@ -37,6 +37,8 @@
  * 
  */
 
+#undef                                          HILDON_DISABLE_DEPRECATED
+
 #include                                        "hildon-color-chooser.h"
 #include                                        "hildon-color-chooser-private.h"
 

diff --git a/src/hildon-color-chooser.h b/src/hildon-color-chooser.h
index b583e56..e0dbc00 100644 (file)
--- a/src/hildon-color-chooser.h
+++ b/src/hildon-color-chooser.h
@@ -23,6 +23,7 @@
  *
  */
 
+#ifndef                                         HILDON_DISABLE_DEPRECATED
 
 #ifndef                                         __HILDON_COLOR_CHOOSER_H__
 #define                                         __HILDON_COLOR_CHOOSER_H__
@@ -78,3 +79,5 @@ hildon_color_chooser_get_color                  (HildonColorChooser *chooser,
                                                  GdkColor *color);
 
 #endif                                          /* __HILDON_COLOR_CHOOSER_H__ */
+
+#endif                                          /* HILDON_DISABLE_DEPRECATED */

diff --git a/src/hildon-controlbar.c b/src/hildon-controlbar.c
index c80f3ae..4999186 100644 (file)
--- a/src/hildon-controlbar.c
+++ b/src/hildon-controlbar.c
@@ -42,6 +42,8 @@
  * 
  */
 
+#undef                                          HILDON_DISABLE_DEPRECATED
+
 #ifdef                                          HAVE_CONFIG_H
 #include                                        <config.h>
 #endif

diff --git a/src/hildon-controlbar.h b/src/hildon-controlbar.h
index a42c04b..09bc72d 100644 (file)
--- a/src/hildon-controlbar.h
+++ b/src/hildon-controlbar.h
@@ -22,6 +22,8 @@
  *
  */
 
+#ifndef                                         HILDON_DISABLE_DEPRECATED
+
 #ifndef                                         __HILDON_CONTROLBAR_H__
 #define                                         __HILDON_CONTROLBAR_H__
 
@@ -99,3 +101,5 @@ hildon_controlbar_set_range                     (HildonControlbar *self,
 G_END_DECLS
 
 #endif                                          /* __HILDON_CONTROLBAR_H__ */
+
+#endif                                          /* HILDON_DISABLE_DEPRECATED */

diff --git a/src/hildon-date-editor.c b/src/hildon-date-editor.c
index 8bd4732..b9c84fa 100644 (file)
--- a/src/hildon-date-editor.c
+++ b/src/hildon-date-editor.c
@@ -57,6 +57,8 @@
  *
  */
 
+#undef                                          HILDON_DISABLE_DEPRECATED
+
 #ifdef                                          HAVE_CONFIG_H
 #include                                        <config.h>
 #endif

diff --git a/src/hildon-date-editor.h b/src/hildon-date-editor.h
index 2763a64..f3c3613 100644 (file)
--- a/src/hildon-date-editor.h
+++ b/src/hildon-date-editor.h
@@ -22,6 +22,8 @@
  *
  */
 
+#ifndef                                         HILDON_DISABLE_DEPRECATED
+
 #ifndef                                         __HILDON_DATE_EDITOR_H__
 #define                                         __HILDON_DATE_EDITOR_H__
 
@@ -108,3 +110,5 @@ hildon_date_editor_get_day                      (HildonDateEditor *editor);
 G_END_DECLS
 
 #endif                                          /* __HILDON_DATE_EDITOR_H__ */
+
+#endif                                          /* HILDON_DISABLE_DEPRECATED */

diff --git a/src/hildon-font-selection-dialog.c b/src/hildon-font-selection-dialog.c
index 8682134..6d77321 100644 (file)
--- a/src/hildon-font-selection-dialog.c
+++ b/src/hildon-font-selection-dialog.c
@@ -31,6 +31,8 @@
  * size, style, etc. Users can also preview text in the selected font.
  */
 
+#undef                                          HILDON_DISABLE_DEPRECATED
+
 #ifdef                                          HAVE_CONFIG_H
 #include                                        <config.h>
 #endif

diff --git a/src/hildon-font-selection-dialog.h b/src/hildon-font-selection-dialog.h
index a3ce73d..5296fda 100644 (file)
--- a/src/hildon-font-selection-dialog.h
+++ b/src/hildon-font-selection-dialog.h
@@ -21,6 +21,9 @@
  * 02110-1301 USA
  *
  */
+
+#ifndef                                         HILDON_DISABLE_DEPRECATED
+
 #ifndef                                         __HILDON_FONT_SELECTION_DIALOG_H__
 #define                                         __HILDON_FONT_SELECTION_DIALOG_H__
 
@@ -84,3 +87,5 @@ hildon_font_selection_dialog_set_preview_text   (HildonFontSelectionDialog *fsd,
 G_END_DECLS
 
 #endif                                          /* __HILDON_FONT_SELECTION_DIALOG_H__ */
+
+#endif                                          /* HILDON_DISABLE_DEPRECATED */

diff --git a/src/hildon-get-password-dialog.c b/src/hildon-get-password-dialog.c
index 836e2aa..1c6d208 100644 (file)
--- a/src/hildon-get-password-dialog.c
+++ b/src/hildon-get-password-dialog.c
@@ -67,6 +67,8 @@
  * </example>
  */
 
+#undef                                          HILDON_DISABLE_DEPRECATED
+
 #ifdef                                          HAVE_CONFIG_H
 #include                                        <config.h>
 #endif

diff --git a/src/hildon-get-password-dialog.h b/src/hildon-get-password-dialog.h
index d61a60f..ce4998f 100644 (file)
--- a/src/hildon-get-password-dialog.h
+++ b/src/hildon-get-password-dialog.h
@@ -22,6 +22,8 @@
  *
  */
 
+#ifndef                                         HILDON_DISABLE_DEPRECATED
+
 #ifndef                                         __HILDON_GET_PASSWORD_DIALOG_H__
 #define                                         __HILDON_GET_PASSWORD_DIALOG_H__
 
@@ -90,3 +92,5 @@ hildon_get_password_dialog_get_password         (HildonGetPasswordDialog *dialog
 G_END_DECLS
 
 #endif                                          /* __HILDON_GET_PASSWORD_DIALOG_H__ */
+
+#endif                                          /* HILDON_DISABLE_DEPRECATED */

diff --git a/src/hildon-hvolumebar.c b/src/hildon-hvolumebar.c
index be08357..68fc8ac 100644 (file)
--- a/src/hildon-hvolumebar.c
+++ b/src/hildon-hvolumebar.c
@@ -41,6 +41,8 @@
  *
  */
 
+#undef                                          HILDON_DISABLE_DEPRECATED
+
 #include                                        "hildon-hvolumebar.h"
 #include                                        "hildon-volumebar.h"
 #include                                        "hildon-volumebar-range.h"

diff --git a/src/hildon-hvolumebar.h b/src/hildon-hvolumebar.h
index 08f51e1..957371c 100644 (file)
--- a/src/hildon-hvolumebar.h
+++ b/src/hildon-hvolumebar.h
@@ -22,6 +22,8 @@
  *
  */
 
+#ifndef                                         HILDON_DISABLE_DEPRECATED
+
 #ifndef                                         __HILDON_HVOLUMEBAR_H__
 #define                                         __HILDON_HVOLUMEBAR_H__
 
@@ -70,3 +72,5 @@ hildon_hvolumebar_new                           (void);
 G_END_DECLS
 
 #endif                                          /* __HILDON_HVOLUMEBAR_H__ */
+
+#endif                                          /* HILDON_DISABLE_DEPRECATED */

diff --git a/src/hildon-login-dialog.c b/src/hildon-login-dialog.c
index d9eaa81..54de017 100644 (file)
--- a/src/hildon-login-dialog.c
+++ b/src/hildon-login-dialog.c
@@ -34,6 +34,8 @@
  * password. 
  */
 
+#undef                                          HILDON_DISABLE_DEPRECATED
+
 #ifdef                                          HAVE_CONFIG_H
 #include                                        <config.h>
 #endif

diff --git a/src/hildon-login-dialog.h b/src/hildon-login-dialog.h
index 6fc2333..af59f99 100644 (file)
--- a/src/hildon-login-dialog.h
+++ b/src/hildon-login-dialog.h
@@ -22,6 +22,8 @@
  *
  */
 
+#ifndef                                         HILDON_DISABLE_DEPRECATED
+
 #ifndef                                         __HILDON_NAME_PASSWORD_DIALOG_H__
 #define                                         __HILDON_NAME_PASSWORD_DIALOG_H__
 
@@ -85,3 +87,5 @@ hildon_login_dialog_set_message                 (HildonLoginDialog *dialog,
 G_END_DECLS
 
 #endif                                          /* __HILDON_LOGIN_DIALOG_H__ */
+
+#endif                                          /* HILDON_DISABLE_DEPRECATED */

diff --git a/src/hildon-number-editor.c b/src/hildon-number-editor.c
index 28d039e..2d44771 100644 (file)
--- a/src/hildon-number-editor.c
+++ b/src/hildon-number-editor.c
@@ -39,6 +39,8 @@
  * </example>
  */
 
+#undef                                          HILDON_DISABLE_DEPRECATED
+
 #ifdef                                          HAVE_CONFIG_H
 #include                                        <config.h>
 #endif

diff --git a/src/hildon-number-editor.h b/src/hildon-number-editor.h
index 3cf2648..8a5f5cd 100644 (file)
--- a/src/hildon-number-editor.h
+++ b/src/hildon-number-editor.h
@@ -22,6 +22,8 @@
  *
  */
 
+#ifndef                                         HILDON_DISABLE_DEPRECATED
+
 #ifndef                                         __HILDON_NUMBER_EDITOR_H__
 #define                                         __HILDON_NUMBER_EDITOR_H__
 
@@ -92,3 +94,5 @@ hildon_number_editor_set_value                  (HildonNumberEditor *editor,
 G_END_DECLS
 
 #endif                                          /* __HILDON_NUMBER_EDITOR_H__ */
+
+#endif                                          /* HILDON_DISABLE_DEPRECATED */

diff --git a/src/hildon-private.c b/src/hildon-private.c
index 98930d3..b31bc1f 100644 (file)
--- a/src/hildon-private.c
+++ b/src/hildon-private.c
@@ -22,6 +22,8 @@
  *
  */
 
+#undef                                          HILDON_DISABLE_DEPRECATED
+
 #ifdef                                          HAVE_CONFIG_H
 #include                                        <config.h>
 #endif

diff --git a/src/hildon-private.h b/src/hildon-private.h
index 0d3b463..4119c33 100644 (file)
--- a/src/hildon-private.h
+++ b/src/hildon-private.h
@@ -22,6 +22,8 @@
  *
  */
 
+#ifndef                                         HILDON_DISABLE_DEPRECATED
+
 #ifndef                                         __HILDON_PRIVATE_H__
 #define                                         __HILDON_PRIVATE_H__
 
@@ -37,3 +39,5 @@ hildon_private_composite_focus                  (GtkWidget *widget,
 G_END_DECLS
 
 #endif                                          /* __HILDON_PRIVATE_H__ */
+
+#endif                                          /* HILDON_DISABLE_DEPRECATED */

diff --git a/src/hildon-range-editor.c b/src/hildon-range-editor.c
index 0915007..ca587cd 100644 (file)
--- a/src/hildon-range-editor.c
+++ b/src/hildon-range-editor.c
@@ -39,6 +39,8 @@
  * </example>
  */
 
+#undef                                          HILDON_DISABLE_DEPRECATED
+
 #ifdef                                          HAVE_CONFIG_H
 #include                                        <config.h>
 #endif

diff --git a/src/hildon-range-editor.h b/src/hildon-range-editor.h
index 17ac7f2..066ad4d 100644 (file)
--- a/src/hildon-range-editor.h
+++ b/src/hildon-range-editor.h
@@ -22,6 +22,8 @@
  *
  */
 
+#ifndef                                         HILDON_DISABLE_DEPRECATED
+
 #ifndef                                         __HILDON_RANGE_EDITOR_H__
 #define                                         __HILDON_RANGE_EDITOR_H__
 
@@ -124,3 +126,6 @@ hildon_range_editor_get_separator               (HildonRangeEditor *editor);
 G_END_DECLS
 
 #endif                                          /* __HILDON_RANGE_EDITOR_H__ */
+
+#endif                                          /* HILDON_DISABLE_DEPRECATED */
+

diff --git a/src/hildon-seekbar.c b/src/hildon-seekbar.c
index 2a90653..af06957 100644 (file)
--- a/src/hildon-seekbar.c
+++ b/src/hildon-seekbar.c
@@ -34,6 +34,8 @@
  * a stream.
  */
 
+#undef                                          HILDON_DISABLE_DEPRECATED
+
 #ifdef                                          HAVE_CONFIG_H
 #include                                        <config.h>
 #endif

diff --git a/src/hildon-seekbar.h b/src/hildon-seekbar.h
index 16582d8..58bb62c 100644 (file)
--- a/src/hildon-seekbar.h
+++ b/src/hildon-seekbar.h
@@ -22,6 +22,8 @@
  *
  */
 
+#ifndef                                         HILDON_DISABLE_DEPRECATED
+
 #ifndef                                         __HILDON_SEEKBAR_H__
 #define                                         __HILDON_SEEKBAR_H__
 
@@ -95,3 +97,5 @@ hildon_seekbar_get_fraction                     (HildonSeekbar *seekbar);
 G_END_DECLS
 
 #endif                                          /* __HILDON_SEEKBAR_H__ */
+
+#endif                                          /* HILDON_DISABLE_DEPRECATED */

diff --git a/src/hildon-set-password-dialog.c b/src/hildon-set-password-dialog.c
index 63cc9a0..3702a64 100644 (file)
--- a/src/hildon-set-password-dialog.c
+++ b/src/hildon-set-password-dialog.c
@@ -39,6 +39,8 @@
  * change a password that cannot be removed.
  */
 
+#undef                                          HILDON_DISABLE_DEPRECATED
+
 #ifdef                                          HAVE_CONFIG_H
 #include                                        <config.h>
 #endif

diff --git a/src/hildon-set-password-dialog.h b/src/hildon-set-password-dialog.h
index f5aa497..a174bf3 100644 (file)
--- a/src/hildon-set-password-dialog.h
+++ b/src/hildon-set-password-dialog.h
@@ -22,6 +22,8 @@
  *
  */
 
+#ifndef                                         HILDON_DISABLE_DEPRECATED
+
 #ifndef                                         __HILDON_SET_PASSWORD_DIALOG_H__
 #define                                         __HILDON_SET_PASSWORD_DIALOG_H__
 
@@ -85,3 +87,5 @@ hildon_set_password_dialog_set_message          (HildonSetPasswordDialog *dialog
 G_END_DECLS
 
 #endif                                          /* __HILDON_SET_PASSWORD_DIALOG_H__ */
+
+#endif                                          /* HILDON_DISABLE_DEPRECATED */

diff --git a/src/hildon-sort-dialog.c b/src/hildon-sort-dialog.c
index b841eab..0b70e6e 100644 (file)
--- a/src/hildon-sort-dialog.c
+++ b/src/hildon-sort-dialog.c
@@ -83,6 +83,8 @@
  * </example>
  */
 
+#undef                                          HILDON_DISABLE_DEPRECATED
+
 #ifdef                                          HAVE_CONFIG_H
 #include                                        <config.h>
 #endif

diff --git a/src/hildon-sort-dialog.h b/src/hildon-sort-dialog.h
index 0546db0..db526c5 100644 (file)
--- a/src/hildon-sort-dialog.h
+++ b/src/hildon-sort-dialog.h
@@ -22,6 +22,8 @@
  *
  */
 
+#ifndef                                         HILDON_DISABLE_DEPRECATED
+
 #ifndef                                         __HILDON_SORT_DIALOG_H__
 #define                                         __HILDON_SORT_DIALOG_H__
 
@@ -94,3 +96,5 @@ hildon_sort_dialog_add_sort_key_reversed        (HildonSortDialog *dialog,
 G_END_DECLS
 
 #endif                                          /* __HILDON_SORT_DIALOG_H__ */
+
+#endif                                          /* HILDON_DISABLE_DEPRECATED */

diff --git a/src/hildon-time-editor.c b/src/hildon-time-editor.c
index 8a03c04..bddcaed 100644 (file)
--- a/src/hildon-time-editor.c
+++ b/src/hildon-time-editor.c
@@ -50,6 +50,8 @@
  *
  */
 
+#undef                                          HILDON_DISABLE_DEPRECATED
+
 #ifdef                                          HAVE_CONFIG_H
 #include                                        <config.h>
 #endif

diff --git a/src/hildon-time-editor.h b/src/hildon-time-editor.h
index bccb36f..ec64e04 100644 (file)
--- a/src/hildon-time-editor.h
+++ b/src/hildon-time-editor.h
@@ -22,6 +22,8 @@
  *
  */
 
+#ifndef                                         HILDON_DISABLE_DEPRECATED
+
 #ifndef                                         __HILDON_TIME_EDITOR_H__
 #define                                         __HILDON_TIME_EDITOR_H__
 
@@ -167,3 +169,5 @@ hildon_time_editor_get_time_separators          (GtkLabel *hm_sep_label,
 G_END_DECLS
 
 #endif                                          /* __HILDON_TIME_EDITOR_H__ */
+
+#endif                                          /* HILDON_DISABLE_DEPRECATED */

diff --git a/src/hildon-time-picker.c b/src/hildon-time-picker.c
index 4ba4d84..0be97c2 100644 (file)
--- a/src/hildon-time-picker.c
+++ b/src/hildon-time-picker.c
@@ -60,6 +60,8 @@
  * </example>
  */
 
+#undef                                          HILDON_DISABLE_DEPRECATED
+
 #ifdef                                          HAVE_CONFIG_H
 #include                                        <config.h>
 #endif

diff --git a/src/hildon-time-picker.h b/src/hildon-time-picker.h
index db34764..7520ab3 100644 (file)
--- a/src/hildon-time-picker.h
+++ b/src/hildon-time-picker.h
@@ -22,6 +22,8 @@
  *
  */
 
+#ifndef                                         HILDON_DISABLE_DEPRECATED
+
 #ifndef                                         __HILDON_TIME_PICKER_H__
 #define                                         __HILDON_TIME_PICKER_H__
 
@@ -86,3 +88,5 @@ hildon_time_picker_get_time                     (HildonTimePicker *picker,
 G_END_DECLS
 
 #endif                                          /* __HILDON_TIME_PICKER_H__ */
+
+#endif                                          /* HILDON_DISABLE_DEPRECATED */

diff --git a/src/hildon-touch-selector.c b/src/hildon-touch-selector.c
index 0548045..5d7f3d5 100644 (file)
--- a/src/hildon-touch-selector.c
+++ b/src/hildon-touch-selector.c
@@ -76,6 +76,8 @@
  * column.
  */
 
+#undef HILDON_DISABLE_DEPRECATED
+
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif

diff --git a/src/hildon-volumebar.c b/src/hildon-volumebar.c
index 5ce5fba..2d460d5 100644 (file)
--- a/src/hildon-volumebar.c
+++ b/src/hildon-volumebar.c
@@ -32,6 +32,8 @@
  * the volume when users click the mute icon.
  */
 
+#undef                                          HILDON_DISABLE_DEPRECATED
+
 #ifdef                                          HAVE_CONFIG_H
 #include                                        <config.h>
 #endif

diff --git a/src/hildon-volumebar.h b/src/hildon-volumebar.h
index 70454b7..cdba7ae 100644 (file)
--- a/src/hildon-volumebar.h
+++ b/src/hildon-volumebar.h
@@ -22,6 +22,8 @@
  *
  */
 
+#ifndef                                         HILDON_DISABLE_DEPRECATED
+
 #ifndef                                         __HILDON_VOLUMEBAR_H__
 #define                                         __HILDON_VOLUMEBAR_H__
 
@@ -100,3 +102,5 @@ hildon_volumebar_set_range_insensitive_messagef (HildonVolumebar *widget,
 G_END_DECLS
 
 #endif                                          /* __HILDON_VOLUMEBAR_H__ */
+
+#endif                                          /* HILDON_DISABLE_DEPRECATED */

diff --git a/src/hildon-vvolumebar.c b/src/hildon-vvolumebar.c
index aca165a..0eb2d14 100644 (file)
--- a/src/hildon-vvolumebar.c
+++ b/src/hildon-vvolumebar.c
@@ -43,6 +43,8 @@
  * </example>
  */
 
+#undef                                          HILDON_DISABLE_DEPRECATED
+
 #ifdef                                          HAVE_CONFIG_H
 #include                                        <config.h>
 #endif

diff --git a/src/hildon-vvolumebar.h b/src/hildon-vvolumebar.h
index 4763e22..7a387d9 100644 (file)
--- a/src/hildon-vvolumebar.h
+++ b/src/hildon-vvolumebar.h
@@ -22,6 +22,8 @@
  *
  */
 
+#ifndef                                         HILDON_DISABLE_DEPRECATED
+
 #ifndef                                         __HILDON_VVOLUMEBAR_H__
 #define                                         __HILDON_VVOLUMEBAR_H__
 
@@ -71,3 +73,5 @@ hildon_vvolumebar_new                           (void);
 G_END_DECLS
 
 #endif                                          /* __HILDON_VVOLUMEBAR_H__ */
+
+#endif                                          /* HILDON_DISABLE_DEPRECATED */

diff --git a/src/hildon-weekday-picker.c b/src/hildon-weekday-picker.c
index 4c6860a..c827055 100644 (file)
--- a/src/hildon-weekday-picker.c
+++ b/src/hildon-weekday-picker.c
@@ -58,6 +58,8 @@
     problem, we addjust GDate days numbering to be same as locale
     numbering */
 
+#undef                                          HILDON_DISABLE_DEPRECATED
+
 #ifdef                                          HAVE_CONFIG_H
 #include                                        <config.h>
 #endif

diff --git a/src/hildon-weekday-picker.h b/src/hildon-weekday-picker.h
index d0a895c..decf280 100644 (file)
--- a/src/hildon-weekday-picker.h
+++ b/src/hildon-weekday-picker.h
@@ -22,6 +22,8 @@
  *
  */
 
+#ifndef                                         HILDON_DISABLE_DEPRECATED
+
 #ifndef                                         __HILDON_WEEKDAY_PICKER_H__
 #define                                         __HILDON_WEEKDAY_PICKER_H__
 
@@ -96,3 +98,5 @@ hildon_weekday_picker_isset_day                 (HildonWeekdayPicker * picker,
 G_END_DECLS
 
 #endif                                          /* __HILDON_WEEKDAY_PICKER_H__ */
+
+#endif                                          /* HILDON_DISABLE_DEPRECATED */

diff --git a/src/hildon-window.c b/src/hildon-window.c
index 6055a1f..e3726d0 100644 (file)
--- a/src/hildon-window.c
+++ b/src/hildon-window.c
@@ -72,6 +72,8 @@
  * </example>
  */
 
+#undef                                          HILDON_DISABLE_DEPRECATED
+
 #include                                        <memory.h>
 #include                                        <string.h>
 #include                                        <strings.h>

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 5ca64dd..a640162 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -4,9 +4,19 @@ if BUILD_TESTS
 
 noinst_PROGRAMS                                = check_test
 
-check_test_SOURCES                     = check_test.c                          \
+TESTS                                  = check_test.c                          \
                                          check_utils.c                         \
-                                         check-hildon-range-editor.c           \
+                                         check-hildon-caption.c                \
+                                         check-hildon-helper.c                 \
+                                         check-hildon-note.c                   \
+                                         check-hildon-banner.c                 \
+                                         check-hildon-wizard-dialog.c          \
+                                         check-hildon-find-toolbar.c           \
+                                         check-hildon-window.c                 \
+                                         check-hildon-program.c
+
+
+DEPRECATED_TESTS                       = check-hildon-range-editor.c           \
                                          check-hildon-date-editor.c            \
                                          check-hildon-time-editor.c            \
                                          check-hildon-weekday-picker.c         \
@@ -15,22 +25,21 @@ check_test_SOURCES                  = check_test.c                          \
                                          check-hildon-time-picker.c            \
                                          check-hildon-number-editor.c          \
                                          check-hildon-calendar-popup.c         \
-                                         check-hildon-caption.c                \
-                                         check-hildon-helper.c                 \
                                          check-hildon-code-dialog.c            \
-                                         check-hildon-find-toolbar.c           \
                                          check-hildon-sort-dialog.c            \
-                                         check-hildon-note.c                   \
                                          check-hildon-volumebar.c              \
                                          check-hildon-volumebar-range.c        \
-                                         check-hildon-banner.c                 \
-                                         check-hildon-wizard-dialog.c          \
                                          check-hildon-font-selection-dialog.c  \
-                                         check-hildon-window.c                 \
-                                         check-hildon-program.c                \
                                          check-hildon-color-button.c           \
                                          check-hildon-color-chooser.c
 
+if HILDON_DISABLE_DEPRECATED
+check_test_SOURCES                     = $(TESTS)
+else
+check_test_SOURCES                     = $(TESTS)                              \
+                                         $(DEPRECATED_TESTS)
+endif
+
 check_test_LDADD                       = $(HILDON_OBJ_LIBS)
 check_test_LDFLAGS                     = -module -avoid-version
 check_test_CFLAGS                      = $(HILDON_OBJ_CFLAGS) 

diff --git a/tests/check_test.c b/tests/check_test.c
index 7fbacfe..e54de92 100644 (file)
--- a/tests/check_test.c
+++ b/tests/check_test.c
@@ -50,7 +50,9 @@ configure_tests(gint environment)
   SRunner *sr;
   
   /* Create srunner object with the first test suite */
-  sr = srunner_create(create_hildon_range_editor_suite());
+
+  sr = srunner_create(create_hildon_caption_suite());
+#ifndef HILDON_DISABLE_DEPRECATED
   srunner_add_suite(sr, create_hildon_number_editor_suite());
   srunner_add_suite(sr, create_hildon_time_editor_suite());
   srunner_add_suite(sr, create_hildon_time_picker_suite());
@@ -62,22 +64,24 @@ configure_tests(gint environment)
   srunner_add_suite(sr, create_hildon_seekbar_suite());
   /* srunner_add_suite(sr, create_hildon_dialoghelp_suite()); */
   srunner_add_suite(sr, create_hildon_calendar_popup_suite());
-  srunner_add_suite(sr, create_hildon_caption_suite());
-  srunner_add_suite(sr, create_hildon_helper_suite());
-  srunner_add_suite(sr, create_hildon_find_toolbar_suite());
+  srunner_add_suite(sr, create_hildon_range_editor_suite());
   /* srunner_add_suite(sr, create_hildon_name_password_dialog_suite());
   srunner_add_suite(sr, create_hildon_get_password_dialog_suite());
   srunner_add_suite(sr, create_hildon_set_password_dialog_suite()); */
   srunner_add_suite(sr, create_hildon_sort_dialog_suite());
   srunner_add_suite(sr, create_hildon_code_dialog_suite());
-  srunner_add_suite(sr, create_hildon_note_suite());
   srunner_add_suite(sr, create_hildon_volumebar_suite());
   srunner_add_suite(sr, create_hildon_volumebar_range_suite());
+  srunner_add_suite(sr, create_hildon_font_selection_dialog_suite());
+#endif /* HILDON_DISABLE_DEPRECATED */
+
+  srunner_add_suite(sr, create_hildon_find_toolbar_suite());
+  srunner_add_suite(sr, create_hildon_note_suite());
   srunner_add_suite(sr, create_hildon_wizard_dialog_suite());
   /* srunner_add_suite(sr, create_hildon_scroll_area_suite()); */
   srunner_add_suite(sr, create_hildon_banner_suite());
-  srunner_add_suite(sr, create_hildon_font_selection_dialog_suite());
   srunner_add_suite(sr, create_hildon_window_suite());
+  srunner_add_suite(sr, create_hildon_helper_suite());
 
   /* Disable tests that need maemo environment to be up if it is not running */
   if (environment != ENVIRONMENT_MAEMO_ERROR)