2009-03-16 [paul] 3.7.1cvs16

	* src/prefs_customheader.c
		put the (X-)Face preview image below the up/down
		buttons so they don't jump around.
		make the list reorderable by drag'n'drop

diff --git a/ChangeLog b/ChangeLog
index fd58bc2d7df239a76844bc04d641357baefa0736..615361f947818085b9eae38295bb7a8eb79b0786 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-03-16 [paul]      3.7.1cvs16
+
+       * src/prefs_customheader.c
+               put the (X-)Face preview image below the up/down
+               buttons so they don't jump around.
+               make the list reorderable by drag'n'drop
+
 2009-03-16 [colin]     3.7.1cvs15
 
        * src/prefs_customheader.c

diff --git a/PATCHSETS b/PATCHSETS
index ca48d28dc1e4cd06033a0376d1421606d169b7d0..27d908447f5b115deaa64512d40836fe0b4435ed 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3755,3 +3755,4 @@
 ( cvs diff -u -r 1.9.2.67 -r 1.9.2.68 src/gtk/gtkaspell.c;  ) > 3.7.1cvs13.patchset
 ( cvs diff -u -r 1.382.2.503 -r 1.382.2.504 src/compose.c;  cvs diff -u -r 1.213.2.190 -r 1.213.2.191 src/folder.c;  cvs diff -u -r 1.87.2.58 -r 1.87.2.59 src/folder.h;  cvs diff -u -r 1.16.2.65 -r 1.16.2.66 src/msgcache.c;  cvs diff -u -r 1.5.2.15 -r 1.5.2.16 src/common/prefs.c;  ) > 3.7.1cvs14.patchset
 ( cvs diff -u -r 1.16.2.34 -r 1.16.2.35 src/prefs_customheader.c;  ) > 3.7.1cvs15.patchset
+( cvs diff -u -r 1.16.2.35 -r 1.16.2.36 src/prefs_customheader.c;  ) > 3.7.1cvs16.patchset

diff --git a/configure.ac b/configure.ac
index cd783f5e628fdf9e52799bd7729cdc037e377dec..a89282ed4e1e8f4bbaf3301e94e197eccd2be9d2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=7
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=15
+EXTRA_VERSION=16
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/prefs_customheader.c b/src/prefs_customheader.c
index 6f319e2d3e8110fc3ed51a09a5ee0f619b573c10..75499b09c1114f584c03884663301538dee084f7 100644 (file)
--- a/src/prefs_customheader.c
+++ b/src/prefs_customheader.c
@@ -292,10 +292,6 @@ static void prefs_custom_header_create(void)
        gtk_widget_show (btn_vbox);
        gtk_box_pack_start (GTK_BOX (ch_hbox), btn_vbox, FALSE, FALSE, 0);
 
-       preview = gtk_image_new ();
-       gtk_widget_show (preview);
-       gtk_box_pack_start (GTK_BOX (btn_vbox), preview, FALSE, FALSE, 0);
-
        up_btn = gtk_button_new_from_stock (GTK_STOCK_GO_UP);
        gtk_widget_show (up_btn);
        gtk_box_pack_start (GTK_BOX (btn_vbox), up_btn, FALSE, FALSE, 0);
@@ -308,6 +304,10 @@ static void prefs_custom_header_create(void)
        g_signal_connect (G_OBJECT (down_btn), "clicked",
                          G_CALLBACK (prefs_custom_header_down), NULL);
 
+       preview = gtk_image_new ();
+       gtk_widget_show (preview);
+       gtk_box_pack_start (GTK_BOX (btn_vbox), preview, FALSE, FALSE, 0);
+
        gtk_widget_show_all(window);
 
        customhdr.window     = window;
@@ -854,6 +854,7 @@ static GtkWidget *prefs_custom_header_list_view_create(void)
        g_object_unref(model);  
        
        gtk_tree_view_set_rules_hint(list_view, prefs_common.use_stripes_everywhere);
+       gtk_tree_view_set_reorderable(list_view, TRUE);
        
        selector = gtk_tree_view_get_selection(list_view);
        gtk_tree_selection_set_mode(selector, GTK_SELECTION_BROWSE);