* Changes in the autotools stuff affecting a lot of platform dependent

[modest] / src / widgets / modest-window.h

diff --git a/src/widgets/modest-window.h b/src/widgets/modest-window.h
index d3fa65d..cd159d4 100644 (file)
--- a/src/widgets/modest-window.h
+++ b/src/widgets/modest-window.h
@@ -45,18 +45,16 @@ G_BEGIN_DECLS
  * admittedly, the ifdefs for gtk and maemo are rather ugly; still
  * this way is probably the easiest to maintain
  */
-#ifdef MODEST_PLATFORM_GNOME
+#ifdef MODEST_TOOLKIT_GTK
 #include <gtk/gtkwindow.h>
 typedef GtkWindow      ModestWindowParent;
 typedef GtkWindowClass ModestWindowParentClass;
-#endif /* MODEST_PLATFORM_GNOME */
-
-#ifdef MODEST_PLATFORM_MAEMO
-#ifdef MODEST_HAVE_HILDON0_WIDGETS
+#else
+#if MODEST_HILDON_API == 0
 #include <hildon-widgets/hildon-window.h>
 #else
 #include <hildon/hildon-window.h>
-#endif /*MODEST_HAVE_HILDON0_WIDGETS*/
+#endif /*MODEST_HILDON_API == 0*/
 typedef HildonWindow      ModestWindowParent;
 typedef HildonWindowClass ModestWindowParentClass;
 
@@ -64,12 +62,12 @@ typedef HildonWindowClass ModestWindowParentClass;
 #define GTK_STOCK_FULLSCREEN ""
 #endif /*GTK_STOCK_FULLSCREEN*/
 
-#endif /*MODEST_PLATFORM_MAEMO */
+#endif /*!MODEST_TOOLKIT_GTK */
 
 /* Dimmed state variables */
 typedef struct _DimmedState {  
        guint    n_selected;
-       gboolean already_opened_msg;
+       guint    already_opened_msg;
        gboolean any_marked_as_deleted;
        gboolean all_marked_as_deleted;
        gboolean any_marked_as_seen;
@@ -137,7 +135,8 @@ const gchar* modest_window_get_active_account (ModestWindow *self);
  * @self: a modest window instance
  * @active_account: a new active account name for this window
  * 
- * set the active account for this window
+ * set the active account for this window.
+ * NOTE: this must be a valid, non-pseudo account.
  * 
  */    
 void modest_window_set_active_account (ModestWindow *self, const gchar *active_account);