From 4fccc2e5d220bda700a5332ece789051b622cfa2 Mon Sep 17 00:00:00 2001 From: Paul Mangan Date: Sat, 2 Dec 2006 18:22:59 +0000 Subject: [PATCH] 2006-12-02 [paul] 2.6.0cvs80 * src/exphtmldlg.c fix broken GUI under certain languages * src/expldifdlg.c put the Cancel button to the right --- ChangeLog | 7 +++++++ PATCHSETS | 1 + configure.ac | 2 +- src/exphtmldlg.c | 5 +---- src/expldifdlg.c | 7 +++---- 5 files changed, 13 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1f52554eb..f96fd1c0b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-12-02 [paul] 2.6.0cvs80 + + * src/exphtmldlg.c + fix broken GUI under certain languages + * src/expldifdlg.c + put the Cancel button to the right + 2006-12-01 [paul] 2.6.0cvs79 * tools/Makefile.am diff --git a/PATCHSETS b/PATCHSETS index 87ed635a3..028cc2774 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -2104,3 +2104,4 @@ ( cvs diff -u -r 1.1.2.34 -r 1.1.2.35 manual/advanced.xml; cvs diff -u -r 1.1.2.14 -r 1.1.2.15 manual/fr/advanced.xml; cvs diff -u -r 1.60.2.70 -r 1.60.2.71 src/addressbook.c; cvs diff -u -r 1.18.2.4 -r 1.18.2.5 src/addressbook.h; cvs diff -u -r 1.5.2.5 -r 1.5.2.6 src/addressitem.h; cvs diff -u -r 1.14.2.17 -r 1.14.2.18 src/editaddress.c; cvs diff -u -r 1.3.2.3 -r 1.3.2.4 src/editaddress.h; cvs diff -u -r 1.204.2.110 -r 1.204.2.111 src/prefs_common.c; cvs diff -u -r 1.103.2.68 -r 1.103.2.69 src/prefs_common.h; cvs diff -u -r 1.5.2.44 -r 1.5.2.45 src/gtk/gtkutils.c; cvs diff -u -r 1.4.2.26 -r 1.4.2.27 src/gtk/gtkutils.h; ) > 2.6.0cvs77.patchset ( cvs diff -u -r 1.60.2.71 -r 1.60.2.72 src/addressbook.c; cvs diff -u -r 1.14.2.18 -r 1.14.2.19 src/editaddress.c; ) > 2.6.0cvs78.patchset ( cvs diff -u -r 1.25.2.14 -r 1.25.2.15 tools/Makefile.am; ) > 2.6.0cvs79.patchset +( cvs diff -u -r 1.3.2.18 -r 1.3.2.19 src/exphtmldlg.c; cvs diff -u -r 1.1.4.21 -r 1.1.4.22 src/expldifdlg.c; ) > 2.6.0cvs80.patchset diff --git a/configure.ac b/configure.ac index d852aa1d1..0c11f8256 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=6 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=79 +EXTRA_VERSION=80 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/exphtmldlg.c b/src/exphtmldlg.c index 3e5e39940..1677654ef 100644 --- a/src/exphtmldlg.c +++ b/src/exphtmldlg.c @@ -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 @@ static void export_html_dialog_create( void ) { 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") ); diff --git a/src/expldifdlg.c b/src/expldifdlg.c index e4ed03890..a51302edf 100644 --- a/src/expldifdlg.c +++ b/src/expldifdlg.c @@ -700,10 +700,9 @@ static void export_ldif_dialog_create( void ) { 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); -- 2.25.1