Made account selection when reediting queued message work again

Fixed bug where 'Enter' in a compose header entry will send message if 'CTL-Enter' is used as a send shortcut

diff --git a/ChangeLog.claws b/ChangeLog.claws
index ee17cafe6d88d3786d4d9b86b29430c7c665f15f..b41f43a8fd32ca9ffed8d7bc7758d0e4e86cddf4 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,21 @@
+2002-01-04 [melvin]    0.6.6claws37
+
+       * src/account.c
+               Made account selection code use strcasestr again instead of
+               g_strcasecmp (fixes bug where reediting queued messages
+               did not select proper account reported by T. Link).
+       
+       * src/folderview.c
+               Fix bug where folder icons are not shown when 'hide read messages'
+               is on.
+       
+       * src/stock_pixmaps.[ch]
+               Added folder icons for 'hide read messages'.
+       
+       * src/compose.c
+               Fixed bug where 'Enter' in a header entry will send the message 
+               if 'CTL-Enter' was chosen as a shorcut for sendind. 
+
 2002-01-03 [melvin]    0.6.6claws36
        
        * src/prefs.[ch]
@@ -33,8 +51,7 @@
                                        folder B -not being viewed- updated the 
                                        summaryview of folder A with data of
                                        folder B). (Hope this is clear... )
-                                
-               
+
 2001-12-31 [alfons]    0.6.6claws34
        
        * src/ldif.c

diff --git a/configure.in b/configure.in
index 132883679a015f993dd0a0af30dc0ca9ec88c5fc..4283652e1cf9f27389fc3c82fe4757d3c2b25cc5 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=6
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws36
+EXTRA_VERSION=claws37
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl

diff --git a/src/account.c b/src/account.c
index 832f7d55d728bf8bb2b083f25d64a74f7bdcffb0..b58bce3d6a98a0e33a05fc836857889258a15d93 100644 (file)
--- a/src/account.c
+++ b/src/account.c
@@ -207,7 +207,7 @@ PrefsAccount *account_find_from_address(const gchar *address)
        for (cur = account_list; cur != NULL; cur = cur->next) {
                ac = (PrefsAccount *)cur->data;
                if (ac->protocol != A_NNTP && ac->address &&
-                   !g_strcasecmp(address, ac->address))
+                   strcasestr(address, ac->address))
                        return ac;
        }
 

diff --git a/src/compose.c b/src/compose.c
index 78bf8300061258cb32d6aaf0769dcc242affeece..7ad82fe14260d54537d46ff753a69456ebec2714 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -6313,12 +6313,17 @@ static void compose_ctl_enter_send_shortcut_cb(GtkWidget *w, Compose *compose)
        GtkAccelEntry  *accel;
        GtkWidget      *send_button;
        GSList *list;
+       GdkEvent *e= gtk_get_current_event();
        
+       if (e->type != GDK_KEY_PRESS || 
+           !( ((GdkEventKey *)e)->state & GDK_CONTROL_MASK) )
+               return;
+
        ifactory = gtk_item_factory_from_widget(compose->menubar);
        send_button = gtk_item_factory_get_widget(ifactory, "/Message/Send");
        list = gtk_accel_group_entries_from_object(GTK_OBJECT(send_button));
        accel = (GtkAccelEntry *) list->data;
-       if (accel->accelerator_key == GDK_Return && accel->accelerator_mods == GDK_CONTROL_MASK)
+       if (accel->accelerator_key == GDK_Return && 
+           accel->accelerator_mods == GDK_CONTROL_MASK)
                compose_send_cb(compose, 0, NULL);
-       
 }      

diff --git a/src/folderview.c b/src/folderview.c
index b8fd33a6c8fc5b310e2f7a0c0f4c2cc1f6135779..2746e5c52c1c438d376a9546b12f630b1e4c9dfd 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -454,6 +454,16 @@ void folderview_init(FolderView *folderview)
        stock_pixmap_gdk(ctree, STOCK_PIXMAP_DIR_OPEN,
                         &folderopenxpm, &folderopenxpmmask);
        stock_pixmap_gdk(ctree, STOCK_PIXMAP_TRASH, &trashxpm, &trashxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_INBOX_HRM, 
+                        &inboxhrmxpm, &inboxhrmxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_OUTBOX_HRM, 
+                        &outboxhrmxpm, &outboxhrmxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_DIR_OPEN_HRM, 
+                        &folderopenhrmxpm, &folderopenhrmxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_TRASH_HRM, 
+                        &trashhrmxpm, &trashhrmxpmmask);
+
+
 
        if (!normalfont)
                normalfont = gdk_fontset_load(NORMAL_FONT);

diff --git a/src/stock_pixmap.c b/src/stock_pixmap.c
index f2f15367396a138834e0a4142dd01fd52642b183..9b17e76e69b785af05dff8ba1f16c9c598c9353d 100644 (file)
--- a/src/stock_pixmap.c
+++ b/src/stock_pixmap.c
@@ -36,10 +36,12 @@
 #include "pixmaps/deleted.xpm"
 #include "pixmaps/dir-close.xpm"
 #include "pixmaps/dir-open.xpm"
+#include "pixmaps/dir-open-hrm.xpm"
 #include "pixmaps/error.xpm"
 #include "pixmaps/forwarded.xpm"
 #include "pixmaps/group.xpm"
 #include "pixmaps/inbox.xpm"
+#include "pixmaps/inbox-hrm.xpm"
 #include "pixmaps/interface.xpm"
 #include "pixmaps/jpilot.xpm"
 #include "pixmaps/key.xpm"
@@ -49,6 +51,7 @@
 #include "pixmaps/locked.xpm"
 #include "pixmaps/new.xpm"
 #include "pixmaps/outbox.xpm"
+#include "pixmaps/outbox-hrm.xpm"
 #include "pixmaps/replied.xpm"
 #include "pixmaps/stock_close.xpm"
 #include "pixmaps/stock_down_arrow.xpm"
@@ -71,6 +74,7 @@
 #include "pixmaps/sylpheed-logo.xpm"
 #include "pixmaps/tb_address_book.xpm"
 #include "pixmaps/trash.xpm"
+#include "pixmaps/trash-hrm.xpm"
 #include "pixmaps/unread.xpm"
 #include "pixmaps/vcard.xpm"
 #include "pixmaps/ignorethread.xpm"
@@ -98,10 +102,12 @@ static StockPixmapData pixmaps[] =
        {deleted_xpm                    , NULL, NULL},
        {dir_close_xpm                  , NULL, NULL},
        {dir_open_xpm                   , NULL, NULL},
+       {dir_open_hrm_xpm               , NULL, NULL},
        {error_xpm                      , NULL, NULL},
        {forwarded_xpm                  , NULL, NULL},
        {group_xpm                      , NULL, NULL},
        {inbox_xpm                      , NULL, NULL},
+       {inbox_hrm_xpm                  , NULL, NULL},
        {interface_xpm                  , NULL, NULL},
        {jpilot_xpm                     , NULL, NULL},
        {key_xpm                        , NULL, NULL},
@@ -111,6 +117,7 @@ static StockPixmapData pixmaps[] =
        {locked_xpm                     , NULL, NULL},
        {new_xpm                        , NULL, NULL},
        {outbox_xpm                     , NULL, NULL},
+       {outbox_hrm_xpm                 , NULL, NULL},
        {replied_xpm                    , NULL, NULL},
        {stock_close_xpm                , NULL, NULL},
        {stock_down_arrow_xpm           , NULL, NULL},
@@ -133,6 +140,7 @@ static StockPixmapData pixmaps[] =
        {sylpheed_logo_xpm              , NULL, NULL},
        {tb_address_book_xpm            , NULL, NULL},
        {trash_xpm                      , NULL, NULL},
+       {trash_hrm_xpm                  , NULL, NULL},
        {unread_xpm                     , NULL, NULL},
        {vcard_xpm                      , NULL, NULL},
        {ignorethread_xpm               , NULL, NULL},

diff --git a/src/stock_pixmap.h b/src/stock_pixmap.h
index ed8b06bdbc1d99a3c2a616ffb1830e242aa76e6d..cc63ece55fc5168183f18d9cde9482c8e1067a1c 100644 (file)
--- a/src/stock_pixmap.h
+++ b/src/stock_pixmap.h
@@ -37,10 +37,12 @@ typedef enum
        STOCK_PIXMAP_DELETED,
        STOCK_PIXMAP_DIR_CLOSE,
        STOCK_PIXMAP_DIR_OPEN,
+       STOCK_PIXMAP_DIR_OPEN_HRM,
        STOCK_PIXMAP_ERROR,
        STOCK_PIXMAP_FORWARDED,
        STOCK_PIXMAP_GROUP,
        STOCK_PIXMAP_INBOX,
+       STOCK_PIXMAP_INBOX_HRM,
        STOCK_PIXMAP_INTERFACE,
        STOCK_PIXMAP_JPILOT,
        STOCK_PIXMAP_KEY,
@@ -50,6 +52,7 @@ typedef enum
        STOCK_PIXMAP_LOCKED,
        STOCK_PIXMAP_NEW,
        STOCK_PIXMAP_OUTBOX,
+       STOCK_PIXMAP_OUTBOX_HRM,
        STOCK_PIXMAP_REPLIED,
        STOCK_PIXMAP_CLOSE,
        STOCK_PIXMAP_DOWN_ARROW,
@@ -72,6 +75,7 @@ typedef enum
        STOCK_PIXMAP_SYLPHEED_LOGO,
        STOCK_PIXMAP_ADDRESS_BOOK,
        STOCK_PIXMAP_TRASH,
+       STOCK_PIXMAP_TRASH_HRM,
        STOCK_PIXMAP_UNREAD,
        STOCK_PIXMAP_VCARD,
        STOCK_PIXMAP_IGNORETHREAD,