2004-11-22 [paul] 0.9.12cvs160

	* src/prefs_themes.c
		fix oversized GtkFrames

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 78353fa..6a8ff6a 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2004-11-22 [paul]      0.9.12cvs160
+
+       * src/prefs_themes.c
+               fix oversized GtkFrames
+
 2004-11-19 [paul]      0.9.12cvs159
 
        * src/prefs_common.c

diff --git a/PATCHSETS b/PATCHSETS
index c13e4f7..4d996ac 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -142,3 +142,4 @@
 ( cvs diff -u -r 1.313 -r 1.314 src/mainwindow.c; cvs diff -u -r 1.230 -r 1.231 src/prefs_common.c; ) > 0.9.12cvs157.patchset
 ( cvs diff -u -r 1.456 -r 1.457 src/compose.c; cvs diff -u -r 1.126 -r 1.127 src/messageview.c; cvs diff -u -r 1.58 -r 1.59 src/common/utils.c; cvs diff -u -r 1.34 -r 1.35 src/common/utils.h; ) > 0.9.12cvs158.patchset
 ( cvs diff -u -r 1.231 -r 1.232 src/prefs_common.c; ) > 0.9.12cvs159.patchset
+( cvs diff -u -r 1.6 -r 1.7 src/prefs_themes.c; ) > 0.9.12cvs160.patchset

diff --git a/configure.ac b/configure.ac
index b4a3179..33118dd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=159
+EXTRA_VERSION=160
 EXTRA_RELEASE=
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then

diff --git a/src/prefs_themes.c b/src/prefs_themes.c
index 5d2b985..d7ada07 100644 (file)
--- a/src/prefs_themes.c
+++ b/src/prefs_themes.c
@@ -750,7 +750,6 @@ static void prefs_themes_create_widget(PrefsPage *page, GtkWindow *window, gpoin
        GdkColor uri_color[2] = {{0, 0, 0, 0xffff}, {0, 0xffff, 0, 0}};
        gboolean success[2];
 
-       /* BEGIN GLADE EDITED CODE */
        GtkWidget *vbox1;
        GtkWidget *frame1;
        GtkWidget *vbox2;
@@ -787,11 +786,9 @@ static void prefs_themes_create_widget(PrefsPage *page, GtkWindow *window, gpoin
 
        vbox1 = gtk_vbox_new (FALSE, 0);
        gtk_widget_show (vbox1);
-
-       frame1 = gtk_frame_new (_("Selector"));
-       gtk_widget_show (frame1);
-       gtk_box_pack_start (GTK_BOX (vbox1), frame1, TRUE, TRUE, 0);
-
+       
+       PACK_FRAME (vbox1, frame1, _("Selector"));
+       
        vbox2 = gtk_vbox_new (FALSE, 0);
        gtk_widget_show (vbox2);
        gtk_container_add (GTK_CONTAINER (frame1), vbox2);
@@ -847,10 +844,8 @@ static void prefs_themes_create_widget(PrefsPage *page, GtkWindow *window, gpoin
        gtk_misc_set_alignment (GTK_MISC (label_global_status), 0, 0.5);
        gtk_misc_set_padding (GTK_MISC (label_global_status), 6, 0);
 
-       frame_info = gtk_frame_new (_("Information"));
-       gtk_widget_show (frame_info);
-       gtk_box_pack_start (GTK_BOX (vbox1), frame_info, TRUE, TRUE, 0);
-
+       PACK_FRAME (vbox1, frame_info, _("Information"));
+       
        table1 = gtk_table_new (4, 2, FALSE);
        gtk_widget_show (table1);
        gtk_container_add (GTK_CONTAINER (frame_info), table1);
@@ -913,10 +908,8 @@ static void prefs_themes_create_widget(PrefsPage *page, GtkWindow *window, gpoin
                        (GtkAttachOptions) (0), 0, 0);
        gtk_misc_set_alignment (GTK_MISC (label_status), 0, 0.5);
 
-       frame_preview = gtk_frame_new (_("Preview"));
-       gtk_widget_show (frame_preview);
-       gtk_box_pack_start (GTK_BOX (vbox1), frame_preview, TRUE, TRUE, 0);
-
+       PACK_FRAME (vbox1, frame_preview, _("Preview"));
+       
        hbox1 = gtk_hbox_new (FALSE, 0);
        gtk_widget_show (hbox1);
        gtk_container_add (GTK_CONTAINER (frame_preview), hbox1);
@@ -956,10 +949,8 @@ static void prefs_themes_create_widget(PrefsPage *page, GtkWindow *window, gpoin
        gtk_box_pack_start (GTK_BOX (hbox1), icon_7, TRUE, TRUE, 0);
        gtk_misc_set_padding (GTK_MISC (icon_7), 0, 5);
 
-       frame_buttons = gtk_frame_new (_("Actions"));
-       gtk_widget_show (frame_buttons);
-       gtk_box_pack_start (GTK_BOX (vbox1), frame_buttons, TRUE, TRUE, 0);
-
+       PACK_FRAME (vbox1, frame_buttons, _("Actions"));
+       
        hbuttonbox1 = gtk_hbutton_box_new ();
        gtk_widget_show (hbuttonbox1);
        gtk_container_add (GTK_CONTAINER (frame_buttons), hbuttonbox1);
@@ -992,7 +983,6 @@ static void prefs_themes_create_widget(PrefsPage *page, GtkWindow *window, gpoin
                        NULL);
 
        gtk_widget_grab_default (btn_use);
-       /* END GLADE EDITED CODE */
 
        prefs_themes->window = GTK_WIDGET(window);