Fixed several invalid #ifdef statements

[modest] / src / modest-platform.h

diff --git a/src/modest-platform.h b/src/modest-platform.h
index 8ce6607..e1684f5 100644 (file)
--- a/src/modest-platform.h
+++ b/src/modest-platform.h
@@ -34,7 +34,7 @@
 #include "widgets/modest-window.h"
 #include "widgets/modest-folder-view.h"
 #include "widgets/modest-sort-criterium-view.h"
-#ifndef MODEST_TOOLKIT_GTK
+#ifdef MODEST_PLATFORM_MAEMO
 #include <libosso.h>
 #endif
 
@@ -46,7 +46,7 @@ typedef enum _ModestConfirmationDialogType {
 
 typedef enum _ModestConnectedVia {
        MODEST_CONNECTED_VIA_WLAN_OR_WIMAX = 1,
-       MODEST_CONNECTED_VIA_ANY,
+       MODEST_CONNECTED_VIA_ANY = 2,
 } ModestConnectedVia;
 
 #define MODEST_GTK_RESPONSE_NEW_FOLDER 1
@@ -182,7 +182,7 @@ gint      modest_platform_run_new_folder_dialog        (GtkWindow *parent_window
  * 
  * Returns: the #GtkResponseType returned by the dialog
  **/
-gint      modest_platform_run_rename_folder_dialog        (GtkWindow *parent_window,
+gint      modest_platform_run_rename_folder_dialog        (ModestWindow *parent_window,
                                                           TnyFolderStore *parent,
                                                           const gchar *current_name,
                                                           gchar **folder_name);
@@ -304,13 +304,13 @@ void modest_platform_push_email_notification(void);
 
 /**
  * modest_platform_on_new_headers_received:
- * @header_list: the list of new received headers
+ * @header_list: a list of #ModestMsgNotificationData
  * @show_visual: adds a visual notification 
  *
  * Performs the required actions when new headers are
  * received. Tipically it's useful for showing new email notifications
  **/
-void modest_platform_on_new_headers_received (TnyList *header_list,
+void modest_platform_on_new_headers_received (GList *URI_list,
                                              gboolean show_visual);
 
 /**
@@ -346,6 +346,10 @@ void modest_platform_information_banner (GtkWidget *widget,
                                         const gchar *icon_name,
                                         const gchar *text);
 
+void modest_platform_system_banner (GtkWidget *widget,
+                                   const gchar *icon_name,
+                                   const gchar *text);
+
 /* Timeout is in miliseconds */
 void modest_platform_information_banner_with_timeout (GtkWidget *parent,
                                                      const gchar *icon_name,
@@ -519,11 +523,15 @@ void     modest_platform_run_folder_details_dialog (GtkWindow *parent_window,
  * modest_platform_run_header_details_dialog:
  * @parent_window: the parent #GtkWindow for the new dialog
  * @header: the #TnyHeader whose details will be shown
+ * @async_get_size: %TRUE if size is obtained asynchronously from @msg
+ * @msg: a #TnyMsg
  *
  * Shows the header details dialog
  **/
 void     modest_platform_run_header_details_dialog (GtkWindow *parent_window,
-                                                   TnyHeader *header);
+                                                   TnyHeader *header,
+                                                   gboolean async_get_size,
+                                                   TnyMsg *msg);
 
 /**
  * modest_platform_on_runtime_initialized:
@@ -534,7 +542,7 @@ void     modest_platform_run_header_details_dialog (GtkWindow *parent_window,
  **/
 void     modest_platform_on_runtime_initialized ();
 
-#ifndef MODEST_TOOLKIT_GTK
+#ifdef MODEST_PLATFORM_MAEMO
 /**
  * modest_platform_get_osso_context:
  *