talons

commit 93faabde99d58cfdb10f8f9351dd61aa73e722f0
parent 89f2ee5e88e12300fd54c624affa673dccb2c5aa
Author: Colin Leroy <colin@colino.net>
Date:   Fri, 26 Sep 2008 16:52:36 +0000

2008-09-26 [colin]	3.5.0cvs132

	* src/prefs_common.c
	* src/prefs_common.h
	* src/plugins/pgpcore/pgp_viewer.c
		Add an accessor to prefs_common for plugins
		(Win32 fix)

Diffstat:
M
ChangeLog
 | 
8
++++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/plugins/pgpcore/pgp_viewer.c
 | 
4
++--
M
src/prefs_common.c
 | 
5
+++++
M
src/prefs_common.h
 | 
2
++

6 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,11 @@
+2008-09-26 [colin]	3.5.0cvs132
+
+	* src/prefs_common.c
+	* src/prefs_common.h
+	* src/plugins/pgpcore/pgp_viewer.c
+		Add an accessor to prefs_common for plugins
+		(Win32 fix)
+
 2008-09-25 [colin]	3.5.0cvs131
 
 	* src/main.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3543,3 +3543,4 @@
 ( cvs diff -u -r 1.115.2.207 -r 1.115.2.208 src/main.c;  ) > 3.5.0cvs129.patchset
 ( diff -u /dev/null src/plugins/smime/mypgpcore.def;  diff -u /dev/null src/plugins/smime/plugin.def;  diff -u /dev/null src/plugins/smime/version.rc;  ) > 3.5.0cvs130.patchset
 ( cvs diff -u -r 1.115.2.208 -r 1.115.2.209 src/main.c;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/smime/mypgpcore.def;  ) > 3.5.0cvs131.patchset
+( cvs diff -u -r 1.204.2.179 -r 1.204.2.180 src/prefs_common.c;  cvs diff -u -r 1.103.2.114 -r 1.103.2.115 src/prefs_common.h;  cvs diff -u -r 1.1.2.14 -r 1.1.2.15 src/plugins/pgpcore/pgp_viewer.c;  ) > 3.5.0cvs132.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=5
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=131
+EXTRA_VERSION=132
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/plugins/pgpcore/pgp_viewer.c b/src/plugins/pgpcore/pgp_viewer.c
@@ -116,7 +116,7 @@ static void pgpview_show_mime_part(TextView *textview, MimeInfo *partinfo)
 	if (!key) {
 		gchar *cmd = g_strdup_printf("gpg --no-tty --recv-keys %s", sig->fpr);
 		AlertValue val = G_ALERTDEFAULT;
-		if (!prefs_common.work_offline) {
+		if (!prefs_common_get_prefs()->work_offline) {
 			val = alertpanel(_("Key import"),
 				_("This key is not in your keyring. Do you want "
 				  "Claws Mail to try and import it from a "
@@ -130,7 +130,7 @@ static void pgpview_show_mime_part(TextView *textview, MimeInfo *partinfo)
 			TEXTVIEW_INSERT(":\n\n");
 			TEXTVIEW_INSERT(_("   This key is not in your keyring.\n"));
 			TEXTVIEW_INSERT(_("   It should be possible to import it "));
-			if (prefs_common.work_offline)
+			if (prefs_common_get_prefs()->work_offline)
 				TEXTVIEW_INSERT(_("when working online,\n   or "));
 			TEXTVIEW_INSERT(_("with the following command: \n\n     "));
 			TEXTVIEW_INSERT(cmd);
diff --git a/src/prefs_common.c b/src/prefs_common.c
@@ -1552,3 +1552,8 @@ gboolean prefs_common_get_use_shred(void)
 {
 	return prefs_common.use_shred;
 }
+
+PrefsCommon *prefs_common_get_prefs(void)
+{
+	return &prefs_common;
+}
diff --git a/src/prefs_common.h b/src/prefs_common.h
@@ -502,6 +502,8 @@ struct _PrefsCommon
 
 extern PrefsCommon prefs_common;
 
+PrefsCommon *prefs_common_get_prefs(void);
+
 GList *prefs_common_read_history_from_dir_with_defaults(const gchar *dirname, const gchar *history,
 															  GList *default_list);
 void prefs_common_read_config	(void);