0.8.11claws11

* src/folder.[ch]
* src/foldersel.c
* src/folderview.c
* src/imap.c
* src/mbox_folder.c
* src/mh.c
* src/news.c
* src/prefs_scoring.c
* src/summaryview.c
        use a common function to get a displayable name
        for a FolderItem

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 047ddd491163e3a5f7ff6221320d9c3319e3bb81..b37d151506af26de450fea3314b51b9b2b0d33de 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,17 @@
+2003-03-13 [christoph] 0.8.11claws11
+
+       * src/folder.[ch]
+       * src/foldersel.c
+       * src/folderview.c
+       * src/imap.c
+       * src/mbox_folder.c
+       * src/mh.c
+       * src/news.c
+       * src/prefs_scoring.c
+       * src/summaryview.c
+               use a common function to get a displayable name
+               for a FolderItem
+

 2003-03-13 [paul]      0.8.11claws10
 
        * tools/Makefile.am
 2003-03-13 [paul]      0.8.11claws10
 
        * tools/Makefile.am

diff --git a/configure.ac b/configure.ac
index 2a30b857d70af9c4b1487792a27fd8fcdfc84918..a262f438704f9ffa8e0d76a638a59f58b63a5317 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=11
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=11
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=claws10
+EXTRA_VERSION=claws11

 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/folder.c b/src/folder.c
index afa143d64d88f67fea2b7f0dd380f5aa8fa9f659..208dd72913f5bafbbc8c3048109964bd3283bf35 100644 (file)
--- a/src/folder.c
+++ b/src/folder.c
@@ -662,6 +662,71 @@ FolderItem *folder_find_item_from_identifier(const gchar *identifier)
        return d[1];
 }
 
        return d[1];
 }
 

+/**
+ * Get a displayable name for a FolderItem
+ *
+ * \param item FolderItem for that a name should be created
+ * \return Displayable name for item, returned string has to
+ *         be freed
+ */
+gchar *folder_item_get_name(FolderItem *item)
+{
+       gchar *name = NULL;
+
+       switch (item->stype) {
+       case F_INBOX:
+               name = g_strdup(FOLDER_IS_LOCAL(item->folder) &&
+                               !strcmp2(item->name, INBOX_DIR) ? _("Inbox") :
+                               item->name);
+               break;
+       case F_OUTBOX:
+               name = g_strdup(FOLDER_IS_LOCAL(item->folder) &&
+                               !strcmp2(item->name, OUTBOX_DIR) ? _("Sent") :
+                               item->name);
+               break;
+       case F_QUEUE:
+               name = g_strdup(FOLDER_IS_LOCAL(item->folder) &&
+                               !strcmp2(item->name, QUEUE_DIR) ? _("Queue") :
+                               item->name);
+               break;
+       case F_TRASH:
+               name = g_strdup(FOLDER_IS_LOCAL(item->folder) &&
+                               !strcmp2(item->name, TRASH_DIR) ? _("Trash") :
+                               item->name);
+               break;
+       case F_DRAFT:
+               name = g_strdup(FOLDER_IS_LOCAL(item->folder) &&
+                               !strcmp2(item->name, DRAFT_DIR) ? _("Drafts") :
+                               item->name);
+               break;
+       default:
+               break;
+       }
+
+       if (name == NULL) {
+               /*
+                * should probably be done by a virtual function,
+                * the folder knows the ui string and how to abbrev
+               */
+               if (!item->parent) {
+                       name = g_strconcat(item->name, " (", item->folder->class->uistr, ")", NULL);
+               } else {
+                       if (FOLDER_CLASS(item->folder) == news_get_class() &&
+                           item->path && !strcmp2(item->name, item->path))
+                               name = get_abbrev_newsgroup_name
+                                       (item->path,
+                                        prefs_common.ng_abbrev_len);
+                       else
+                               name = g_strdup(item->name);
+               }
+       }
+
+       if (name == NULL)
+               name = g_strdup("");
+
+       return name;
+}
+

 Folder *folder_get_default_folder(void)
 {
        return folder_list ? FOLDER(folder_list->data) : NULL;
 Folder *folder_get_default_folder(void)
 {
        return folder_list ? FOLDER(folder_list->data) : NULL;

diff --git a/src/folder.h b/src/folder.h
index 572e7f68b1087ee20f36e8badc77f468f432b28c..5778e4dc844b0afdf9754cfbddfb6acfad307ba6 100644 (file)
--- a/src/folder.h
+++ b/src/folder.h
@@ -153,6 +153,7 @@ struct _FolderClass
 {
        FolderType  type;
        gchar      *idstr;
 {
        FolderType  type;
        gchar      *idstr;

+       gchar      *uistr;

 
        /* virtual functions */
 
 
        /* virtual functions */
 


@@ -370,6 +371,7 @@ FolderClass *folder_get_class_from_string   (const gchar    *str);
 gchar      *folder_get_identifier              (Folder         *folder);
 gchar      *folder_item_get_identifier         (FolderItem     *item);
 FolderItem *folder_find_item_from_identifier   (const gchar    *identifier);
 gchar      *folder_get_identifier              (Folder         *folder);
 gchar      *folder_item_get_identifier         (FolderItem     *item);
 FolderItem *folder_find_item_from_identifier   (const gchar    *identifier);

+gchar     *folder_item_get_name                (FolderItem     *item);

 
 Folder     *folder_get_default_folder  (void);
 FolderItem *folder_get_default_inbox   (void);
 
 Folder     *folder_get_default_folder  (void);
 FolderItem *folder_get_default_inbox   (void);

diff --git a/src/foldersel.c b/src/foldersel.c
index 0c00cf39c44f86996664224ee0082b7a3cd0bba3..7f02cf09e46f48b73a64f440b460c921b9d78022 100644 (file)
--- a/src/foldersel.c
+++ b/src/foldersel.c
@@ -218,40 +218,7 @@ static gboolean foldersel_gnode_func(GtkCTree *ctree, guint depth,
        FolderItem *item = FOLDER_ITEM(gnode->data);
        gchar *name;
 
        FolderItem *item = FOLDER_ITEM(gnode->data);
        gchar *name;
 

-       switch (item->stype) {
-       case F_INBOX:
-               name = _("Inbox");
-               break;
-       case F_OUTBOX:
-               name = _("Sent");
-               break;
-       case F_QUEUE:
-               name = _("Queue");
-               break;
-       case F_TRASH:
-               name = _("Trash");
-               break;
-       case F_DRAFT:
-               name = _("Drafts");
-               break;
-       default:
-               name = item->name;
-
-               if (!item->parent) {
-                       switch (FOLDER_TYPE(item->folder)) {
-                       case F_MBOX:
-                               Xstrcat_a(name, name, " (MBOX)", ); break;
-                       case F_MH:
-                               Xstrcat_a(name, name, " (MH)", ); break;
-                       case F_IMAP:
-                               Xstrcat_a(name, name, " (IMAP4)", ); break;
-                       case F_NEWS:
-                               Xstrcat_a(name, name, " (News)", ); break;
-                       default:
-                               break;
-                       }
-               }
-       }
+       name = folder_item_get_name(item);

 
        gtk_ctree_node_set_row_data(ctree, cnode, item);
        gtk_ctree_set_node_info(ctree, cnode, name,
 
        gtk_ctree_node_set_row_data(ctree, cnode, item);
        gtk_ctree_set_node_info(ctree, cnode, name,


@@ -260,6 +227,8 @@ static gboolean foldersel_gnode_func(GtkCTree *ctree, guint depth,
                                folderopenxpm, folderopenxpmmask,
                                FALSE, FALSE);
 
                                folderopenxpm, folderopenxpmmask,
                                FALSE, FALSE);
 

+       g_free(name);
+

        return TRUE;
 }
 
        return TRUE;
 }
 

diff --git a/src/folderview.c b/src/folderview.c
index 854e05c6a3a36417d6e9236c2d066bc263853cab..a103308f1435f0e5a26ba94e1e8a33bebd5c0ea4 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -1103,9 +1103,6 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
                        openxpm = inboxopenxpm;
                        openmask = inboxopenxpmmask;
                }
                        openxpm = inboxopenxpm;
                        openmask = inboxopenxpmmask;
                }

-               name = g_strdup(FOLDER_IS_LOCAL(item->folder) &&
-                               !strcmp2(item->name, INBOX_DIR) ? _("Inbox") :
-                               item->name);

                break;
        case F_OUTBOX:
                if (item->hide_read_msgs) {
                break;
        case F_OUTBOX:
                if (item->hide_read_msgs) {


@@ -1119,9 +1116,6 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
                        openxpm = outboxopenxpm;
                        openmask = outboxopenxpmmask;
                }
                        openxpm = outboxopenxpm;
                        openmask = outboxopenxpmmask;
                }

-               name = g_strdup(FOLDER_IS_LOCAL(item->folder) &&
-                               !strcmp2(item->name, OUTBOX_DIR) ? _("Sent") :
-                               item->name);

                break;
        case F_QUEUE:
                if (item->hide_read_msgs) {
                break;
        case F_QUEUE:
                if (item->hide_read_msgs) {


@@ -1135,9 +1129,6 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
                        openxpm = queueopenxpm;
                        openmask = queueopenxpmmask;
                }
                        openxpm = queueopenxpm;
                        openmask = queueopenxpmmask;
                }

-               name = g_strdup(FOLDER_IS_LOCAL(item->folder) &&
-                               !strcmp2(item->name, QUEUE_DIR) ? _("Queue") :
-                               item->name);

                break;
        case F_TRASH:
                if (item->hide_read_msgs) {
                break;
        case F_TRASH:
                if (item->hide_read_msgs) {


@@ -1151,18 +1142,12 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
                        openxpm = trashopenxpm;
                        openmask = trashopenxpmmask;
                }
                        openxpm = trashopenxpm;
                        openmask = trashopenxpmmask;
                }

-               name = g_strdup(FOLDER_IS_LOCAL(item->folder) &&
-                               !strcmp2(item->name, TRASH_DIR) ? _("Trash") :
-                               item->name);

                break;
        case F_DRAFT:
                xpm = draftsxpm;
                mask = draftsxpmmask;
                openxpm = draftsopenxpm;
                openmask = draftsopenxpmmask;
                break;
        case F_DRAFT:
                xpm = draftsxpm;
                mask = draftsxpmmask;
                openxpm = draftsopenxpm;
                openmask = draftsopenxpmmask;

-               name = g_strdup(FOLDER_IS_LOCAL(item->folder) &&
-                               !strcmp2(item->name, DRAFT_DIR) ? _("Drafts") :
-                               item->name);

                break;
        default:
                if (item->hide_read_msgs) {
                break;
        default:
                if (item->hide_read_msgs) {


@@ -1176,31 +1161,8 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
                        openxpm = folderopenxpm;
                        openmask = folderopenxpmmask;
                }
                        openxpm = folderopenxpm;
                        openmask = folderopenxpmmask;
                }

-               if (!item->parent) {
-                       switch (FOLDER_TYPE(item->folder)) {
-                       case F_MH:
-                               name = " (MH)"; break;
-                       case F_MBOX:
-                               name = " (mbox)"; break;
-                       case F_IMAP:
-                               name = " (IMAP4)"; break;
-                       case F_NEWS:
-                               name = " (News)"; break;
-                       default:
-                               name = "";
-                       }
-                       name = g_strconcat(item->name, name, NULL);
-               } else {
-                       if (FOLDER_TYPE(item->folder) == F_NEWS &&
-                           item->path &&
-                           !strcmp2(item->name, item->path))
-                               name = get_abbrev_newsgroup_name
-                                       (item->path,
-                                        prefs_common.ng_abbrev_len);
-                       else
-                               name = g_strdup(item->name);
-               }

        }
        }

+       name = folder_item_get_name(item);

 
        if (!GTK_CTREE_ROW(node)->expanded &&
            folderview_have_unread_children(folderview, node))
 
        if (!GTK_CTREE_ROW(node)->expanded &&
            folderview_have_unread_children(folderview, node))

diff --git a/src/imap.c b/src/imap.c
index e6d4283628e8856b3daa259b32d1440117568a29..f618742335be02e6ed2056045fe482928c81ce67 100644 (file)
--- a/src/imap.c
+++ b/src/imap.c
@@ -298,6 +298,7 @@ FolderClass imap_class =
 {
        F_IMAP,
        "imap",
 {
        F_IMAP,
        "imap",

+       "IMAP4",

 
        /* Folder functions */
        imap_folder_new,
 
        /* Folder functions */
        imap_folder_new,

diff --git a/src/mbox_folder.c b/src/mbox_folder.c
index 2f2a96c06b98a6b4191e4ebe66de7b0b06b700bc..58aa60c87aaadcebde9b9179dbb3fe61a404f78e 100644 (file)
--- a/src/mbox_folder.c
+++ b/src/mbox_folder.c
@@ -54,6 +54,7 @@ FolderClass mbox_class =
 {
        F_MBOX,
        "mbox",
 {
        F_MBOX,
        "mbox",

+       "MBOX",

 
        /* Folder functions */
        mbox_folder_new,
 
        /* Folder functions */
        mbox_folder_new,

diff --git a/src/mh.c b/src/mh.c
index 2a9ea0237b98b6a735e468f92d9209d7b2f45acd..eeea14b3d583b88624d340cee8bb882154053ff6 100644 (file)
--- a/src/mh.c
+++ b/src/mh.c
@@ -112,6 +112,7 @@ FolderClass mh_class =
 {
        F_MH,
        "mh",
 {
        F_MH,
        "mh",

+       "MH",

 
        /* Folder functions */
        mh_folder_new,
 
        /* Folder functions */
        mh_folder_new,

diff --git a/src/news.c b/src/news.c
index 345d7712cc0fe4a7ce501b6aa154c94979ceb4a7..c2a25da5dbef20386b959daa482fd202fcbf1164 100644 (file)
--- a/src/news.c
+++ b/src/news.c
@@ -110,6 +110,7 @@ FolderClass news_class =
 {
        F_NEWS,
        "news",
 {
        F_NEWS,
        "news",

+       "News",

 
        /* Folder functions */
        news_folder_new,
 
        /* Folder functions */
        news_folder_new,

diff --git a/src/prefs_scoring.c b/src/prefs_scoring.c
index bada3cf01ba178e714b95bbfbbac8129aecc0887..0b09ba61064232d8cdc848a01a563939f6dda0c9 100644 (file)
--- a/src/prefs_scoring.c
+++ b/src/prefs_scoring.c
@@ -391,19 +391,10 @@ static void prefs_scoring_set_dialog(ScoringProp * cond)
                cur_important_score = prefs_common.important_score;
                gtk_widget_show(scoring.kill_score_label);
                gtk_widget_show(scoring.kill_score_entry);
                cur_important_score = prefs_common.important_score;
                gtk_widget_show(scoring.kill_score_label);
                gtk_widget_show(scoring.kill_score_entry);

-       }
-       else {
+       } else {

                prefs_scoring = cur_item->prefs->scoring;
                cur_kill_score = cur_item->prefs->kill_score;
                cur_important_score = cur_item->prefs->important_score;
                prefs_scoring = cur_item->prefs->scoring;
                cur_kill_score = cur_item->prefs->kill_score;
                cur_important_score = cur_item->prefs->important_score;

-               if (FOLDER_TYPE(cur_item->folder) != F_NEWS) {
-                       gtk_widget_hide(scoring.kill_score_label);
-                       gtk_widget_hide(scoring.kill_score_entry);
-               }
-               else {
-                       gtk_widget_show(scoring.kill_score_label);
-                       gtk_widget_show(scoring.kill_score_entry);
-               }

        }
 
        for(cur = prefs_scoring ; cur != NULL ;
        }
 
        for(cur = prefs_scoring ; cur != NULL ;

diff --git a/src/summaryview.c b/src/summaryview.c
index 91c3671aad9a5d5219b46b8556a0dce4066fbbba..fee3ae8f438a8e3d9461e88ff846c3cc5d8b2b16 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -1912,6 +1912,7 @@ static void summary_status_show(SummaryView *summaryview)
        guint n_selected = 0;
        off_t sel_size = 0;
        MsgInfo *msginfo;
        guint n_selected = 0;
        off_t sel_size = 0;
        MsgInfo *msginfo;

+       gchar *name;

 
        if (!summaryview->folder_item) {
                gtk_label_set(GTK_LABEL(summaryview->statlabel_folder), "");
 
        if (!summaryview->folder_item) {
                gtk_label_set(GTK_LABEL(summaryview->statlabel_folder), "");


@@ -1933,21 +1934,9 @@ static void summary_status_show(SummaryView *summaryview)
                }
        }
 
                }
        }
 

-       if (FOLDER_TYPE(summaryview->folder_item->folder) == F_NEWS) {
-               if (summaryview->folder_item->path != NULL) {
-                       gchar *group;
-                       group = get_abbrev_newsgroup_name
-                               (g_basename(summaryview->folder_item->path),
-                                prefs_common.ng_abbrev_len);
-                       gtk_label_set(GTK_LABEL(summaryview->statlabel_folder), group);
-                       g_free(group);
-               } else {
-                       gtk_label_set(GTK_LABEL(summaryview->statlabel_folder), "");
-               }
-       } else {
-               gtk_label_set(GTK_LABEL(summaryview->statlabel_folder),
-                             summaryview->folder_item->path);
-       }
+       name = folder_item_get_name(summaryview->folder_item);
+       gtk_label_set(GTK_LABEL(summaryview->statlabel_folder), name);
+       g_free(name);

 
        if (summaryview->deleted)
                del = g_strdup_printf(_("%d deleted"), summaryview->deleted);
 
        if (summaryview->deleted)
                del = g_strdup_printf(_("%d deleted"), summaryview->deleted);