talons

commit cf4b47c8a0017a6b1374534d18a40a5876bd1313
parent 1568b431fd5be67b6234227f3b6b35de70227368
Author: Colin Leroy <colin@colino.net>
Date:   Sat,  4 Oct 2008 18:24:57 +0000

2008-10-04 [colin]	3.6.0cvs6

	* src/mimeview.c
		Fix bug 1742, 'Attachment list contents not
		visible/scrollable'

Diffstat:
M
ChangeLog
 | 
6
++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/mimeview.c
 | 
14
++++++++++----

4 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2008-10-04 [colin]	3.6.0cvs6
+
+	* src/mimeview.c
+		Fix bug 1742, 'Attachment list contents not 
+		visible/scrollable'
+
 2008-10-04 [paul]	3.6.0cvs5
 
 	* src/mainwindow.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3562,3 +3562,4 @@
 ( cvs diff -u -r 1.50.2.32 -r 1.50.2.33 po/pt_BR.po;  ) > 3.6.0cvs3.patchset
 ( cvs diff -u -r 1.60.2.124 -r 1.60.2.125 src/addressbook.c;  cvs diff -u -r 1.382.2.481 -r 1.382.2.482 src/compose.c;  cvs diff -u -r 1.274.2.275 -r 1.274.2.276 src/mainwindow.c;  cvs diff -u -r 1.94.2.188 -r 1.94.2.189 src/messageview.c;  cvs diff -u -r 1.395.2.393 -r 1.395.2.394 src/summaryview.c;  ) > 3.6.0cvs4.patchset
 ( cvs diff -u -r 1.274.2.276 -r 1.274.2.277 src/mainwindow.c;  ) > 3.6.0cvs5.patchset
+( cvs diff -u -r 1.83.2.144 -r 1.83.2.145 src/mimeview.c;  ) > 3.6.0cvs6.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=5
+EXTRA_VERSION=6
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/mimeview.c b/src/mimeview.c
@@ -253,6 +253,8 @@ MimeView *mimeview_create(MainWindow *mainwin)
 	GtkUIManager *gui_manager = gtkut_ui_manager();
 	GtkActionGroup *actions;
 	NoticeView *siginfoview;
+	GtkRequisition r;
+
 	gchar *titles[N_MIMEVIEW_COLS];
 	gint i;
 	CLAWS_TIP_DECL();
@@ -331,6 +333,7 @@ MimeView *mimeview_create(MainWindow *mainwin)
 	mimeview->ctree_mode = FALSE;
 	arrow = gtk_arrow_new(GTK_ARROW_LEFT, GTK_SHADOW_NONE);
 	gtk_widget_show(arrow);
+	gtk_widget_size_request(arrow, &r);
 	gtk_container_add(GTK_CONTAINER(mime_toggle), arrow);
 	g_signal_connect(G_OBJECT(mime_toggle), "button_release_event", 
 			 G_CALLBACK(mime_toggle_button_cb), mimeview);
@@ -390,7 +393,7 @@ MimeView *mimeview_create(MainWindow *mainwin)
 	gtk_widget_show(hbox);
 	gtk_widget_hide(ctree_mainbox);
 #ifdef GENERIC_UMPC
-	gtk_widget_set_size_request(mime_toggle, -1, arrow->requisition.height + 8);
+	gtk_widget_set_size_request(mime_toggle, -1, r.height + 8);
 #endif
 	mimeview->hbox          = hbox;
 	mimeview->paned         = paned;
@@ -2164,6 +2167,9 @@ static void icon_list_append_icon (MimeView *mimeview, MimeInfo *mimeinfo)
 	MimeInfo *partinfo;
 	MimeInfo *siginfo = NULL;
 	MimeInfo *encrypted = NULL;
+#ifdef GENERIC_UMPC
+	GtkRequisition r;
+#endif
 #if !(GTK_CHECK_VERSION(2,12,0))
 	GtkTooltips *tips = mimeview->tooltips;
 #endif
@@ -2324,8 +2330,8 @@ static void icon_list_append_icon (MimeView *mimeview, MimeInfo *mimeinfo)
 			 G_CALLBACK(mimeview_drag_data_get), mimeview);
 	gtk_box_pack_start(GTK_BOX(vbox), button, FALSE, FALSE, 0);
 #ifdef GENERIC_UMPC
-	gtk_widget_set_size_request(vbox, -1, pixmap->requisition.height + 8);
-	gtk_widget_set_size_request(button, -1, pixmap->requisition.height + 4);
+	gtk_widget_size_request(pixmap, &r);
+	gtk_widget_set_size_request(button, -1, r.height + 4);
 #endif
 
 }
@@ -2359,7 +2365,7 @@ static void icon_scroll_size_allocate_cb(GtkWidget *widget,
 	GtkAllocation *vbox_size;
 	GtkAllocation *layout_size;
 	GtkAdjustment *adj;
-	
+
 	adj = gtk_layout_get_vadjustment(GTK_LAYOUT(mimeview->icon_scroll));
 
 	mainbox_size = &mimeview->icon_mainbox->allocation;