2007-01-18 [colin] 2.7.1cvs31

	* src/main.c
		Don't error out on --sync option. Although
		we don't do anything with it, gtk+ handles
		it, and it's useful for debugging X errors

diff --git a/ChangeLog b/ChangeLog
index 85675bd639252da237f676f3f5cf6f119b526200..87ffc75f0e6bf7e0c5568d8275b0ebc94b559d03 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-01-18 [colin]     2.7.1cvs31
+
+       * src/main.c
+               Don't error out on --sync option. Although
+               we don't do anything with it, gtk+ handles
+               it, and it's useful for debugging X errors
+

 2007-01-18 [fabien]    2.7.1cvs30
 
        * src/prefs_other.c
 2007-01-18 [fabien]    2.7.1cvs30
 
        * src/prefs_other.c

diff --git a/PATCHSETS b/PATCHSETS
index 0e6bfcba2972cc0a46edd2901c89fd8939644298..4b94cb13a77b9599047fbe60856355053a7b4f88 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2288,3 +2288,4 @@
 ( cvs diff -u -r 1.5.2.11 -r 1.5.2.12 src/prefs_gtk.h;  cvs diff -u -r 1.382.2.352 -r 1.382.2.353 src/compose.c;  ) > 2.7.1cvs28.patchset
 ( cvs diff -u -r 1.1.2.15 -r 1.1.2.16 src/plugins/bogofilter/bogofilter_gtk.c;  cvs diff -u -r 1.1.2.23 -r 1.1.2.24 src/plugins/bogofilter/bogofilter.c;  cvs diff -u -r 1.23.2.34 -r 1.23.2.35 src/plugins/spamassassin/spamassassin_gtk.c;  cvs diff -u -r 1.27.2.27 -r 1.27.2.28 src/addr_compl.c;  cvs diff -u -r 1.105.2.81 -r 1.105.2.82 src/prefs_account.c;  ) > 2.7.1cvs29.patchset
 ( cvs diff -u -r 1.1.2.15 -r 1.1.2.16 src/prefs_other.c;  ) > 2.7.1cvs30.patchset
 ( cvs diff -u -r 1.5.2.11 -r 1.5.2.12 src/prefs_gtk.h;  cvs diff -u -r 1.382.2.352 -r 1.382.2.353 src/compose.c;  ) > 2.7.1cvs28.patchset
 ( cvs diff -u -r 1.1.2.15 -r 1.1.2.16 src/plugins/bogofilter/bogofilter_gtk.c;  cvs diff -u -r 1.1.2.23 -r 1.1.2.24 src/plugins/bogofilter/bogofilter.c;  cvs diff -u -r 1.23.2.34 -r 1.23.2.35 src/plugins/spamassassin/spamassassin_gtk.c;  cvs diff -u -r 1.27.2.27 -r 1.27.2.28 src/addr_compl.c;  cvs diff -u -r 1.105.2.81 -r 1.105.2.82 src/prefs_account.c;  ) > 2.7.1cvs29.patchset
 ( cvs diff -u -r 1.1.2.15 -r 1.1.2.16 src/prefs_other.c;  ) > 2.7.1cvs30.patchset

+( cvs diff -u -r 1.115.2.126 -r 1.115.2.127 src/main.c;  ) > 2.7.1cvs31.patchset

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

-EXTRA_VERSION=30
+EXTRA_VERSION=31

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/main.c b/src/main.c
index 613f5f0194294b69122c8a6e686834f58a04fa02..f0d7dd4b32ae192f4e0181460b41b2b228e82600 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -766,6 +766,7 @@ int main(int argc, char *argv[])
 
        mainwin = main_window_create
                (prefs_common.sep_folder | prefs_common.sep_msg << 1);
 
        mainwin = main_window_create
                (prefs_common.sep_folder | prefs_common.sep_msg << 1);

+

        manage_window_focus_in(mainwin->window, NULL, NULL);
        folderview = mainwin->folderview;
 
        manage_window_focus_in(mainwin->window, NULL, NULL);
        folderview = mainwin->folderview;
 


@@ -1211,6 +1212,8 @@ static void parse_cmd_opt(int argc, char *argv[])
                                        cmd.subscribe = TRUE;
                                        cmd.subscribe_uri = p;
                                }
                                        cmd.subscribe = TRUE;
                                        cmd.subscribe_uri = p;
                                }

+                       } else if (!strcmp(argv[i], "--sync")) {
+                               /* gtk debug */

                        } else {
                                g_print(_("Unknown option\n"));
                                exit(1);
                        } else {
                                g_print(_("Unknown option\n"));
                                exit(1);