* src/mimeview.[ch]

* src/gtk/gtkvscrollbutton.c
* src/messageview.c
	o improved mimeview behaviour when selecting a new message
	o plus code cleanups to remove compile warnings

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 2911bc0ff079d20bb4085ae3aa950bbedcc0aa3e..9d8964e4f45dc8242c08a8d7afa085e758347ca5 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,12 @@
+2003-07-19 [luke]      0.9.3claws31
+
+       * src/mimeview.[ch]
+       * src/gtk/gtkvscrollbutton.c
+       * src/messageview.c
+               o improved mimeview behaviour when selecting a new message
+               o plus code cleanups to remove compile warnings
+
+

 2003-07-19 [alfons]    0.9.3claws30
 
        * src/procmsg.c
 2003-07-19 [alfons]    0.9.3claws30
 
        * src/procmsg.c

diff --git a/configure.ac b/configure.ac
index a76cfee263d5d0dc0e44aab4c429ce1991c98491..d53d44062118671074afd46aff122e4413e37cf0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=3
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=3
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=30
+EXTRA_VERSION=31

 VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws${EXTRA_VERSION}
 
 dnl set $target
 VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws${EXTRA_VERSION}
 
 dnl set $target

diff --git a/src/gtk/gtkvscrollbutton.c b/src/gtk/gtkvscrollbutton.c
index 539e5f83a4ba6d083c084e5e64892575bc9180a5..83ff6ca35daefb0408d40f41c5b1923053ac2088 100644 (file)
--- a/src/gtk/gtkvscrollbutton.c
+++ b/src/gtk/gtkvscrollbutton.c
@@ -263,6 +263,10 @@ static gint gtk_vscrollbutton_scroll(GtkVScrollbutton *scrollbutton)
            scrollbutton->timer = 0;
        }
        break;
            scrollbutton->timer = 0;
        }
        break;

+    
+    default:
+       break;
+    

     }
 
     if (new_value != scrollbutton->adjustment->value) {
     }
 
     if (new_value != scrollbutton->adjustment->value) {

diff --git a/src/messageview.c b/src/messageview.c
index 353ba8a5266eccc4ea645d3196d3460963813cc2..6faf45e60e9d97a9da17bc440dff878891239910 100644 (file)
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -805,7 +805,6 @@ void messageview_destroy(MessageView *messageview)
 void messageview_delete(MessageView *msgview)
 {
        MsgInfo *msginfo = (MsgInfo*)msgview->msginfo;
 void messageview_delete(MessageView *msgview)
 {
        MsgInfo *msginfo = (MsgInfo*)msgview->msginfo;

-       SummaryView *summaryview = (SummaryView*)msgview->mainwin->summaryview;

        FolderItem *trash = folder_get_default_trash();
        GSList *msg_list;
 
        FolderItem *trash = folder_get_default_trash();
        GSList *msg_list;
 

diff --git a/src/mimeview.c b/src/mimeview.c
index c7bb05f9429157286f1811aa4830e8a0a0646539..71e9353ceab4c8ec243fd13afff16df4cae7244c 100644 (file)
--- a/src/mimeview.c
+++ b/src/mimeview.c
@@ -290,6 +290,7 @@ MimeView *mimeview_create(MainWindow *mainwin)
        mimeview->mainwin       = mainwin;
        mimeview->tooltips      = tooltips;
        mimeview->oldsize       = 160;
        mimeview->mainwin       = mainwin;
        mimeview->tooltips      = tooltips;
        mimeview->oldsize       = 160;

+       mimeview->mime_toggle   = mime_toggle;

 
        mimeview->target_list   = gtk_target_list_new(mimeview_mime_types, 1); 
        
 
        mimeview->target_list   = gtk_target_list_new(mimeview_mime_types, 1); 
        


@@ -700,7 +701,8 @@ static void mimeview_clear(MimeView *mimeview)
        mimeview->file = NULL;
        icon_list_clear(mimeview);
 
        mimeview->file = NULL;
        icon_list_clear(mimeview);
 

-       /* gtk_notebook_set_page(GTK_NOTEBOOK(mimeview->notebook), 0); */
+       if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(mimeview->mime_toggle)))
+               gtk_notebook_set_page(GTK_NOTEBOOK(mimeview->notebook), 0);

 }
 
 static void mimeview_selected(GtkCTree *ctree, GtkCTreeNode *node, gint column,
 }
 
 static void mimeview_selected(GtkCTree *ctree, GtkCTreeNode *node, gint column,


@@ -1299,10 +1301,8 @@ static void icon_list_append_icon (MimeView *mimeview, MimeInfo *mimeinfo)
 {
        GtkWidget *pixmap;
        GtkWidget *vbox;
 {
        GtkWidget *pixmap;
        GtkWidget *vbox;

-       GtkWidget *icon_scroll = mimeview->icon_scroll;

        GtkWidget *button;
        GtkWidget *sep;
        GtkWidget *button;
        GtkWidget *sep;

-       GtkTooltips *tooltips = mimeview->tooltips;

        gchar *tip;
        gchar *desc = NULL;
        gint width;
        gchar *tip;
        gchar *desc = NULL;
        gint width;


@@ -1381,10 +1381,10 @@ static void icon_list_append_icon (MimeView *mimeview, MimeInfo *mimeinfo)
        }
        if (desc && *desc)
                tip = g_strdup_printf("%s\n%s\n%s", desc, mimeinfo->content_type, 
        }
        if (desc && *desc)
                tip = g_strdup_printf("%s\n%s\n%s", desc, mimeinfo->content_type, 

-                               to_human_readable(mimeinfo->size), NULL);
+                               to_human_readable(mimeinfo->size));

        else            
                tip = g_strdup_printf("%s\n%s", mimeinfo->content_type, 
        else            
                tip = g_strdup_printf("%s\n%s", mimeinfo->content_type, 

-                               to_human_readable(mimeinfo->size), NULL);
+                               to_human_readable(mimeinfo->size));

 
        gtk_tooltips_set_tip(mimeview->tooltips, button, tip, NULL);
        g_free(tip);
 
        gtk_tooltips_set_tip(mimeview->tooltips, button, tip, NULL);
        g_free(tip);


@@ -1397,7 +1397,6 @@ static void icon_list_append_icon (MimeView *mimeview, MimeInfo *mimeinfo)
 
 static void icon_list_clear (MimeView *mimeview)
 {
 
 static void icon_list_clear (MimeView *mimeview)
 {

-       GtkWidget *wid;

        GList     *child;
        GtkAdjustment *adj;
        
        GList     *child;
        GtkAdjustment *adj;
        


@@ -1425,7 +1424,6 @@ static void icon_scroll_size_allocate_cb(GtkWidget *widget,
        GtkAllocation *vbox_size;
        GtkAllocation *layout_size;
        GtkAdjustment *adj;
        GtkAllocation *vbox_size;
        GtkAllocation *layout_size;
        GtkAdjustment *adj;

-       GtkWidget     *wid;

        
        adj = gtk_layout_get_vadjustment(GTK_LAYOUT(mimeview->icon_scroll));
 
        
        adj = gtk_layout_get_vadjustment(GTK_LAYOUT(mimeview->icon_scroll));
 

diff --git a/src/mimeview.h b/src/mimeview.h
index 67f00df59248f7daf9fedfcde27921c58260a45a..ec646f85bdcd4f51a6c630f8a57263a2ba3a4dc8 100644 (file)
--- a/src/mimeview.h
+++ b/src/mimeview.h
@@ -56,6 +56,7 @@ struct _MimeView
        GtkWidget *icon_scroll;
        GtkWidget *icon_vbox;
        GtkWidget *icon_mainbox;
        GtkWidget *icon_scroll;
        GtkWidget *icon_vbox;
        GtkWidget *icon_mainbox;

+       GtkWidget *mime_toggle;

 
        MimeViewType type;
 
 
        MimeViewType type;