From: Paul Mangan <paul@claws-mail.org>
Date: Fri, 28 Feb 2003 17:58:42 +0000 (+0000)
Subject: re-order 'Signature' items in Account Prefs
X-Git-Tag: rel_0_8_11~61
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=a57c0258d83b304d79712048533e2e84a962fcf4

re-order 'Signature' items in Account Prefs
---

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 5023b7d1f..d1529fdfe 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2003-02-28 [paul]	0.8.10claws61
+
+	* src/prefs_account.c
+		re-order 'Signature' items
+
 2003-02-28 [paul]	0.8.10claws60
 
 	* sync with 0.8.10cvs20
diff --git a/configure.ac b/configure.ac
index 2282f6caa..f88d46c4d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=10
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws60
+EXTRA_VERSION=claws61
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
diff --git a/src/prefs_account.c b/src/prefs_account.c
index c7f376a93..9c044da3b 100644
--- a/src/prefs_account.c
+++ b/src/prefs_account.c
@@ -1515,6 +1515,22 @@ static void prefs_account_compose_create(void)
 	gtk_container_add (GTK_CONTAINER (frame_sig), vbox_sig);
 	gtk_container_set_border_width (GTK_CONTAINER (vbox_sig), 8);
 
+	PACK_CHECK_BUTTON (vbox_sig, checkbtn_autosig,
+			   _("Insert signature automatically"));
+
+	hbox1 = gtk_hbox_new (FALSE, 8);
+	gtk_widget_show (hbox1);
+	gtk_box_pack_start (GTK_BOX (vbox_sig), hbox1, TRUE, TRUE, 0);
+	label_sigsep = gtk_label_new (_("Signature separator"));
+	gtk_widget_show (label_sigsep);
+	gtk_box_pack_start (GTK_BOX (hbox1), label_sigsep, FALSE, FALSE, 0);
+
+	entry_sigsep = gtk_entry_new ();
+	gtk_widget_show (entry_sigsep);
+	gtk_box_pack_start (GTK_BOX (hbox1), entry_sigsep, FALSE, FALSE, 0);
+
+	gtk_widget_set_usize (entry_sigsep, 64, -1);
+
 	sig_hbox = gtk_hbox_new (FALSE, 8);
 	gtk_widget_show (sig_hbox);
 	gtk_box_pack_start (GTK_BOX (vbox_sig), sig_hbox, FALSE, FALSE, 0);
@@ -1534,26 +1550,10 @@ static void prefs_account_compose_create(void)
 	gtk_object_set_user_data (GTK_OBJECT (sigcmd_radiobtn),
 				  GINT_TO_POINTER (SIG_COMMAND));
 
-	PACK_CHECK_BUTTON (vbox_sig, checkbtn_autosig,
-			   _("Insert signature automatically"));
-
-	hbox1 = gtk_hbox_new (FALSE, 8);
-	gtk_widget_show (hbox1);
-	gtk_box_pack_start (GTK_BOX (vbox_sig), hbox1, TRUE, TRUE, 0);
-	label_sigsep = gtk_label_new (_("Signature separator"));
-	gtk_widget_show (label_sigsep);
-	gtk_box_pack_start (GTK_BOX (hbox1), label_sigsep, FALSE, FALSE, 0);
-
-	entry_sigsep = gtk_entry_new ();
-	gtk_widget_show (entry_sigsep);
-	gtk_box_pack_start (GTK_BOX (hbox1), entry_sigsep, FALSE, FALSE, 0);
-
-	gtk_widget_set_usize (entry_sigsep, 64, -1);
-
 	hbox2 = gtk_hbox_new (FALSE, 8);
 	gtk_widget_show (hbox2);
 	gtk_box_pack_start (GTK_BOX (vbox_sig), hbox2, TRUE, TRUE, 0);
-	label_sigpath = gtk_label_new (_("Signature file"));
+	label_sigpath = gtk_label_new (_("Signature"));
 	gtk_widget_show (label_sigpath);
 	gtk_box_pack_start (GTK_BOX (hbox2), label_sigpath, FALSE, FALSE, 0);