2007-07-20 [colin] 2.10.0cvs49

	* src/main.c
		Unref stuff even on error
	* src/wizard.c
		disconnect signals only at the very
		end of the wizard save.

diff --git a/ChangeLog b/ChangeLog
index fb451dbc58eb9263f6100093c9a26a7451ba1a61..3adb597b982d7162141f2fd48fd6e95ab919573e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-07-20 [colin]     2.10.0cvs49
+
+       * src/main.c
+               Unref stuff even on error
+       * src/wizard.c
+               disconnect signals only at the very
+               end of the wizard save.
+
 2007-07-20 [colin]     2.10.0cvs48
 
        * src/mainwindow.c

diff --git a/PATCHSETS b/PATCHSETS
index cc0c61866a375b3d6ca7ce8a19a9bb757ed81be2..d1cfc2a2e9395b74280ff52071622a184d801ff3 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2702,3 +2702,4 @@
 ( cvs diff -u -r 1.155.2.71 -r 1.155.2.72 src/Makefile.am;  cvs diff -u -r 1.25.2.42 -r 1.25.2.43 src/stock_pixmap.c;  cvs diff -u -r 1.1.2.56 -r 1.1.2.57 src/wizard.c;  cvs diff -u -r 1.4.2.51 -r 1.4.2.52 src/gtk/about.c;  diff -u /dev/null src/pixmaps/claws-mail_logo-small.xpm;  ) > 2.10.0cvs46.patchset
 ( cvs diff -u -r 1.654.2.2756 -r 1.654.2.2757 configure.ac;  cvs diff -u -r 1.115.2.158 -r 1.115.2.159 src/main.c;  cvs diff -u -r 1.204.2.141 -r 1.204.2.142 src/prefs_common.c;  cvs diff -u -r 1.103.2.87 -r 1.103.2.88 src/prefs_common.h;  cvs diff -u -r 1.1.2.57 -r 1.1.2.58 src/wizard.c;  cvs diff -u -r 1.9.2.40 -r 1.9.2.41 src/common/defs.h;  cvs diff -u -r 1.36.2.106 -r 1.36.2.107 src/common/utils.c;  ) > 2.10.0cvs47.patchset
 ( cvs diff -u -r 1.274.2.199 -r 1.274.2.200 src/mainwindow.c;  cvs diff -u -r 1.94.2.141 -r 1.94.2.142 src/messageview.c;  cvs diff -u -r 1.43.2.76 -r 1.43.2.77 src/toolbar.c;  cvs diff -u -r 1.19.2.19 -r 1.19.2.20 src/toolbar.h;  ) > 2.10.0cvs48.patchset
+( cvs diff -u -r 1.115.2.159 -r 1.115.2.160 src/main.c;  cvs diff -u -r 1.1.2.58 -r 1.1.2.59 src/wizard.c;  ) > 2.10.0cvs49.patchset

diff --git a/configure.ac b/configure.ac
index 3e70bb09637a98cee930c6edfa2cf2fa83a4b2fa..0d6cf02ab02c4a2425266305c61c8fa74b07061f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=10
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=48
+EXTRA_VERSION=49
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/main.c b/src/main.c
index 9eec413f888fb8c9da1bfe220964b2902d32e119..66835aa39da5ec5766c0168a0dd63ab69570574d 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -1099,6 +1099,8 @@ int main(int argc, char *argv[])
                    || strcmp(mount_path, prefs_common.data_root)) {
                        alertpanel_error(_("Claws Mail can not start without its data volume (%s)."), 
                                prefs_common.data_root);
+                       g_free(mount_path);
+                       gnome_vfs_volume_unref(vol);
                        exit_claws(mainwin);
                        exit(1);
                }

diff --git a/src/wizard.c b/src/wizard.c
index 2adb493c6dc7d0abef92e0c4abbc5a4a8412cac2..675e852661d216d5d7c3abb1ac9e82c3a69cb9f4 100644 (file)
--- a/src/wizard.c
+++ b/src/wizard.c
@@ -606,14 +606,6 @@ static gboolean wizard_write_config(WizardWindow *wizard)
        else if (gtk_toggle_button_get_active(
                GTK_TOGGLE_BUTTON(wizard->data_root_mmc2_radiobtn)))
                prefs_common.data_root = g_strdup(MMC2_PATH);
-       if (wizard->volmon_mount_sigid)
-               g_signal_handler_disconnect(
-                                       G_OBJECT(wizard->volmon),
-                                       wizard->volmon_mount_sigid);
-       if (wizard->volmon_unmount_sigid)
-               g_signal_handler_disconnect(
-                                       G_OBJECT(wizard->volmon),
-                                       wizard->volmon_unmount_sigid);
 #endif
 
        if (!mailbox_ok) {
@@ -797,7 +789,18 @@ static gboolean wizard_write_config(WizardWindow *wizard)
        initialize_fonts(wizard);
        if (wizard->create_mailbox && prefs_account->protocol != A_IMAP4)
                write_welcome_email(wizard);
-       
+
+#ifdef MAEMO
+       if (wizard->volmon_mount_sigid)
+               g_signal_handler_disconnect(
+                                       G_OBJECT(wizard->volmon),
+                                       wizard->volmon_mount_sigid);
+       if (wizard->volmon_unmount_sigid)
+               g_signal_handler_disconnect(
+                                       G_OBJECT(wizard->volmon),
+                                       wizard->volmon_unmount_sigid);
+#endif
+
 #ifndef G_OS_WIN32 
        plugin_load_standard_plugins();
 #endif