From: Sergio Villar Senín <svillar@igalia.com>
Date: Wed, 25 Nov 2009 17:42:23 +0000 (+0100)
Subject: Fixed some compilation errors in gnome platform
X-Git-Tag: jdapena-ppa-3.90.4-modest0~199
X-Git-Url: https://vcs.maemo.org/git/?a=commitdiff_plain;h=5bc263bffb8df1106969e00b3e074a13cc979dc7;p=modest

Fixed some compilation errors in gnome platform

This includes removing some code and adding one ifdef that checks the existence of wpeditor-plus
---

diff --git a/configure.ac b/configure.ac
index a2446c0..3fb0354 100644
--- a/configure.ac
+++ b/configure.ac
@@ -125,7 +125,6 @@ else
    AC_MSG_ERROR([install gtkhtml 3.8 or newer])
 fi
 
-PKG_CHECK_MODULES(LIBMODEST_DBUS_CLIENT,libmodest-dbus-client-1.0 >= 3.2.0)
 dnl # GLib/Gobject/Gtk/Gconf => mandatory
 
 PKG_CHECK_MODULES(MODEST_GSTUFF,glib-2.0 >= 2.6 gobject-2.0 gtk+-2.0 >= 2.6 gconf-2.0 gnome-vfs-2.0 libgtkhtml-${gtk_html_version} libtinymail-1.0 libtinymail-camel-1.0 libtinymail-gnomevfs-1.0 libtinymailui-1.0 libtinymailui-gtk-1.0) 
@@ -176,7 +175,7 @@ fi
 
 if test "$with_platform" = "maemo"; then
    	MODEST_PLUGIN_DEFINES=" -DMODEST_PLATFORM_MAEMO -DMODEST_API_VERSION=${MODEST_API_VERSION}"
-	PKG_CHECK_MODULES(LIBMODEST_DBUS_CLIENT,libmodest-dbus-client-1.0)
+	PKG_CHECK_MODULES(LIBMODEST_DBUS_CLIENT,libmodest-dbus-client-1.0 >= 3.2.0)
 elif test "$with_platform" = "gnome"; then
 	MODEST_PLUGIN_DEFINES=" -DMODEST_PLATFORM_GNOME -DMODEST_API_VERSION=${MODEST_API_VERSION}"
 fi
diff --git a/src/Makefile.am b/src/Makefile.am
index d6affab..8ab21ca 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,7 +3,7 @@
 # Time-stamp: <2008-01-06 10:18:49 (djcb)>
 
 SUBDIRS= $(MODEST_TOOLKIT_DIR) widgets $(dbus_api)
-DIST_SUBDIRS = widgets gtk maemo hildon2 dbus_api
+DIST_SUBDIRS = widgets gtk hildon2 dbus_api
 
 INCLUDES=\
 	$(MODEST_GSTUFF_CFLAGS)					\
diff --git a/src/widgets/modest-msg-edit-window.c b/src/widgets/modest-msg-edit-window.c
index bc8bb5b..151c13d 100644
--- a/src/widgets/modest-msg-edit-window.c
+++ b/src/widgets/modest-msg-edit-window.c
@@ -1275,7 +1275,9 @@ replace_with_images (ModestMsgEditWindow *self, TnyList *attachments)
 			if (pixbuf != NULL) {
 				priv->images_count ++;
 				priv->images_size += stream_size;
+#ifndef MODEST_HAVE_LIBWPEDITOR_PLUS
 				wp_text_buffer_replace_image (WP_TEXT_BUFFER (priv->text_buffer), cid, pixbuf);
+#endif
 				g_object_unref (pixbuf);
 			}
 		}
diff --git a/src/widgets/modest-toolkit-utils.h b/src/widgets/modest-toolkit-utils.h
index 02f46e7..a0a887e 100644
--- a/src/widgets/modest-toolkit-utils.h
+++ b/src/widgets/modest-toolkit-utils.h
@@ -34,7 +34,6 @@
 #include <gtk/gtk.h>
 #include <stdio.h> /* for FILE* */
 #include <tny-fs-stream.h>
-#include <libosso.h>
 #include "widgets/modest-global-settings-dialog.h"
 #include "widgets/modest-validating-entry.h"