better next/previous/delete/focus navigation with separate
authorAlfons Hoogervorst <alfons@proteus.demon.nl>
Thu, 18 Mar 2004 23:30:29 +0000 (23:30 +0000)
committerAlfons Hoogervorst <alfons@proteus.demon.nl>
Thu, 18 Mar 2004 23:30:29 +0000 (23:30 +0000)
message view

* src/toolbar.c
call summaryview_delete() instead of messageview_delete()
* src/messageview.c
disable messageview_delete()

ChangeLog.claws
configure.ac
src/messageview.c
src/toolbar.c

index c97a11b..49c5e91 100644 (file)
@@ -1,3 +1,13 @@
+2004-03-19 [alfons]    0.9.10claws19
+
+       better next/previous/delete/focus navigation with separate 
+       message view 
+       
+       * src/toolbar.c
+               call summaryview_delete() instead of messageview_delete()
+       * src/messageview.c
+               disable messageview_delete()
+
 2004-03-18 [paul]      0.9.10claws18
 
        * sync with 0.9.10cvs6
index b053b3e..322914a 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=10
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=18
+EXTRA_VERSION=19
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
 else
index 7da9d29..bf124c5 100644 (file)
@@ -780,6 +780,9 @@ void messageview_destroy(MessageView *messageview)
 
 void messageview_delete(MessageView *msgview)
 {
+#if 1
+       g_warning("Use summary_delete()\n");
+#else
        MsgInfo *msginfo = (MsgInfo *) msgview->msginfo;
        FolderItem *trash = NULL;
        PrefsAccount *ac = NULL;
@@ -809,6 +812,7 @@ void messageview_delete(MessageView *msgview)
                procmsg_msginfo_set_flags(msginfo, MSG_DELETED, 0);
                /* NOTE: does not update to next message in summaryview */
        }
+#endif 
 }
 
 /* 
index b111ab9..3029a5e 100644 (file)
@@ -896,8 +896,11 @@ static void toolbar_delete_cb(GtkWidget *widget, gpointer data)
        
        switch (toolbar_item->type) {
        case TOOLBAR_MSGVIEW:
-               msgview = (MessageView*)toolbar_item->parent;
-               messageview_delete(msgview);
+               if (msgview = (MessageView*)toolbar_item->parent) {
+                       mainwin = msgview->mainwin;
+                       if (msgview->msginfo && mainwin)
+                               summary_delete(mainwin->summaryview);
+               }                               
                break;
         case TOOLBAR_MAIN:
                mainwin = (MainWindow*)toolbar_item->parent;