From: Alejandro Piñeiro <apinheiro@igalia.com>
Date: Fri, 26 Jun 2009 11:50:28 +0000 (+0200)
Subject: Missed commit in order to fix compilation using '--enable-fatal' and '--disable-depre... 
X-Git-Tag: 2.1.86-1~2
X-Git-Url: https://vcs.maemo.org/git/?p=hildon;a=commitdiff_plain;h=ece69692d489b5975cd0bf24d454c035f3f12ca1

Missed commit in order to fix compilation using '--enable-fatal' and '--disable-deprecated' (see previous commit)

* tests/check-hildon-banner.c
* tests/check_text.c
* tests/test_suites.h
Protect hildon-banner tests with #ifndef HILDON_DISABLE_DEPRECATED, as
were testing deprecated functions.
* examples/hildon-banner-example.c: typo on button3 type, that causes
a fail compiling with --with-examples but without --disable-deprecated

Missed commit in order to fix compilation using '--enable-fatal' and
'--disable-deprecated' (see previous commit)
---

diff --git a/ChangeLog b/ChangeLog
index bbeafd8..84baeb5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
 2009-06-26  Alejandro Pinheiro  <apinheiro@igalia.com>
 
+	* tests/check-hildon-banner.c
+	* tests/check_text.c
+	* tests/test_suites.h
+	Protect hildon-banner tests with #ifndef HILDON_DISABLE_DEPRECATED, as
+	were testing deprecated functions.
+	* examples/hildon-banner-example.c: typo on button3 type, that causes
+	a fail compiling with --with-examples but without --disable-deprecated
+
+	Missed commit in order to fix compilation using '--enable-fatal' and
+	'--disable-deprecated' (see previous commit)
+
+2009-06-26  Alejandro Pinheiro  <apinheiro@igalia.com>
+
 	* examples/hildon-banner-example.c: Protect deprecated hildon-banner
 	functions with #ifndef HILDON_DISABLE_DEPRECATED
 	* examples/hildon-find-toolbar.c: Protect deprecated
diff --git a/examples/hildon-banner-example.c b/examples/hildon-banner-example.c
index 887c033..847172d 100644
--- a/examples/hildon-banner-example.c
+++ b/examples/hildon-banner-example.c
@@ -81,7 +81,7 @@ main                                            (int argc,
     HildonProgram *program;
     GtkWidget *window, *vbox, *button1;
 #ifndef HILDON_DISABLE_DEPRECATED
-    GtkWidget *button2, button3;
+    GtkWidget *button2, *button3;
 #endif
 
     hildon_gtk_init (&argc, &argv);
diff --git a/tests/check-hildon-banner.c b/tests/check-hildon-banner.c
index 4bc40d7..ed3ee42 100644
--- a/tests/check-hildon-banner.c
+++ b/tests/check-hildon-banner.c
@@ -21,6 +21,7 @@
  * 02110-1301 USA
  *
  */
+#ifndef HILDON_DISABLE_DEPRECATED
 
 #include <stdlib.h>
 #include <check.h>
@@ -215,8 +216,6 @@ START_TEST (test_show_progress_invalid)
 }
 END_TEST
 
-
-
 /* ---------- Suite creation ---------- */
 Suite *create_hildon_banner_suite()
 {
@@ -225,7 +224,7 @@ Suite *create_hildon_banner_suite()
 
   /* Create test cases */
   TCase *tc1 = tcase_create("show_animation");
-  TCase *tc2 = tcase_create("show_animation");
+  TCase *tc2 = tcase_create("show_progress");
 
   /* Create unit tests for hildon_banner_show_animation and add it to the suite */
   tcase_add_checked_fixture(tc1, fx_setup_default_banner, fx_teardown_default_banner);
@@ -244,3 +243,5 @@ Suite *create_hildon_banner_suite()
   /* Return created suite */
   return s;             
 }
+
+#endif
diff --git a/tests/check_test.c b/tests/check_test.c
index afc2075..c82c438 100644
--- a/tests/check_test.c
+++ b/tests/check_test.c
@@ -79,7 +79,11 @@ configure_tests(gint environment)
   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()); */
+#ifndef HILDON_DISABLE_DEPRECATED
+  /* HildonBanner is not deprecated, but all the functions tested in
+     this suite are deprecated*/
   srunner_add_suite(sr, create_hildon_banner_suite());
+#endif
   srunner_add_suite(sr, create_hildon_window_suite());
   srunner_add_suite(sr, create_hildon_helper_suite());
   srunner_add_suite(sr, create_hildon_picker_button_suite());
diff --git a/tests/test_suites.h b/tests/test_suites.h
index d0d5afa..c0b6b29 100644
--- a/tests/test_suites.h
+++ b/tests/test_suites.h
@@ -51,7 +51,11 @@ Suite *create_hildon_note_suite(void);
 Suite *create_hildon_volumebar_suite(void);
 Suite *create_hildon_volumebar_range_suite(void);
 Suite *create_hildon_wizard_dialog_suite(void);
+#ifndef HILDON_DISABLE_DEPRECATED
+/* HildonBanner is not deprecated, but all the functions tested in
+   this suite are deprecated*/
 Suite *create_hildon_banner_suite(void);
+#endif
 Suite *create_hildon_font_selection_dialog_suite(void);
 Suite *create_hildon_system_sound_suite(void);
 Suite *create_hildon_scroll_area_suite(void);