CVS: sylpheedclaws/sylpheed-claws/src exphtmldlg.c,1.3.2.17.4.1,1.3.2.17.4.2 expldifdlg.c,1.1.4.19.10.1,1.1.4.19.10.2

Update of /pack/anoncvs/sylpheedclaws/sylpheed-claws/src
In directory sunsite.dk:/tmp/cvs-serv7313/src

Modified Files:
      Tag: stable_2_6
	exphtmldlg.c expldifdlg.c 
Log Message:
2006-12-04 [paul]	2.6.0cvs22-stable

	* src/exphtmldlg.c
		backported from 2.6.0cvs80:
		fix broken GUI under certain languages
	* src/expldifdlg.c
		backported from 2.6.0cvs80:
		put the Cancel button to the right 

Index: exphtmldlg.c
===================================================================
RCS file: /pack/anoncvs/sylpheedclaws/sylpheed-claws/src/exphtmldlg.c,v
retrieving revision 1.3.2.17.4.1
retrieving revision 1.3.2.17.4.2
diff -u -d -r1.3.2.17.4.1 -r1.3.2.17.4.2
--- exphtmldlg.c	2006/11/24 13:10:51	1.3.2.17.4.1
+++ exphtmldlg.c	2006/12/04 08:13:53	1.3.2.17.4.2
@@ -53,9 +53,6 @@
 #define PAGE_FORMAT                1
 #define PAGE_FINISH                2
 
-#define EXPORTHTML_WIDTH           480
-#define EXPORTHTML_HEIGHT          -1
-
 /**
  * Dialog object.
  */
@@ -592,7 +589,7 @@
 	GtkWidget *statusbar;
 
 	window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-	gtk_widget_set_size_request(window, EXPORTHTML_WIDTH, EXPORTHTML_HEIGHT );
+	gtk_widget_set_size_request(window, -1, -1 );
 	gtk_container_set_border_width( GTK_CONTAINER(window), 0 );
 	gtk_window_set_title( GTK_WINDOW(window),
 		_("Export Address Book to HTML File") );

Index: expldifdlg.c
===================================================================
RCS file: /pack/anoncvs/sylpheedclaws/sylpheed-claws/src/expldifdlg.c,v
retrieving revision 1.1.4.19.10.1
retrieving revision 1.1.4.19.10.2
diff -u -d -r1.1.4.19.10.1 -r1.1.4.19.10.2
--- expldifdlg.c	2006/11/24 13:10:52	1.1.4.19.10.1
+++ expldifdlg.c	2006/12/04 08:13:53	1.1.4.19.10.2
@@ -700,10 +700,9 @@
 	gtk_box_pack_start(GTK_BOX(hsbox), statusbar, TRUE, TRUE, BORDER_WIDTH);
 
 	/* Button panel */
-	gtkut_stock_button_set_create(&hbbox,
-				      &btnCancel, GTK_STOCK_CANCEL, 
-				      &btnPrev, GTK_STOCK_GO_BACK,
-				      &btnNext, GTK_STOCK_GO_FORWARD);
+	gtkut_stock_button_set_create(&hbbox, &btnPrev, GTK_STOCK_GO_BACK,
+				      &btnNext, GTK_STOCK_GO_FORWARD,
+				      &btnCancel, GTK_STOCK_CANCEL);
 	gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
 	gtk_container_set_border_width(GTK_CONTAINER(hbbox), 2);
 	gtk_widget_grab_default(btnNext);