2007-07-27 Murray Cumming <murrayc@murrayc.com>

* src/maemo/modest-msg-edit-window.c: (replace_with_attachments):
Reverted my last commit. I was able to fix the build by doing
apt-get install wpeditor0 (replacing other wpeditor packages) and
an explicit apt-get install wpeditor-dev to upgrade the -dev
package.

pmo-trunk-r2815

diff --git a/ChangeLog2 b/ChangeLog2
index d6394b9..b53a045 100644 (file)
--- a/ChangeLog2
+++ b/ChangeLog2
@@ -1,5 +1,13 @@
 2007-07-27  Murray Cumming  <murrayc@murrayc.com>
 
 2007-07-27  Murray Cumming  <murrayc@murrayc.com>
 

+       * src/maemo/modest-msg-edit-window.c: (replace_with_attachments):
+       Reverted my last commit. I was able to fix the build by doing 
+       apt-get install wpeditor0 (replacing other wpeditor packages) and 
+       an explicit apt-get install wpeditor-dev to upgrade the -dev 
+       package.
+
+2007-07-27  Murray Cumming  <murrayc@murrayc.com>
+

        * src/maemo/modest-msg-edit-window.c: (replace_with_attachments):       
        Commented out the use of wp_text_buffer_replace_image() 
        because it does not exist, to break the build. Added a TODO for it.
        * src/maemo/modest-msg-edit-window.c: (replace_with_attachments):       
        Commented out the use of wp_text_buffer_replace_image() 
        because it does not exist, to break the build. Added a TODO for it.

diff --git a/src/maemo/modest-msg-edit-window.c b/src/maemo/modest-msg-edit-window.c
index 26afc0e..93f2c7d 100644 (file)
--- a/src/maemo/modest-msg-edit-window.c
+++ b/src/maemo/modest-msg-edit-window.c
@@ -663,8 +663,7 @@ replace_with_attachments (ModestMsgEditWindow *self, GList *attachments)
                        g_object_unref (stream);
 
                        if (pixbuf != NULL) {
                        g_object_unref (stream);
 
                        if (pixbuf != NULL) {

-                               /* TODO: Use this when this function is available: */
-                               /* 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);
                        }
                }
                                g_object_unref (pixbuf);
                        }
                }