From 947a72ce12b61b0dabe64b7e06de3841ff11bf9b Mon Sep 17 00:00:00 2001 From: Murray Cumming Date: Wed, 9 May 2007 10:02:16 +0000 Subject: [PATCH] 2007-05-09 Murray Cumming * configure.ac: When using the older hildon version, probably on Bora, require gnome-vfs-module-2.0, which is the old provider of gnome-vfs-mime.h, to fix the build. * src/widgets/modest-attachment-view.c: (modest_attachment_view_set_part_default): Initialize variables, to fix the build. pmo-trunk-r1798 --- ChangeLog2 | 10 +++++++++- configure.ac | 2 +- src/widgets/modest-attachment-view.c | 4 ++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ChangeLog2 b/ChangeLog2 index 037764b..5650d27 100644 --- a/ChangeLog2 +++ b/ChangeLog2 @@ -1,10 +1,18 @@ +2007-05-09 Murray Cumming + + * configure.ac: When using the older hildon version, probably on Bora, + require gnome-vfs-module-2.0, which is the old provider of gnome-vfs-mime.h, + to fix the build. + * src/widgets/modest-attachment-view.c: + (modest_attachment_view_set_part_default): Initialize variables, to fix the + build. + 2007-05-09 Marcus Bauer * src/dbus_api/modest-dbus-callbacks.c: (on_idle_open_message): Implemented the prototype. Can be tested with tests/dbus_api/test_open_message: - 2007-05-08 Murray Cumming * src/modest-tny-account-store.c: diff --git a/configure.ac b/configure.ac index d9a90c7..b75711f 100644 --- a/configure.ac +++ b/configure.ac @@ -95,7 +95,7 @@ if test "x$with_platform" = "xmaemo"; then PKG_CHECK_MODULES(MODEST_LIBTINYMAIL_MAEMO, conic libtinymail-maemo-1.0 hildon-1 libosso libhildonmime osso-addressbook-1.0 wpeditor libossohelp libebook-1.2 libalarm) else # the old hildon - PKG_CHECK_MODULES(MODEST_LIBTINYMAIL_MAEMO, conic libtinymail-maemo-1.0 hildon-libs >= 0.12.0 libosso libossomime libossohelp osso-addressbook-1.0 wpeditor libebook-1.2 libalarm) + PKG_CHECK_MODULES(MODEST_LIBTINYMAIL_MAEMO, conic libtinymail-maemo-1.0 hildon-libs >= 0.12.0 libosso libossomime libossohelp osso-addressbook-1.0 wpeditor libebook-1.2 libalarm gnome-vfs-module-2.0) AC_DEFINE_UNQUOTED(MODEST_HILDON_VERSION_0, 1, ["The Hildon version we support."]) fi diff --git a/src/widgets/modest-attachment-view.c b/src/widgets/modest-attachment-view.c index 990ea2c..ad94f8b 100644 --- a/src/widgets/modest-attachment-view.c +++ b/src/widgets/modest-attachment-view.c @@ -173,8 +173,8 @@ static void modest_attachment_view_set_part_default (TnyMimePartView *self, TnyMimePart *mime_part) { ModestAttachmentViewPriv *priv = NULL; - const gchar *filename; - gchar *file_icon_name; + const gchar *filename = NULL; + gchar *file_icon_name = NULL; g_return_if_fail (TNY_IS_MIME_PART_VIEW (self)); g_return_if_fail (TNY_IS_MIME_PART (mime_part)); -- 1.7.9.5