From 4306c9eaa2f13d2fe56938f66b40e5a187242821 Mon Sep 17 00:00:00 2001 From: Andrej Kacian Date: Thu, 21 Jul 2016 12:02:30 +0200 Subject: [PATCH 1/1] Use folderview_freeze/thaw() functions outside of folderview.c. These are modeled after summary_freeze/thaw(). --- src/folderview.c | 12 ++++++++++++ src/folderview.h | 3 +++ src/main.c | 4 ++-- src/plugins/rssyl/rssyl_feed.c | 4 ++-- 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/src/folderview.c b/src/folderview.c index 4ddd38696..055ca5baa 100644 --- a/src/folderview.c +++ b/src/folderview.c @@ -3172,3 +3172,15 @@ void folderview_unregister_popup(FolderViewPopup *fpopup) } g_hash_table_remove(folderview_popups, fpopup->klass); } + +void folderview_freeze(FolderView *folderview) +{ + if (folderview) + gtk_cmclist_freeze(GTK_CMCLIST(folderview->ctree)); +} + +void folderview_thaw(FolderView *folderview) +{ + if (folderview) + gtk_cmclist_thaw(GTK_CMCLIST(folderview->ctree)); +} diff --git a/src/folderview.h b/src/folderview.h index d4bb5f53b..a53c05112 100644 --- a/src/folderview.h +++ b/src/folderview.h @@ -148,4 +148,7 @@ void folderview_finish_dnd (const gchar *data, FolderItem *item); void folderview_close_opened (FolderView *folderview); +void folderview_freeze(FolderView *folderview); +void folderview_thaw(FolderView *folderview); + #endif /* __FOLDERVIEW_H__ */ diff --git a/src/main.c b/src/main.c index 497cd30a4..15b479f67 100644 --- a/src/main.c +++ b/src/main.c @@ -1300,7 +1300,7 @@ int main(int argc, char *argv[]) manage_window_focus_in(mainwin->window, NULL, NULL); folderview = mainwin->folderview; - gtk_cmclist_freeze(GTK_CMCLIST(mainwin->folderview->ctree)); + folderview_freeze(mainwin->folderview); folder_item_update_freeze(); passwd_store_read_config(); @@ -1517,7 +1517,7 @@ int main(int argc, char *argv[]) #endif folder_item_update_thaw(); - gtk_cmclist_thaw(GTK_CMCLIST(mainwin->folderview->ctree)); + folderview_thaw(mainwin->folderview); main_window_cursor_normal(mainwin); if (!cmd.target && prefs_common.goto_last_folder_on_startup && diff --git a/src/plugins/rssyl/rssyl_feed.c b/src/plugins/rssyl/rssyl_feed.c index 302ddc00e..dc3fbd4af 100644 --- a/src/plugins/rssyl/rssyl_feed.c +++ b/src/plugins/rssyl/rssyl_feed.c @@ -63,7 +63,7 @@ FolderItem *rssyl_feed_subscribe_new(FolderItem *parent, const gchar *url, myurl = g_strchomp(myurl); - gtk_cmclist_freeze(GTK_CMCLIST(mainwindow_get_mainwindow()->folderview->ctree)); + folderview_freeze(mainwindow_get_mainwindow()->folderview); folder_item_update_freeze(); /* Create a feed folder with generic name. */ @@ -92,7 +92,7 @@ FolderItem *rssyl_feed_subscribe_new(FolderItem *parent, const gchar *url, } folder_item_update_thaw(); - gtk_cmclist_thaw(GTK_CMCLIST(mainwindow_get_mainwindow()->folderview->ctree)); + folderview_thaw(mainwindow_get_mainwindow()->folderview); if( success ) log_print(LOG_PROTOCOL, RSSYL_LOG_SUBSCRIBED, ritem->official_title, -- 2.25.1