replace deprecated gtk_window_set_policy

[claws.git] / src / folderview.c

diff --git a/src/folderview.c b/src/folderview.c
index 6fafb4773ca0900f50944b562bdb92678fe5f60e..13f4613946ecae0bbf148c4a975f1d4533edae25 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -62,7 +62,6 @@
 #include "statusbar.h"
 #include "hooks.h"
 #include "folderutils.h"
-#include "quicksearch.h"
 
 typedef enum
 {
@@ -750,7 +749,7 @@ static GtkWidget *label_window_create(const gchar *str)
        gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
        gtk_window_set_title(GTK_WINDOW(window), str);
        gtk_window_set_modal(GTK_WINDOW(window), TRUE);
-       gtk_window_set_policy(GTK_WINDOW(window), FALSE, FALSE, FALSE);
+       gtk_window_set_resizable(GTK_WINDOW(window), FALSE);
        manage_window_set_transient(GTK_WINDOW(window));
 
        label = gtk_label_new(str);
@@ -975,13 +974,10 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
        gchar *str;
        gboolean add_unread_mark;
        gboolean use_bold, use_color;
-       gboolean hide_read_msgs = item->hide_read_msgs;
-       
+
        item = gtk_ctree_node_get_row_data(ctree, node);
        g_return_if_fail(item != NULL);
 
-       item->hide_read_msgs |= quicksearch_is_active(folderview->summaryview->quicksearch);
-       
        switch (item->stype) {
        case F_INBOX:
                if (item->hide_read_msgs) {
@@ -1054,9 +1050,6 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
                        openmask = folderopenxpmmask;
                }
        }
-       
-       item->hide_read_msgs = hide_read_msgs;
-       
        name = folder_item_get_name(item);
 
        if (!GTK_CTREE_ROW(node)->expanded &&
@@ -1203,7 +1196,7 @@ gboolean folderview_update_item_claws(gpointer source, gpointer data)
 
        node = gtk_ctree_find_by_row_data(ctree, NULL, update_info->item);
        if (node) {
-               if (update_info->update_flags & (F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_NAME | F_ITEM_UPDATE_ICON))
+               if (update_info->update_flags & (F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_NAME))
                        folderview_update_node(folderview, node);
                if ((update_info->update_flags & F_ITEM_UPDATE_CONTENT) && (folderview->opened == node))
                        summary_show(folderview->summaryview, update_info->item);
@@ -1430,6 +1423,9 @@ static gboolean folderview_key_pressed(GtkWidget *widget, GdkEventKey *event,
 {
        if (!event) return FALSE;
 
+       if (quicksearch_has_focus(folderview->summaryview->quicksearch))
+               return FALSE;
+
        switch (event->keyval) {
        case GDK_Return:
                if (folderview->selected) {