From: Colin Leroy <colin@colino.net>
Date: Tue, 6 Jan 2009 16:45:59 +0000 (+0000)
Subject: 2009-01-06 [colin]	3.7.0cvs15
X-Git-Tag: rel_3_7_1~66
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=ff8dcf90fa322a1de9ba877dfa7542bb94b85ce9

2009-01-06 [colin]	3.7.0cvs15

	* src/mainwindow.c
		Fix synchronisation dialog that shouldn't
		appear when network goes down (Network
		Manager)
	* src/mimeview.c
	* src/textview.c
		Fix save as when attach_save_dir isn't set
		fixes bug 1804, 'attach_save_directory does
		not default to $HOME'
	* src/plugins/pgpcore/select-keys.c
		Add mnemonics to buttons - warn translators!
---

diff --git a/ChangeLog b/ChangeLog
index 8c39ac23e..944ba4d6e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2009-01-06 [colin]	3.7.0cvs15
+
+	* src/mainwindow.c
+		Fix synchronisation dialog that shouldn't
+		appear when network goes down (Network
+		Manager)
+	* src/mimeview.c
+	* src/textview.c
+		Fix save as when attach_save_dir isn't set
+		fixes bug 1804, 'attach_save_directory does 
+		not default to $HOME'
+	* src/plugins/pgpcore/select-keys.c
+		Add mnemonics to buttons - warn translators!
+
 2009-01-06 [wwp]	3.7.0cvs14
 
 	* src/common/utils.c
diff --git a/PATCHSETS b/PATCHSETS
index 3625bf89b..3db85fb7d 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3676,3 +3676,4 @@
 ( cvs diff -u -r 1.207.2.208 -r 1.207.2.209 src/folderview.c;  ) > 3.7.0cvs12.patchset
 ( cvs diff -u -r 1.36.2.158 -r 1.36.2.159 src/common/utils.c;  ) > 3.7.0cvs13.patchset
 ( cvs diff -u -r 1.36.2.159 -r 1.36.2.160 src/common/utils.c;  ) > 3.7.0cvs14.patchset
+( cvs diff -u -r 1.274.2.292 -r 1.274.2.293 src/mainwindow.c;  cvs diff -u -r 1.83.2.150 -r 1.83.2.151 src/mimeview.c;  cvs diff -u -r 1.96.2.213 -r 1.96.2.214 src/textview.c;  cvs diff -u -r 1.1.2.22 -r 1.1.2.23 src/plugins/pgpcore/select-keys.c;  ) > 3.7.0cvs15.patchset
diff --git a/configure.ac b/configure.ac
index c533b519c..0f9b47a08 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=7
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=14
+EXTRA_VERSION=15
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/mainwindow.c b/src/mainwindow.c
index 8ca4be2ff..09d85068e 100644
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -4191,7 +4191,7 @@ static void online_switch_clicked (GtkButton *btn, gpointer data)
 	MainWindow *mainwin;
 	gboolean have_connectivity;
 
-#ifdef HAVE_NETWORKMANAGER
+#ifdef HAVE_NETWORKMANAGER_SUPPORT
 	have_connectivity = networkmanager_is_online(NULL); 
 #else
 	have_connectivity = TRUE;
@@ -4217,7 +4217,8 @@ static void online_switch_clicked (GtkButton *btn, gpointer data)
 		if(have_connectivity)
 			mainwindow_check_synchronise(mainwin, TRUE);
 		prefs_common.work_offline = TRUE;
-		imap_disconnect_all();
+		if(have_connectivity)
+			imap_disconnect_all();
 		hooks_invoke(OFFLINE_SWITCH_HOOKLIST, NULL);
 	} else {
 		/*go online */
diff --git a/src/mimeview.c b/src/mimeview.c
index 0d7d41135..07eca9fd1 100644
--- a/src/mimeview.c
+++ b/src/mimeview.c
@@ -1791,7 +1791,7 @@ static void mimeview_save_as(MimeView *mimeview)
 
 	subst_for_filename(partname);
 	
-	if (prefs_common.attach_save_dir)
+	if (prefs_common.attach_save_dir && *prefs_common.attach_save_dir)
 		filepath = g_strconcat(prefs_common.attach_save_dir,
 				       G_DIR_SEPARATOR_S, partname, NULL);
 	else
diff --git a/src/plugins/pgpcore/select-keys.c b/src/plugins/pgpcore/select-keys.c
index 6ee99e2e5..c2000358f 100644
--- a/src/plugins/pgpcore/select-keys.c
+++ b/src/plugins/pgpcore/select-keys.c
@@ -416,9 +416,9 @@ create_dialog (struct select_keys_s *sk)
     gtk_box_pack_end (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
 
     gtkut_stock_button_set_create (&bbox, 
-                                   &select_btn, _("Select"),
-		   		   &other_btn, _("Other"),
-		    		   &dont_encrypt_btn, _("Don't encrypt"));
+                                   &select_btn, _("_Select"),
+		   		   &other_btn, _("_Other"),
+		    		   &dont_encrypt_btn, _("Do_n't encrypt"));
     
     cancel_btn = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
     GTK_WIDGET_SET_FLAGS(cancel_btn, GTK_CAN_DEFAULT);
diff --git a/src/textview.c b/src/textview.c
index 4abc0dbc6..910fa02f7 100644
--- a/src/textview.c
+++ b/src/textview.c
@@ -2927,7 +2927,7 @@ static void save_file_cb (GtkAction *action, TextView *textview)
 
 	subst_for_filename(filename);
 	
-	if (prefs_common.attach_save_dir)
+	if (prefs_common.attach_save_dir && *prefs_common.attach_save_dir)
 		filepath = g_strconcat(prefs_common.attach_save_dir,
 				       G_DIR_SEPARATOR_S, filename, NULL);
 	else