2005-10-29 [paul] 1.9.15cvs126

[claws.git] / src / foldersel.c

diff --git a/src/foldersel.c b/src/foldersel.c
index 3d4393f8861e15ba2a0edb764490f39945638402..1af72d5c58cfbb60e0a2bcad150c519cf5cfdb25 100644 (file)
--- a/src/foldersel.c
+++ b/src/foldersel.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #include "defs.h"
@@ -221,7 +221,7 @@ static void foldersel_create(void)
        gtk_window_set_modal(GTK_WINDOW(window), TRUE);
        gtk_window_set_policy(GTK_WINDOW(window), FALSE, TRUE, FALSE);
        gtk_window_set_wmclass
-               (GTK_WINDOW(window), "folder_selection", "Sylpheed");
+               (GTK_WINDOW(window), "folder_selection", "Sylpheed-Claws");
        gtk_widget_realize(window);
        g_signal_connect(G_OBJECT(window), "delete_event",
                         G_CALLBACK(delete_event), NULL);
@@ -386,7 +386,7 @@ static void foldersel_append_item(GtkTreeStore *store, FolderItem *item,
        }
 #endif        
 
-       if (item->stype == F_QUEUE && item->total_msgs > 0) {
+       if (folder_has_parent_of_type(item, F_QUEUE) && item->total_msgs > 0) {
                name = g_strdup_printf("%s (%d)", name, item->total_msgs);
        } else if (item->unread_msgs > 0) {
                name = g_strdup_printf("%s (%d)", name, item->unread_msgs);
@@ -397,10 +397,11 @@ static void foldersel_append_item(GtkTreeStore *store, FolderItem *item,
        pixbuf_open =
                item->no_select ? foldernoselect_pixbuf : folderopen_pixbuf;
 
-       if (item->stype == F_OUTBOX || item->stype == F_DRAFT ||
-           item->stype == F_TRASH) {
+       if (folder_has_parent_of_type(item, F_DRAFT) ||
+           folder_has_parent_of_type(item, F_OUTBOX) ||
+           folder_has_parent_of_type(item, F_TRASH)) {
                use_bold = use_color = FALSE;
-       } else if (item->stype == F_QUEUE) {
+       } else if (folder_has_parent_of_type(item, F_QUEUE)) {
                use_bold = use_color = (item->total_msgs > 0);
        } else {
                use_bold = (item->unread_msgs > 0);
@@ -538,7 +539,7 @@ static void foldersel_new_folder(GtkButton *button, gpointer data)
        if ((p && FOLDER_TYPE(selected_item->folder) != F_IMAP) ||
            (p && FOLDER_TYPE(selected_item->folder) == F_IMAP &&
             *(p + 1) != '\0')) {
-               alertpanel_error(_("`%c' can't be included in folder name."),
+               alertpanel_error(_("'%c' can't be included in folder name."),
                                G_DIR_SEPARATOR);
                return;
        }
@@ -548,14 +549,14 @@ static void foldersel_new_folder(GtkButton *button, gpointer data)
 
        /* find whether the directory already exists */
        if (folder_find_child_item_by_name(selected_item, new_folder)) {
-               alertpanel_error(_("The folder `%s' already exists."),
+               alertpanel_error(_("The folder '%s' already exists."),
                                 disp_name);
                return;
        }
 
        new_item = folder_create_folder(selected_item, new_folder);
        if (!new_item) {
-               alertpanel_error(_("Can't create the folder `%s'."), disp_name);
+               alertpanel_error(_("Can't create the folder '%s'."), disp_name);
                return;
        }