modest-maemo-ui-constants.h \
modest-main-window.c \
modest-main-window-ui.h \
+ modest-hildon-includes.h \
modest-platform.c \
modest-signature-editor-dialog.c \
modest-signature-editor-dialog.h \
#include <gtk/gtkcheckbutton.h>
#include <gtk/gtkmessagedialog.h>
#include <gtk/gtkseparator.h>
-#include <hildon-widgets/hildon-caption.h>
#include "maemo/easysetup/modest-easysetup-country-combo-box.h"
#include "maemo/easysetup/modest-easysetup-provider-combo-box.h"
#include "maemo/easysetup/modest-easysetup-servertype-combo-box.h"
/* #include <hildon-widgets/hildon-wizard-dialog.h> */
#include "modest-wizard-dialog.h" /* We use a copied-and-improved HildonWizardDialog. */
#include "modest-account-mgr.h"
+
+#ifdef MODEST_HILDON_VERSION_0
#include <hildon-widgets/hildon-caption.h>
+#else
+#include <hildon/hildon-caption.h>
+#endif /*MODEST_HILDON_VERSION_0*/
G_BEGIN_DECLS
#include <gtk/gtkhbox.h>
#include <gtk/gtkvbox.h>
#include <gtk/gtkbutton.h>
+
+#ifdef MODEST_HILDON_VERSION_0
#include <hildon-widgets/hildon-defines.h>
+#else
+#include <hildon/hildon-defines.h>
+#endif /*MODEST_HILDON_VERSION_0*/
#include "modest-wizard-dialog.h"
gtk_dialog_set_has_separator (dialog, FALSE);
wizard_dialog->priv = priv;
priv->box = GTK_BOX (gtk_hbox_new (FALSE, 0));
- priv->image = gtk_image_new_from_icon_name ("qgn_widg_wizard",
+#ifdef MODEST_HILDON_VERSION_0
+ priv->image = gtk_image_new_from_icon_name ("qgn_widg_wizard"
HILDON_ICON_SIZE_WIDG_WIZARD);
-
+#else
+ priv->image = gtk_image_new_from_icon_name ("qgn_widg_wizard",
+ HILDON_ICON_SIZE_WIZARD);
+#endif /*MODEST_HILDON_VERSION_0*/
/* Default values for user provided properties */
priv->notebook = NULL;
priv->wizard_name = NULL;
#include <gtk/gtkcheckbutton.h>
#include <gtk/gtkmessagedialog.h>
#include <gtk/gtkstock.h>
-#include <hildon-widgets/hildon-caption.h>
-#include <hildon-widgets/hildon-number-editor.h>
+#include "modest-hildon-includes.h"
+
#include "widgets/modest-serversecurity-combo-box.h"
#include "widgets/modest-secureauth-combo-box.h"
#include "widgets/modest-validating-entry.h"
#include <gtk/gtkdialog.h>
#include "modest-account-mgr.h"
-#include <hildon-widgets/hildon-caption.h>
+#include "modest-hildon-includes.h"
G_BEGIN_DECLS
#include <libebook/e-book.h>
#include <libebook/e-book-view.h>
#include <libosso-abook/osso-abook.h>
-#include <hildon-widgets/hildon-note.h>
-#include <hildon-widgets/hildon-caption.h>
-#include <hildon-widgets/hildon-banner.h>
+#include "modest-hildon-includes.h"
#include <string.h>
#include <gtk/gtksizegroup.h>
#include <gtk/gtkbox.h>
#include "modest-connection-specific-smtp-edit-window.h"
#include "maemo/modest-maemo-ui-constants.h"
-#include <hildon-widgets/hildon-caption.h>
-#include <hildon-widgets/hildon-number-editor.h>
+#include "modest-hildon-includes.h"
#include "widgets/modest-serversecurity-combo-box.h"
#include "widgets/modest-secureauth-combo-box.h"
#include "widgets/modest-validating-entry.h"
--- /dev/null
+/* Copyright (c) 2006, Nokia Corporation
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the Nokia Corporation nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+k * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#ifndef __MODEST_HILDON_INCLUDES__
+#define __MODEST_HILDON_INCLUDES__
+
+
+#ifdef MODEST_HILDON_VERSION_0
+#include <osso-mime.h>
+#include <osso-uri.h>
+#include <hildon-widgets/hildon-color-selector.h>
+#include <hildon-widgets/hildon-color-button.h>
+#include <hildon-widgets/hildon-banner.h>
+#include <hildon-widgets/hildon-caption.h>
+#include <hildon-widgets/hildon-number-editor.h>
+#include <hildon-widgets/hildon-note.h>
+#include <hildon-widgets/hildon-file-chooser-dialog.h>
+#include <hildon-widgets/hildon-font-selection-dialog.h>
+#include <hildon-widgets/hildon-find-toolbar.h>
+#else
+#include <hildon-mime.h>
+#include <hildon-uri.h>
+#include <hildon/hildon-file-chooser-dialog.h>
+#include <hildon/hildon-color-chooser.h>
+#include <hildon/hildon-banner.h>
+#include <hildon/hildon-color-button.h>
+#include <hildon/hildon-note.h>
+#include <hildon/hildon-color-button.h>
+#include <hildon/hildon-font-selection-dialog.h>
+#include <hildon/hildon-caption.h>
+#include <hildon/hildon-find-toolbar.h>
+#include <hildon/hildon-number-editor.h>
+#endif /* MODEST_HILDON_VERSION_0*/
+
+
+#endif /*__MODEST_HILDON_INCLUDES__*/
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <hildon-widgets/hildon-window.h>
-#include <hildon-widgets/hildon-note.h>
-
#include <glib/gi18n.h>
#include <gtk/gtktreeviewcolumn.h>
#include <tny-account-store-view.h>
#include <tny-simple-list.h>
+#include "modest-hildon-includes.h"
#include <string.h>
#include <wptextbuffer.h>
#include "modest-scroll-area.h"
-#ifdef MODEST_HILDON_VERSION_0
-#include <hildon-widgets/hildon-color-selector.h>
-#include <hildon-widgets/hildon-color-button.h>
-#include <hildon-widgets/hildon-banner.h>
-#include <hildon-widgets/hildon-caption.h>
-#include <hildon-widgets/hildon-note.h>
-#include <hildon-widgets/hildon-file-chooser-dialog.h>
-#include <hildon-widgets/hildon-font-selection-dialog.h>
-#else
-#include <hildon/hildon-file-chooser-dialog.h>
-#include <hildon/hildon-color-chooser.h>
-#include <hildon/hildon-banner.h>
-#include <hildon/hildon-color-button.h>
-#include <hildon/hildon-note.h>
-#include <hildon/hildon-color-button.h>
-#include <hildon/hildon-font-selection-dialog.h>
-#include <hildon/hildon-caption.h>
-#endif /* MODEST_HILDON_VERSION_0*/
-
-
+#include "modest-hildon-includes.h"
#include "widgets/modest-msg-edit-window-ui.h"
-#ifdef MODEST_HILDON_VERSION_0
-#else
-
-#endif /*MODEST_HILDON_VERSION_0 */
-
-
#define DEFAULT_FONT_SIZE 3
#define DEFAULT_FONT 2
#else
dialog = hildon_color_chooser_new ();
hildon_color_chooser_set_color (HILDON_COLOR_CHOOSER (dialog), &(buffer_format->color));
-#endif /*MODEST_HILDON_VERSION_9*/
+#endif /*MODEST_HILDON_VERSION_0*/
g_free (buffer_format);
response = gtk_dialog_run (GTK_DIALOG (dialog));
#include <modest-runtime.h>
#include <modest-window-priv.h>
#include <modest-tny-folder.h>
-#include <hildon-widgets/hildon-find-toolbar.h>
-#include <hildon-widgets/hildon-defines.h>
-#include <hildon-widgets/hildon-banner.h>
+#include "modest-hildon-includes.h"
#include <gtkhtml/gtkhtml-search.h>
#include <gdk/gdkkeysyms.h>
#include <modest-runtime.h>
#include <dbus_api/modest-dbus-callbacks.h>
#include <libosso.h>
-
-#ifdef MODEST_HILDON_VERSION_0
-#include <osso-mime.h>
-#include <osso-uri.h>
-#else
-#include <hildon-mime.h>
-#include <hildon-uri.h>
-#endif /*MODEST_HILDON_VERSION_0*/
-
+#include <modest-hildon-includes.h>
#include <tny-maemo-conic-device.h>
#include <tny-folder.h>
#include <gtk/gtkicontheme.h>
-#include <hildon-widgets/hildon-banner.h>
-#include <hildon-widgets/hildon-note.h>
#include <gtk/gtkmenuitem.h>
#include <gtk/gtkmain.h>
#include <string.h>
#include "modest-signature-editor-dialog.h"
#include "maemo/modest-maemo-ui-constants.h"
-#include <hildon-widgets/hildon-caption.h>
-#include <hildon-widgets/hildon-number-editor.h>
+#include "modest-hildon-includes.h"
#include "widgets/modest-serversecurity-combo-box.h"
#include "widgets/modest-secureauth-combo-box.h"
#include "widgets/modest-validating-entry.h"