2007-09-21 [paul] 3.0.1cvs20

	* src/gtk/prefswindow.c
		remove unnecessary frames from the prefs
		pages. Patch by Pawel Pekala

diff --git a/ChangeLog b/ChangeLog
index 983ebd5f97bd39040e65e3f43a9756fdcca6b658..e4adf6af95c6a571525cdde817c9ac45d11d7589 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-09-21 [paul]      3.0.1cvs20
+
+       * src/gtk/prefswindow.c
+               remove unnecessary frames from the prefs
+               pages. Patch by Pawel Pekala
+

 2007-09-21 [paul]      3.0.1cvs19
 
        * src/prefs_account.c
 2007-09-21 [paul]      3.0.1cvs19
 
        * src/prefs_account.c

diff --git a/PATCHSETS b/PATCHSETS
index 825a73857b090e7e621e7ddd21f3eff564bd397a..6f468aa4f36805fcb738ef0cb9b1410ce7c7db30 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2883,3 +2883,4 @@
 ( cvs diff -u -r 1.382.2.409 -r 1.382.2.410 src/compose.c;  ) > 3.0.1cvs17.patchset
 ( cvs diff -u -r 1.274.2.212 -r 1.274.2.213 src/mainwindow.c;  ) > 3.0.1cvs18.patchset
 ( cvs diff -u -r 1.105.2.110 -r 1.105.2.111 src/prefs_account.c;  cvs diff -u -r 1.52.2.48 -r 1.52.2.49 src/prefs_folder_item.c;  cvs diff -u -r 1.1.2.23 -r 1.1.2.24 src/prefs_quote.c;  cvs diff -u -r 1.8.2.23 -r 1.8.2.24 src/quote_fmt.c;  ) > 3.0.1cvs19.patchset
 ( cvs diff -u -r 1.382.2.409 -r 1.382.2.410 src/compose.c;  ) > 3.0.1cvs17.patchset
 ( cvs diff -u -r 1.274.2.212 -r 1.274.2.213 src/mainwindow.c;  ) > 3.0.1cvs18.patchset
 ( cvs diff -u -r 1.105.2.110 -r 1.105.2.111 src/prefs_account.c;  cvs diff -u -r 1.52.2.48 -r 1.52.2.49 src/prefs_folder_item.c;  cvs diff -u -r 1.1.2.23 -r 1.1.2.24 src/prefs_quote.c;  cvs diff -u -r 1.8.2.23 -r 1.8.2.24 src/quote_fmt.c;  ) > 3.0.1cvs19.patchset

+( cvs diff -u -r 1.12.2.42 -r 1.12.2.43 src/gtk/prefswindow.c;  ) > 3.0.1cvs20.patchset

diff --git a/configure.ac b/configure.ac
index eff24703c0b70c725cfe2b8d26989cde878cf631..a26bd371b47a541a558ba51df1f592631df12c41 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=19
+EXTRA_VERSION=20

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/gtk/prefswindow.c b/src/gtk/prefswindow.c
index 26bfc60e005682f4cb3c51e5a4c7bdae9746e9f6..06f92de0db3afe46f0512cf8ca2a81d57f6c9167 100644 (file)
--- a/src/gtk/prefswindow.c
+++ b/src/gtk/prefswindow.c
@@ -56,7 +56,7 @@ struct _PrefsWindow
        GtkWidget *table2;
        GtkWidget *pagelabel;
        GtkWidget *labelframe;
        GtkWidget *table2;
        GtkWidget *pagelabel;
        GtkWidget *labelframe;

-       GtkWidget *frame;
+       GtkWidget *vbox2;

        GtkWidget *notebook;
        GtkWidget *confirm_area;
        GtkWidget *ok_btn;
        GtkWidget *notebook;
        GtkWidget *confirm_area;
        GtkWidget *ok_btn;


@@ -419,6 +419,7 @@ void prefswindow_open_full(const gchar *title, GSList *prefs_pages,
        gint y = gdk_screen_height();
        static GdkGeometry geometry;
        GtkAdjustment *adj;
        gint y = gdk_screen_height();
        static GdkGeometry geometry;
        GtkAdjustment *adj;

+       GtkWidget *tmp;

 
        prefswindow = g_new0(PrefsWindow, 1);
 
 
        prefswindow = g_new0(PrefsWindow, 1);
 


@@ -448,6 +449,8 @@ void prefswindow_open_full(const gchar *title, GSList *prefs_pages,
 
        prefswindow->scrolledwindow1 = gtk_scrolled_window_new(NULL, NULL);
        gtk_widget_show(prefswindow->scrolledwindow1);
 
        prefswindow->scrolledwindow1 = gtk_scrolled_window_new(NULL, NULL);
        gtk_widget_show(prefswindow->scrolledwindow1);

+       gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(prefswindow->scrolledwindow1),
+                       GTK_SHADOW_IN);

        gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(prefswindow->scrolledwindow1),
                        GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
                        
        gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(prefswindow->scrolledwindow1),
                        GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
                        


@@ -458,15 +461,14 @@ void prefswindow_open_full(const gchar *title, GSList *prefs_pages,
        gtk_container_add(GTK_CONTAINER(prefswindow->scrolledwindow1), 
                          prefswindow->tree_view);
 
        gtk_container_add(GTK_CONTAINER(prefswindow->scrolledwindow1), 
                          prefswindow->tree_view);
 

-       prefswindow->frame = gtk_frame_new(NULL);
-       gtk_widget_show(prefswindow->frame);
-       gtk_frame_set_shadow_type(GTK_FRAME(prefswindow->frame), GTK_SHADOW_IN);
+       prefswindow->vbox2 = gtk_vbox_new(FALSE, 2);
+       gtk_widget_show(prefswindow->vbox2);

 
 

-       gtk_paned_add2(GTK_PANED(prefswindow->paned), prefswindow->frame);
+       gtk_paned_add2(GTK_PANED(prefswindow->paned), prefswindow->vbox2);

 
        prefswindow->table2 = gtk_table_new(1, 2, FALSE);
        gtk_widget_show(prefswindow->table2);
 
        prefswindow->table2 = gtk_table_new(1, 2, FALSE);
        gtk_widget_show(prefswindow->table2);

-       gtk_container_add(GTK_CONTAINER(prefswindow->frame), prefswindow->table2);
+       gtk_container_add(GTK_CONTAINER(prefswindow->vbox2), prefswindow->table2);

 
        prefswindow->labelframe = gtk_frame_new(NULL);
        gtk_widget_show(prefswindow->labelframe);
 
        prefswindow->labelframe = gtk_frame_new(NULL);
        gtk_widget_show(prefswindow->labelframe);


@@ -492,8 +494,10 @@ void prefswindow_open_full(const gchar *title, GSList *prefs_pages,
        gtk_notebook_set_show_border(GTK_NOTEBOOK(prefswindow->notebook), FALSE);
        gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(prefswindow->scrolledwindow2),
                                        prefswindow->notebook);
        gtk_notebook_set_show_border(GTK_NOTEBOOK(prefswindow->notebook), FALSE);
        gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(prefswindow->scrolledwindow2),
                                        prefswindow->notebook);

+       tmp = gtk_bin_get_child(GTK_BIN(prefswindow->scrolledwindow2));
+       gtk_viewport_set_shadow_type(GTK_VIEWPORT(tmp), GTK_SHADOW_NONE);

        gtk_table_attach(GTK_TABLE(prefswindow->table2), prefswindow->scrolledwindow2,
        gtk_table_attach(GTK_TABLE(prefswindow->table2), prefswindow->scrolledwindow2,

-                       0, 1, 1, 2, GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND, 8, 8);
+                       0, 1, 1, 2, GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND, 0, 4);

 
        prefswindow->empty_page = gtk_label_new("");
        gtk_widget_show(prefswindow->empty_page);
 
        prefswindow->empty_page = gtk_label_new("");
        gtk_widget_show(prefswindow->empty_page);