Fixed compilation warnings

Removed libnm dependency when compiling GNOME version
Patch provided by Ivan Gomez igomez@igalia.com

pmo-trunk-r7905

diff --git a/configure.ac b/configure.ac
index cf2f673..8b4945f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -276,7 +276,7 @@ AC_SUBST(MODEST_TOOLKIT)
 AC_SUBST(MODEST_TOOLKIT_DIR)
 
 if test "x$with_platform" == "xgnome"; then
 AC_SUBST(MODEST_TOOLKIT_DIR)
 
 if test "x$with_platform" == "xgnome"; then

-      PKG_CHECK_MODULES(MODEST_PLATFORM,libtinymail-gnome-desktop-1.0 libnm_glib glib-2.0 >= 2.8 libnotify)
+      PKG_CHECK_MODULES(MODEST_PLATFORM,libtinymail-gnome-desktop-1.0 glib-2.0 >= 2.8 libnotify)

     AC_DEFINE_UNQUOTED(MODEST_PLATFORM_GNOME, 1, ["Whether modest is being built for the GNOME platform."])
 dnl     AC_MSG_ERROR([The GNOME Build is currently broken; please try the Maemo build instead])
 else
     AC_DEFINE_UNQUOTED(MODEST_PLATFORM_GNOME, 1, ["Whether modest is being built for the GNOME platform."])
 dnl     AC_MSG_ERROR([The GNOME Build is currently broken; please try the Maemo build instead])
 else

diff --git a/src/gnome/modest-platform.c b/src/gnome/modest-platform.c
index 52f69ea..1cf8680 100644 (file)
--- a/src/gnome/modest-platform.c
+++ b/src/gnome/modest-platform.c
@@ -33,6 +33,8 @@
 #include <tny-camel-imap-store-account.h>
 #include <tny-camel-pop-store-account.h>
 #include <tny-simple-list.h>
 #include <tny-camel-imap-store-account.h>
 #include <tny-camel-pop-store-account.h>
 #include <tny-simple-list.h>

+#include <tny-error.h>
+#include <tny-merge-folder.h>

 #include "modest-platform.h"
 #include "modest-mail-operation-queue.h"
 #include "modest-runtime.h"
 #include "modest-platform.h"
 #include "modest-mail-operation-queue.h"
 #include "modest-runtime.h"

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index 794a3e3..781b52c 100644 (file)
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -3383,7 +3383,7 @@ do_create_folder (GtkWindow *parent_window,
                                                        &parent_folder);
 
        if (result == GTK_RESPONSE_ACCEPT && parent_folder) {
                                                        &parent_folder);
 
        if (result == GTK_RESPONSE_ACCEPT && parent_folder) {

-               CreateFolderConnect *helper = (CreateFolderConnect *) g_slice_new0 (CreateFolderHelper);
+               CreateFolderConnect *helper = (CreateFolderConnect *) g_slice_new0 (CreateFolderConnect);

                helper->folder_name = g_strdup (folder_name);
                helper->parent = g_object_ref (parent_folder);
 
                helper->folder_name = g_strdup (folder_name);
                helper->parent = g_object_ref (parent_folder);