From: Sergio Villar SenĂ­n Date: Fri, 5 Feb 2010 10:04:06 +0000 (+0100) Subject: Revert "Build fixes" X-Git-Tag: 3.2.12-2-2 X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=6ca7860709a266498740a857278099fc6f42cbd6 Revert "Build fixes" This reverts commit c95f8cfbb80cc394ff701c3bcd70ad1cc72b18fb. --- diff --git a/src/hildon2/modest-account-view-window.c b/src/hildon2/modest-account-view-window.c index 5a71f74..4a05ea8 100644 --- a/src/hildon2/modest-account-view-window.c +++ b/src/hildon2/modest-account-view-window.c @@ -233,7 +233,7 @@ modest_account_view_window_init (ModestAccountViewWindow *self) #ifdef MODEST_TOOLKIT_HILDON2 live_search = modest_account_view_setup_live_search (MODEST_ACCOUNT_VIEW (priv->account_view)); - hildon_live_search_widget_hook (HILDON_LIVE_SEARCH (live_search), GTK_WIDGET (self), GTK_TREE_VIEW (priv->account_view)); + hildon_live_search_widget_hook (HILDON_LIVE_SEARCH (live_search), GTK_WIDGET (self), GTK_WIDGET (priv->account_view)); #endif modest_account_view_set_picker_mode (MODEST_ACCOUNT_VIEW (priv->account_view), TRUE); diff --git a/src/hildon2/modest-accounts-window.c b/src/hildon2/modest-accounts-window.c index 2190bff..497b1d3 100644 --- a/src/hildon2/modest-accounts-window.c +++ b/src/hildon2/modest-accounts-window.c @@ -232,7 +232,7 @@ connect_signals (ModestAccountsWindow *self) "row-deleted", G_CALLBACK (on_row_deleted), self); - priv->sighandlers = + priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers, G_OBJECT (priv->new_message_button), "clicked", @@ -360,7 +360,7 @@ modest_accounts_window_new (void) priv->account_view = GTK_WIDGET (modest_account_view_new (modest_runtime_get_account_mgr ())); #ifdef MODEST_TOOLKIT_HILDON2 live_search = modest_account_view_setup_live_search (MODEST_ACCOUNT_VIEW (priv->account_view)); - hildon_live_search_widget_hook (HILDON_LIVE_SEARCH (live_search), GTK_WIDGET (self), GTK_TREE_VIEW (priv->account_view)); + hildon_live_search_widget_hook (HILDON_LIVE_SEARCH (live_search), GTK_WIDGET (self), priv->account_view); gtk_box_pack_start (GTK_BOX (priv->box), live_search, FALSE, FALSE, 0); #endif diff --git a/src/hildon2/modest-folder-window.c b/src/hildon2/modest-folder-window.c index d8a3d3a..324393c 100644 --- a/src/hildon2/modest-folder-window.c +++ b/src/hildon2/modest-folder-window.c @@ -343,7 +343,7 @@ modest_folder_window_new (TnyFolderStoreQuery *query) priv->folder_view = modest_platform_create_folder_view (query); #ifdef MODEST_TOOLKIT_HILDON2 live_search = modest_folder_view_setup_live_search (MODEST_FOLDER_VIEW (priv->folder_view)); - hildon_live_search_widget_hook (HILDON_LIVE_SEARCH (live_search), GTK_WIDGET (self), GTK_TREE_VIEW (priv->folder_view)); + hildon_live_search_widget_hook (HILDON_LIVE_SEARCH (live_search), GTK_WIDGET (self), priv->folder_view); #endif modest_folder_view_set_cell_style (MODEST_FOLDER_VIEW (priv->folder_view), MODEST_FOLDER_VIEW_CELL_STYLE_COMPACT); diff --git a/src/hildon2/modest-header-window.c b/src/hildon2/modest-header-window.c index 7d0fe4f..c387674 100644 --- a/src/hildon2/modest-header-window.c +++ b/src/hildon2/modest-header-window.c @@ -833,7 +833,7 @@ modest_header_window_new (TnyFolder *folder, const gchar *account_name, const gc priv->header_view = create_header_view (MODEST_WINDOW (self), folder); #ifdef MODEST_TOOLKIT_HILDON2 live_search = modest_header_view_setup_live_search (MODEST_HEADER_VIEW (priv->header_view)); - hildon_live_search_widget_hook (HILDON_LIVE_SEARCH (live_search), GTK_WIDGET (self), GTK_TREE_VIEW (priv->header_view)); + hildon_live_search_widget_hook (HILDON_LIVE_SEARCH (live_search), GTK_WIDGET (self), priv->header_view); #endif priv->empty_view = create_empty_view (MODEST_WINDOW (self)); diff --git a/src/hildon2/modest-mailboxes-window.c b/src/hildon2/modest-mailboxes-window.c index 864fce4..4f2ef17 100644 --- a/src/hildon2/modest-mailboxes-window.c +++ b/src/hildon2/modest-mailboxes-window.c @@ -292,7 +292,7 @@ modest_mailboxes_window_new (const gchar *account) priv->folder_view = modest_platform_create_folder_view (NULL); #ifdef MODEST_TOOLKIT_HILDON2 live_search = modest_folder_view_setup_live_search (MODEST_FOLDER_VIEW (priv->folder_view)); - hildon_live_search_widget_hook (HILDON_LIVE_SEARCH (live_search), GTK_WIDGET (self), GTK_TREE_VIEW (priv->folder_view)); + hildon_live_search_widget_hook (HILDON_LIVE_SEARCH (live_search), GTK_WIDGET (self), priv->folder_view); #endif modest_folder_view_set_cell_style (MODEST_FOLDER_VIEW (priv->folder_view), MODEST_FOLDER_VIEW_CELL_STYLE_COMPACT);