Revert "Fixes NB#123383, unexpected lines appear in new email editor body area"

[modest] / src / maemo / modest-hildon-includes.h

diff --git a/src/maemo/modest-hildon-includes.h b/src/maemo/modest-hildon-includes.h
index fb69e86..1f7b41d 100644 (file)
--- a/src/maemo/modest-hildon-includes.h
+++ b/src/maemo/modest-hildon-includes.h
@@ -58,7 +58,7 @@ k * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
 #include <hildon/hildon-notification.h>
 #endif /*MODEST_HILDON_NOTIFY*/
 
-#ifdef MODEST_HAVE_HILDON0_WIDGETS
+#if MODEST_HILDON_API == 0
 #include <hildon-widgets/hildon-color-selector.h>
 #include <hildon-widgets/hildon-color-button.h>
 #include <hildon-widgets/hildon-banner.h>
@@ -73,7 +73,7 @@ k * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
 
 #else
 
-#ifdef MODEST_HAVE_HILDON1_WIDGETS
+#if MODEST_HILDON_API >= 1
 #include <hildon/hildon-helper.h>
 #include <hildon/hildon-file-chooser-dialog.h>
 #include <hildon/hildon-color-chooser.h>
@@ -126,11 +126,11 @@ k * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
 /* some extra #defines, so it will compile with the 'normal' gtk */
 #ifndef MODEST_HAVE_HILDON_GTK
 #define hildon_gtk_entry_set_input_mode(a,b) \
-       g_warning ("%s: hildon_gtk_entry_set_input_mode requires gtk-hildon", __FUNCTION__)
+       g_debug ("%s: hildon_gtk_entry_set_input_mode requires gtk-hildon", __FUNCTION__)
 #define hildon_gtk_text_view_set_input_mode(a,b) \
-       g_warning ("%s: hildon_gtk_text_view_set_input_mode requires gtk-hildon", __FUNCTION__)
+       g_debug ("%s: hildon_gtk_text_view_set_input_mode requires gtk-hildon", __FUNCTION__)
 #define gtk_widget_tap_and_hold_setup(a,b,c,d)                         \
-       g_warning ("%s: gtk_widget_tap_and_hold_setup requires gtk-hildon", __FUNCTION__)
+       g_debug ("%s: gtk_widget_tap_and_hold_setup requires gtk-hildon", __FUNCTION__)
 
 typedef enum
 {