This is a manual merge of branch drop split view intro trunk.

[modest] / src / widgets / modest-header-view.h

diff --git a/src/widgets/modest-header-view.h b/src/widgets/modest-header-view.h
index 2ff48c4..3ff7c81 100644 (file)
--- a/src/widgets/modest-header-view.h
+++ b/src/widgets/modest-header-view.h
@@ -161,6 +161,7 @@ GtkWidget*   modest_header_view_new        (TnyFolder *folder,
 void         modest_header_view_set_folder (ModestHeaderView *self,
                                            TnyFolder *folder,
                                            gboolean refresh,
+                                           ModestWindow *progress_window,
                                            RefreshAsyncUserCallback callback,
                                            gpointer user_data);