2011-10-17 [mones] 3.7.10cvs33

	* src/main.c
		Use just one g_print call per option; correct indentation

diff --git a/ChangeLog b/ChangeLog
index 163a4ea5348f627d61ebcc229f7032fa196f1303..9929eb5155225924cf8c46d2324956465ca74752 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-17 [mones]     3.7.10cvs33
+
+       * src/main.c
+               Use just one g_print call per option; correct indentation
+
 2011-10-17 [colin]     3.7.10cvs32
 
        * src/compose.c

diff --git a/PATCHSETS b/PATCHSETS
index b2c56a2060c53412f4bfd1bea8cd878c2527d2dc..2ba3b51b56077c1fa69d64b5b7c65f3ce7165185 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -4236,3 +4236,4 @@
 ( cvs diff -u -r 1.115.2.239 -r 1.115.2.240 src/main.c;  ) > 3.7.10cvs30.patchset
 ( cvs diff -u -r 1.12.2.69 -r 1.12.2.70 src/action.c;  cvs diff -u -r 1.115.2.240 -r 1.115.2.241 src/main.c;  cvs diff -u -r 1.5.2.98 -r 1.5.2.99 src/gtk/gtkutils.c;  cvs diff -u -r 1.4.2.60 -r 1.4.2.61 src/gtk/gtkutils.h;  ) > 3.7.10cvs31.patchset
 ( cvs diff -u -r 1.382.2.585 -r 1.382.2.586 src/compose.c;  cvs diff -u -r 1.50.2.63 -r 1.50.2.64 src/compose.h;  cvs diff -u -r 1.20.2.27 -r 1.20.2.28 src/gtk/Makefile.am;  cvs diff -u -r 1.1.4.17 -r 1.1.4.18 src/gtk/gtkshruler.c;  cvs diff -u -r 1.1.4.10 -r 1.1.4.11 src/gtk/gtkshruler.h;  diff -u /dev/null src/gtk/gtkunit.c;  diff -u /dev/null src/gtk/gtkunit.h;  ) > 3.7.10cvs32.patchset
+( cvs diff -u -r 1.115.2.241 -r 1.115.2.242 src/main.c;  ) > 3.7.10cvs33.patchset

diff --git a/configure.ac b/configure.ac
index 41c3a4d5b4e68809582ca3d614b449af2253a47b..23a85a9493a3328997c7c0fc35a024cb2d74f4fb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=10
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=32
+EXTRA_VERSION=33
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/main.c b/src/main.c
index 65f1b4f65e603366b42bb10c51089f1c9cb4de67..34d9843d222856468d7f7424ae8a8619973f29f2 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -2025,16 +2025,16 @@ static void parse_cmd_opt(int argc, char *argv[])
                                          "                         empty line, then mail body until end of file."));
                        g_print("%s\n", _("  --subscribe [uri]      subscribe to the given URI if possible"));
                        g_print("%s\n", _("  --attach file1 [file2]...\n"
-                                 "                         open composition window with specified files\n"
-                                 "                         attached"));
+                                         "                         open composition window with specified files\n"
+                                         "                         attached"));
                        g_print("%s\n", _("  --receive              receive new messages"));
                        g_print("%s\n", _("  --receive-all          receive new messages of all accounts"));
-                       g_print("%s\n", _("  --search folder type request [recursive]"));
-                       g_print("%s\n", _("                         searches mail"));
-                       g_print("%s\n", _("                         folder ex.: \"#mh/Mailbox/inbox\" or \"Mail\""));
-                       g_print("%s\n", _("                         type: s[ubject],f[rom],t[o],e[xtended],m[ixed] or g: tag"));
-                       g_print("%s\n", _("                         request: search string"));
-                       g_print("%s\n", _("                         recursive: false if arg. starts with 0, n, N, f or F"));
+                       g_print("%s\n", _("  --search folder type request [recursive]\n"
+                                         "                         searches mail\n"
+                                         "                         folder ex.: \"#mh/Mailbox/inbox\" or \"Mail\"\n"
+                                         "                         type: s[ubject],f[rom],t[o],e[xtended],m[ixed] or g: tag\n"
+                                         "                         request: search string\n"
+                                         "                         recursive: false if arg. starts with 0, n, N, f or F"));
 
                        g_print("%s\n", _("  --send                 send all queued messages"));
                        g_print("%s\n", _("  --status [folder]...   show the total number of messages"));