o remove mime_application_octet_stream.xpm and messageview_text.xpm

o  fix visibility of signature noticeview when toggling separate message
   view

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 388fc169ff6bf796198c16fc9d1a9bc4fe5e8a6f..97c6384f165d67bed3c922d8cf566941248c8ef2 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,16 @@
+2003-10-21 [luke]      0.9.6claws42
+        * src/stock_pixmaps.[ch]
+        * src/mimeview.c
+        * src/pixmaps/mime_application_octet_stream.xpm         ** REMOVE **
+        * src/pixmaps/messageview_text.xpm                      ** REMOVE **
+                o remove mime_application_octet_stream.xpm icon (it was never
+                  really needed)
+                o remove redundant icon messageview_text.xpm
+
+        * src/mainwindow.c
+                fix visibility of signature noticeview when toggling 'separate
+                message view'
+
 2003-10-21 [christoph] 0.9.6claws41
 
        * src/procmime.c

diff --git a/configure.ac b/configure.ac
index cc53c56efea52130eac95f121b906ddb73443e3a..7692ef477c509335dfb6311e3af731a191861e5c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=41
+EXTRA_VERSION=42
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
 else

diff --git a/src/mainwindow.c b/src/mainwindow.c
index 72a38c61efbc5ff42c18a50d0b4f6db506c75c87..016ea8ee1ef8e86743a6cb849500b68aaf3ace0f 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -1971,6 +1971,8 @@ static void main_window_set_widgets(MainWindow *mainwin, SeparateType type)
         * and mimeview icon list/ctree lose track of their visibility states */
        if (!noticeview_is_visible(mainwin->messageview->noticeview)) 
                gtk_widget_hide(GTK_WIDGET_PTR(mainwin->messageview->noticeview));
+       if (!noticeview_is_visible(mainwin->messageview->mimeview->siginfoview)) 
+               gtk_widget_hide(GTK_WIDGET_PTR(mainwin->messageview->mimeview->siginfoview));
        if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(mainwin->messageview->mimeview->mime_toggle)))
                gtk_widget_hide(mainwin->messageview->mimeview->icon_mainbox);
        else 

diff --git a/src/mimeview.c b/src/mimeview.c
index c5d073f020d3c61af8dabc8682bcb974444cbdbf..3dd92ba9cf502150f7085a80ef749fdac38bfeca 100644 (file)
--- a/src/mimeview.c
+++ b/src/mimeview.c
@@ -1386,10 +1386,7 @@ static void icon_list_append_icon (MimeView *mimeview, MimeInfo *mimeinfo)
                stockp = STOCK_PIXMAP_MIME_MESSAGE;
                break;
        case MIMETYPE_APPLICATION:
-               if (mimeinfo->subtype && !g_strcasecmp(mimeinfo->subtype, "octet-stream"))
-                       stockp = STOCK_PIXMAP_MIME_APPLICATION_OCTET_STREAM;
-               else
-                       stockp = STOCK_PIXMAP_MIME_APPLICATION;
+               stockp = STOCK_PIXMAP_MIME_APPLICATION;
                break;
        case MIMETYPE_IMAGE:
                stockp = STOCK_PIXMAP_MIME_IMAGE;

diff --git a/src/pixmaps/messageview_text.xpm b/src/pixmaps/messageview_text.xpm
deleted file mode 100644 (file)
index dcf3084..0000000
--- a/src/pixmaps/messageview_text.xpm
+++ /dev/null
@@ -1,20 +0,0 @@
-/* XPM */
-static char * messageview_text_xpm[] = {
-"11 13 4 1",
-"      c None",
-".     c #8E8E8E",
-"+     c #FFFFFF",
-"@     c #000000",
-"...........",
-".+++++++++.",
-".+@@@@@@@+.",
-".+++++++++.",
-".+@@@@++++.",
-".+++++++++.",
-".+@@@@@@@+.",
-".+++++++++.",
-".+@@@@@@++.",
-".+++++++++.",
-".+@@@@@@@+.",
-".+++++++++.",
-"..........."};

diff --git a/src/pixmaps/mime_application_octet_stream.xpm b/src/pixmaps/mime_application_octet_stream.xpm
deleted file mode 100644 (file)
index 0a2940e..0000000
--- a/src/pixmaps/mime_application_octet_stream.xpm
+++ /dev/null
@@ -1,25 +0,0 @@
-/* XPM */
-static char * mime_application_octet_stream_xpm[] = {
-"14 18 4 1",
-"      c None",
-".     c #8E8E8E",
-"+     c #FFFFFF",
-"@     c #000000",
-"..............",
-".++++++++++++.",
-".++++++++++++.",
-".++++++++++++.",
-".++++++++++++.",
-".+++@@@++++++.",
-".++@+++@+++++.",
-".++@+++@+++++.",
-".+@@++@@+++++.",
-".+@@++@@+++++.",
-".+@@++@@+++++.",
-".+@@++@@+++++.",
-".+@+@@+@+++++.",
-".+@++++@+++++.",
-".+@++++@+++++.",
-".++@@@@++++++.",
-".++++++++++++.",
-".............."};

diff --git a/src/stock_pixmap.c b/src/stock_pixmap.c
index d30367c5fdc9521f4e8348955e1cdbcd2a057a96..95e3cc0af25ca1214f797e7f20e7ab2dc334f1f1 100644 (file)
--- a/src/stock_pixmap.c
+++ b/src/stock_pixmap.c
@@ -93,11 +93,9 @@
 #include "pixmaps/gpg_signed.xpm"
 #include "pixmaps/drafts_close.xpm"
 #include "pixmaps/drafts_open.xpm"
-#include "pixmaps/messageview_text.xpm"
 #include "pixmaps/mime_text_plain.xpm"
 #include "pixmaps/mime_text_html.xpm"
 #include "pixmaps/mime_application.xpm"
-#include "pixmaps/mime_application_octet_stream.xpm"
 #include "pixmaps/mime_image.xpm"
 #include "pixmaps/mime_audio.xpm"
 #include "pixmaps/mime_text_enriched.xpm"
@@ -205,11 +203,9 @@ static StockPixmapData pixmaps[] =
        {gpg_signed_xpm                         , NULL, NULL, "gpg_signed", "  "},
        {drafts_close_xpm                       , NULL, NULL, "drafts_close", "  "},
        {drafts_open_xpm                        , NULL, NULL, "drafts_open", "  "},
-       {messageview_text_xpm                   , NULL, NULL, "messageview_text", "  "},
        {mime_text_plain_xpm                    , NULL, NULL, "mime_text_plain", "  "},
        {mime_text_html_xpm                     , NULL, NULL, "mime_text_html", "  "},
        {mime_application_xpm                   , NULL, NULL, "mime_application", "  "},
-       {mime_application_octet_stream_xpm      , NULL, NULL, "mime_application_octet_stream", "  "},
        {mime_image_xpm                         , NULL, NULL, "mime_image", "  "},
        {mime_audio_xpm                         , NULL, NULL, "mime_audio", "  "},
        {mime_text_enriched_xpm                 , NULL, NULL, "mime_text_enriched", "  "},

diff --git a/src/stock_pixmap.h b/src/stock_pixmap.h
index 3b3a2afd89ea1b9322e8a4ed606907eaa10904a9..18644a78f95227a6f93f342d9763944f4795b8bb 100644 (file)
--- a/src/stock_pixmap.h
+++ b/src/stock_pixmap.h
@@ -103,11 +103,9 @@ typedef enum
        STOCK_PIXMAP_GPG_SIGNED,
        STOCK_PIXMAP_DRAFTS_CLOSE,
        STOCK_PIXMAP_DRAFTS_OPEN,
-       STOCK_PIXMAP_MESSAGEVIEW_TEXT,
        STOCK_PIXMAP_MIME_TEXT_PLAIN,
        STOCK_PIXMAP_MIME_TEXT_HTML,
        STOCK_PIXMAP_MIME_APPLICATION,
-       STOCK_PIXMAP_MIME_APPLICATION_OCTET_STREAM,
        STOCK_PIXMAP_MIME_IMAGE,
        STOCK_PIXMAP_MIME_AUDIO,
        STOCK_PIXMAP_MIME_TEXT_ENRICHED,