fix errors in strings

[claws.git] / src / folderview.c

diff --git a/src/folderview.c b/src/folderview.c
index 8e0280b7f4c400bb39e5736431fe36754f02eb17..44ec9cfe9f82f4bb151a0cde150bd6a0c7b977ba 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2011 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -796,7 +796,7 @@ static void mark_all_read_cb(GtkAction *action, gpointer data)
        &&  prefs_common.ask_mark_all_read) {
                val = alertpanel_full(_("Mark all as read"),
                        _("Do you really want to mark all mails in this "
-                         "folder as read ?"), GTK_STOCK_NO, GTK_STOCK_YES, NULL,
+                         "folder as read?"), GTK_STOCK_NO, GTK_STOCK_YES, NULL,
                          TRUE, NULL, ALERT_QUESTION, G_ALERTDEFAULT);
 
                if ((val & ~G_ALERTDISABLE) != G_ALERTALTERNATE)
@@ -1713,7 +1713,7 @@ static gboolean folderview_update_item_claws(gpointer source, gpointer data)
                if ((update_info->update_flags & F_ITEM_UPDATE_CONTENT) && 
                     update_info->item == folderview->summaryview->folder_item &&
                     update_info->item != NULL)
-                       if (!quicksearch_is_active(folderview->summaryview->quicksearch))
+                       if (!quicksearch_has_sat_predicate(folderview->summaryview->quicksearch))
                                summary_show(folderview->summaryview, update_info->item);
        }
        
@@ -2080,7 +2080,7 @@ void folderview_close_opened(FolderView *folderview)
                olditem = gtk_cmctree_node_get_row_data(GTK_CMCTREE(folderview->ctree), 
                                                      folderview->opened);
                if (olditem) {
-                       gchar *buf = g_strdup_printf(_("Closing Folder %s..."), 
+                       gchar *buf = g_strdup_printf(_("Closing folder %s..."), 
                                olditem->path ? olditem->path:olditem->name);
                        /* will be null if we just moved the previously opened folder */
                        STATUSBAR_PUSH(folderview->mainwin, buf);
@@ -2175,7 +2175,7 @@ static void folderview_selected(GtkCMCTree *ctree, GtkCMCTreeNode *row,
 
        /* Open Folder */
        /* TODO: wwp: avoid displaying (null) in the status bar */
-       buf = g_strdup_printf(_("Opening Folder %s..."), item->path ? 
+       buf = g_strdup_printf(_("Opening folder %s..."), item->path ? 
                                        item->path : "(null)");
        debug_print("%s\n", buf);
        STATUSBAR_PUSH(folderview->mainwin, buf);
@@ -2473,9 +2473,7 @@ static void folderview_recollapse_nodes(FolderView *folderview, GtkCMCTreeNode *
 void folderview_move_folder(FolderView *folderview, FolderItem *from_folder,
                            FolderItem *to_folder, gboolean copy)
 {
-       FolderItem *from_parent = NULL;
        FolderItem *new_folder = NULL;
-       GtkCMCTreeNode *src_node = NULL;
        gchar *buf;
        gint status;
 
@@ -2483,9 +2481,6 @@ void folderview_move_folder(FolderView *folderview, FolderItem *from_folder,
        cm_return_if_fail(from_folder != NULL);
        cm_return_if_fail(to_folder != NULL);
 
-       src_node = gtk_cmctree_find_by_row_data(GTK_CMCTREE(folderview->ctree), NULL, from_folder);
-       from_parent = folder_item_parent(from_folder);
-       
        if (prefs_common.warn_dnd) {
                buf = g_strdup_printf(copy ? _("Do you really want to copy folder '%s' in '%s' ?"):
                                             _("Do you really want to make folder '%s' a subfolder of '%s' ?"),