* src/mimeview.[ch]
authorLuke Plant <L.Plant.98@cantab.net>
Sat, 19 Jul 2003 21:08:55 +0000 (21:08 +0000)
committerLuke Plant <L.Plant.98@cantab.net>
Sat, 19 Jul 2003 21:08:55 +0000 (21:08 +0000)
* src/gtk/gtkvscrollbutton.c
* src/messageview.c
o improved mimeview behaviour when selecting a new message
o plus code cleanups to remove compile warnings

ChangeLog.claws
configure.ac
src/gtk/gtkvscrollbutton.c
src/messageview.c
src/mimeview.c
src/mimeview.h

index 2911bc0..9d8964e 100644 (file)
@@ -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
index a76cfee..d53d440 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 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
index 539e5f8..83ff6ca 100644 (file)
@@ -263,6 +263,10 @@ static gint gtk_vscrollbutton_scroll(GtkVScrollbutton *scrollbutton)
            scrollbutton->timer = 0;
        }
        break;
+    
+    default:
+       break;
+    
     }
 
     if (new_value != scrollbutton->adjustment->value) {
index 353ba8a..6faf45e 100644 (file)
@@ -805,7 +805,6 @@ void messageview_destroy(MessageView *messageview)
 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;
 
index c7bb05f..71e9353 100644 (file)
@@ -290,6 +290,7 @@ MimeView *mimeview_create(MainWindow *mainwin)
        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); 
        
@@ -700,7 +701,8 @@ static void mimeview_clear(MimeView *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,
@@ -1299,10 +1301,8 @@ static void icon_list_append_icon (MimeView *mimeview, MimeInfo *mimeinfo)
 {
        GtkWidget *pixmap;
        GtkWidget *vbox;
-       GtkWidget *icon_scroll = mimeview->icon_scroll;
        GtkWidget *button;
        GtkWidget *sep;
-       GtkTooltips *tooltips = mimeview->tooltips;
        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, 
-                               to_human_readable(mimeinfo->size), NULL);
+                               to_human_readable(mimeinfo->size));
        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);
@@ -1397,7 +1397,6 @@ static void icon_list_append_icon (MimeView *mimeview, MimeInfo *mimeinfo)
 
 static void icon_list_clear (MimeView *mimeview)
 {
-       GtkWidget *wid;
        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;
-       GtkWidget     *wid;
        
        adj = gtk_layout_get_vadjustment(GTK_LAYOUT(mimeview->icon_scroll));
 
index 67f00df..ec646f8 100644 (file)
@@ -56,6 +56,7 @@ struct _MimeView
        GtkWidget *icon_scroll;
        GtkWidget *icon_vbox;
        GtkWidget *icon_mainbox;
+       GtkWidget *mime_toggle;
 
        MimeViewType type;