#include <libgnomevfs/gnome-vfs.h>
#include <string.h>
#include "modest-text-utils.h"
-
-#ifndef MODEST_TOOLKIT_GTK
+#include <locale.h>
+#ifdef MODEST_TOOLKIT_HILDON2
#include "modest-hildon-includes.h"
#endif
-#include <locale.h>
static gboolean init_header_columns (ModestConf *conf, gboolean overwrite);
static gboolean init_default_account_maybe (ModestAccountMgr *acc_mgr);
gint i;
static GtkStockItem items[] = {
-#ifndef MODEST_TOOLKIT_GTK
+#ifdef MODEST_TOOLKIT_HILDON2
{ MODEST_STOCK_SORT, "sort mail", 0, 0, NULL },
{ MODEST_STOCK_REFRESH, "refresh mail", 0, 0, NULL },
#endif /*MODEST_TOOLKIT_GTK*/
};
static gchar *items_names [] = {
-#ifndef MODEST_TOOLKIT_GTK
+#ifdef MODEST_TOOLKIT_HILDON2
MODEST_TOOLBAR_ICON_SORT,
MODEST_TOOLBAR_ICON_REFRESH,
#endif /*MODEST_TOOLKIT_GTK*/
#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
**/
void modest_platform_on_runtime_initialized ();
-#ifndef MODEST_TOOLKIT_GTK
+#ifdef MODEST_PLATFORM_MAEMO
/**
* modest_platform_get_osso_context:
*
#include <tny-merge-folder.h>
#include <modest-debug.h>
#include <string.h>
-#ifndef MODEST_TOOLKIT_GTK
+#ifdef MODEST_TOOLKIT_HILDON2
#include <hildon/hildon-file-system-info.h>
#endif
-#ifndef MODEST_TOOLKIT_GTK
+#ifdef MODEST_PLATFORM_MAEMO
/* Gets the memory card name: */
static void
on_modest_file_system_info (HildonFileSystemInfoHandle *handle,
void modest_tny_account_get_mmc_account_name (TnyStoreAccount* self, ModestTnyAccountGetMmcAccountNameCallback callback, gpointer user_data)
{
-#ifndef MODEST_TOOLKIT_GTK
+#ifdef MODEST_PLATFORM_MAEMO
/* Just use the path for the single memory card,
* rather than try to figure out the path to the specific card by
* looking at the maildir URI:
#include "modest-platform.h"
#ifdef MODEST_TOOLKIT_HILDON2
#include "modest-hildon-includes.h"
-#endif
-#ifndef MODEST_TOOLKIT_GTK
#include <hildon/hildon-number-editor.h>
#endif
/* include other impl specific header files */
gtk_html_set_caret_mode (GTK_HTML(self), FALSE);
gtk_html_set_blocking (GTK_HTML(self), TRUE);
gtk_html_set_images_blocking (GTK_HTML(self), TRUE);
- /* We don't need this for Hildon2 as this widget will be most
- likely inside scrollable area */
-#ifndef MODEST_TOOLKIT_HILDON2
-#ifndef MODEST_TOOLKIT_GTK
- gtk_html_set_auto_panning (GTK_HTML (self), TRUE);
-#endif
-#endif
#ifdef MODEST_TOOLKIT_HILDON2
#ifdef HAVE_GTK_HTML_SET_MAX_IMAGE_SIZE
#include <modest-toolkit-factory.h>
#include <modest-runtime.h>
-/* FIXNE: we should have no maemo-deps in widgets/ */
-#ifndef MODEST_TOOLKIT_GTK
+#ifdef MODEST_TOOLKIT_HILDON2
#include "modest-hildon-includes.h"
-#endif /*!MODEST_TOOLKIT_GTK*/
+#endif
#define RECPT_BUTTON_WIDTH_HILDON2 118
#define MODEST_MARGIN_DOUBLE 12
#define MODEST_MARGIN_TRIPLE 18
#define MODEST_DIALOG_WINDOW_MAX_HEIGHT 394
+#define MODEST_EDITABLE_SIZE 0
#endif
#define MODEST_SECONDARY_COLOR "grey"
#else /* MODEST_TOOLKIT_GTK */
#include <config.h>
#endif
-#ifndef MODEST_TOOLKIT_GTK
+#ifdef MODEST_TOOLKIT_HILDON2
#include <hildon/hildon-defines.h>
-#endif /*!MODEST_TOOLKIT_GTK*/
+#endif
#include "modest-wizard-dialog.h"
#include "modest-debug.h"