Several GNOME build fixes

diff --git a/src/gnome/Makefile.am b/src/gnome/Makefile.am
index b9a0973..6dd5288 100644 (file)
--- a/src/gnome/Makefile.am
+++ b/src/gnome/Makefile.am
@@ -28,7 +28,6 @@ libmodest_ui_la_SOURCES=                      \
        modest-account-assistant.h      \
        modest-default-account-settings-dialog.c \
        modest-account-view-window.c    \
        modest-account-assistant.h      \
        modest-default-account-settings-dialog.c \
        modest-account-view-window.c    \

-       modest-address-book.c           \

        modest-msg-edit-window.c        \
        modest-icon-names.h             \
        modest-gnome-global-settings-dialog.c \
        modest-msg-edit-window.c        \
        modest-icon-names.h             \
        modest-gnome-global-settings-dialog.c \

diff --git a/src/gnome/modest-address-book.c b/src/gnome/modest-address-book.c
deleted file mode 100644 (file)
index d998286..0000000
--- a/src/gnome/modest-address-book.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/* Copyright (c) 2007, Nokia Corporation
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * * Neither the name of the Nokia Corporation nor the names of its
- *   contributors may be used to endorse or promote products derived from
- *   this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
- * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* modest-address-book.c */
-
-#include <modest-address-book.h>
-
-void
-modest_address_book_init (void)
-{
-       g_debug (__FUNCTION__);
-}
-
-void
-modest_address_book_add_address (const gchar *address)
-{
-       g_debug (__FUNCTION__);
-}
-
-void
-modest_address_book_select_addresses (ModestRecptEditor *editor,
-                                     GtkWindow *parent_window)
-{
-       g_debug (__FUNCTION__);
-}
-
-gboolean
-modest_address_book_check_names (ModestRecptEditor *editor, gboolean update_addressbook)
-{
-       g_debug (__FUNCTION__);
-       return TRUE;
-}
-
-gboolean
-modest_address_book_has_address (const gchar *address)
-{
-       g_debug (__FUNCTION__);
-       return FALSE;
-}
-
-const gchar *
-modest_address_book_get_my_name ()
-{
-       return NULL;
-}

diff --git a/src/gnome/modest-msg-view-window-ui-dimming.h b/src/gnome/modest-msg-view-window-ui-dimming.h
index 79f678c..58c52c8 100644 (file)
--- a/src/gnome/modest-msg-view-window-ui-dimming.h
+++ b/src/gnome/modest-msg-view-window-ui-dimming.h
@@ -66,7 +66,7 @@ static const ModestDimmingEntry modest_msg_view_toolbar_dimming_entries [] = {
        { "/ToolBar/ToolbarMessageReply", G_CALLBACK(modest_ui_dimming_rules_on_reply_msg) },
        { "/ToolBar/ToolbarMessageMoveTo", G_CALLBACK(modest_ui_dimming_rules_on_move_to) },
        { "/ToolBar/ToolbarDeleteMessage",  G_CALLBACK(modest_ui_dimming_rules_on_delete_msg) },
        { "/ToolBar/ToolbarMessageReply", G_CALLBACK(modest_ui_dimming_rules_on_reply_msg) },
        { "/ToolBar/ToolbarMessageMoveTo", G_CALLBACK(modest_ui_dimming_rules_on_move_to) },
        { "/ToolBar/ToolbarDeleteMessage",  G_CALLBACK(modest_ui_dimming_rules_on_delete_msg) },

-       { "/ToolBar/FindInMessage", G_CALLBACK(modest_ui_dimming_rules_on_find_msg) },
+       { "/ToolBar/FindInMessage", G_CALLBACK(modest_ui_dimming_rules_on_find_in_msg) },

        { "/ToolBar/ToolbarMessageBack", G_CALLBACK(modest_ui_dimming_rules_on_view_previous) },
        { "/ToolBar/ToolbarMessageNext", G_CALLBACK(modest_ui_dimming_rules_on_view_next) },
        { "/ToolBar/ToolbarCancel", NULL },
        { "/ToolBar/ToolbarMessageBack", G_CALLBACK(modest_ui_dimming_rules_on_view_previous) },
        { "/ToolBar/ToolbarMessageNext", G_CALLBACK(modest_ui_dimming_rules_on_view_next) },
        { "/ToolBar/ToolbarCancel", NULL },

diff --git a/src/modest-address-book-dummy.c b/src/modest-address-book-dummy.c
index 372d206..1286541 100644 (file)
--- a/src/modest-address-book-dummy.c
+++ b/src/modest-address-book-dummy.c
@@ -64,3 +64,9 @@ modest_address_book_get_my_name ()
 {
        return NULL;
 }
 {
        return NULL;
 }

+
+void
+modest_address_book_init (void)
+{
+       /* Do nothing */
+}

diff --git a/src/widgets/modest-folder-view.c b/src/widgets/modest-folder-view.c
index ac7b283..2b716d4 100644 (file)
--- a/src/widgets/modest-folder-view.c
+++ b/src/widgets/modest-folder-view.c
@@ -3891,10 +3891,10 @@ modest_folder_view_copy_model (ModestFolderView *folder_view_src,
        /* Set copied model */
        gtk_tree_view_set_model (GTK_TREE_VIEW (folder_view_dst), new_filter_model);
 #ifndef MODEST_TOOLKIT_HILDON2
        /* Set copied model */
        gtk_tree_view_set_model (GTK_TREE_VIEW (folder_view_dst), new_filter_model);
 #ifndef MODEST_TOOLKIT_HILDON2

-       priv->signal_handlers = modest_signal_mgr_connect (priv->signal_handlers,
-                                                          G_OBJECT(new_filter_model), "row-inserted",
-                                                          (GCallback) on_row_inserted_maybe_select_folder,
-                                                          folder_view_dst);
+       dst_priv->signal_handlers = modest_signal_mgr_connect (dst_priv->signal_handlers,
+                                                              G_OBJECT(new_filter_model), "row-inserted",
+                                                              (GCallback) on_row_inserted_maybe_select_folder,
+                                                              folder_view_dst);

 #endif
 #ifdef MODEST_TOOLKIT_HILDON2
        if (new_tny_model) {
 #endif
 #ifdef MODEST_TOOLKIT_HILDON2
        if (new_tny_model) {