./modest/debian r29: Grah revert patches applied to bzr tree...

[Loïc Minier]

------------------------------------------------------------
revno: 29
committer: Loïc Minier <lool at dooz.org>
branch nick: debian
timestamp: Thu 2008-08-28 04:07:08 +0200
message:
  Grah revert patches applied to bzr tree...
modified:
  configure.ac
  src/Makefile.am
  src/maemo/Makefile.am
  src/maemo/modest-msg-edit-window.c
-------------- next part --------------
=== modified file 'configure.ac'
--- a/configure.ac	2008-08-14 15:02:24 +0000
+++ b/configure.ac	2008-08-28 02:07:08 +0000
@@ -65,7 +65,7 @@
 
 
 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-3.14 libtinymail-1.0 libtinymail-camel-1.0 libtinymail-gnomevfs-1.0 libtinymailui-1.0 libtinymailui-gtk-1.0) 
+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-3.8 libtinymail-1.0 libtinymail-camel-1.0 libtinymail-gnomevfs-1.0 libtinymailui-1.0 libtinymailui-gtk-1.0) 
 AC_SUBST(MODEST_GSTUFF_CFLAGS)
 AC_SUBST(MODEST_GSTUFF_LIBS)
 
@@ -365,7 +365,7 @@
 
   # warnings are errors, but don't check format errors, because
   # it breaks with logical ids
-  CFLAGS="$CFLAGS -Wno-format-extra-args"
+  CFLAGS="$CFLAGS -Wno-format-extra-args -Werror"
 
    desktopentrydir=`$PKG_CONFIG osso-af-settings --variable=desktopentrydir`
    serviceentrydir=`$PKG_CONFIG dbus-glib-1 --variable=prefix`/share/dbus-1/services

=== modified file 'src/Makefile.am'
--- a/src/Makefile.am	2008-08-14 15:02:24 +0000
+++ b/src/Makefile.am	2008-08-28 02:07:08 +0000
@@ -137,8 +137,7 @@
 endif 
 
 
-modest_CFLAGS  = $(MAEMO_LAUNCHER_CFLAGS) \
-	$(MODEST_WPEDITOR_CFLAGS)
+modest_CFLAGS  = $(MAEMO_LAUNCHER_CFLAGS)
 modest_LDFLAGS = -Wl,--version-script=export.map
 
 modest_UNWANTED = -export-dynamic -Wl,--export-dynamic
@@ -154,8 +153,7 @@
 	$(MODEST_OGS_LIBS)				\
 	${easysetupmaybe}				\
 	$(MODEST_PLATFORM)/libmodest-ui.la		\
-	widgets/libmodest-widgets.la			\
-	$(MODEST_WPEDITOR_LIBS))
+	widgets/libmodest-widgets.la)
 
 
 if MODEST_HAVE_DBUS_API

=== modified file 'src/maemo/Makefile.am'
--- a/src/maemo/Makefile.am	2008-08-14 15:02:24 +0000
+++ b/src/maemo/Makefile.am	2008-08-28 02:07:08 +0000
@@ -111,7 +111,6 @@
 ui_DATA = $(UI_FILES)
 
 serviceentry_DATA   = com.nokia.modest.service
-desktopentrydir     = $(datadir)/applications/hildon
 desktopentry_DATA   = modest.desktop
 backupsettings_DATA = modest.conf
 

=== modified file 'src/maemo/modest-msg-edit-window.c'
--- a/src/maemo/modest-msg-edit-window.c	2008-08-14 15:02:24 +0000
+++ b/src/maemo/modest-msg-edit-window.c	2008-08-28 02:07:08 +0000
@@ -1044,7 +1044,7 @@
 			if (pixbuf != NULL) {
 				priv->images_count ++;
 				priv->images_size += stream_size;
-				/*wp_text_buffer_replace_image (WP_TEXT_BUFFER (priv->text_buffer), cid, pixbuf);*/
+				wp_text_buffer_replace_image (WP_TEXT_BUFFER (priv->text_buffer), cid, pixbuf);
 				g_object_unref (pixbuf);
 			}
 		}