made user-agent string configurable from plug-ins.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@2577 ee746299-78ed-0310-b773-934348b2243d

4 files changed, 23 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index 9b8881ba..ad1a3f3e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-06-17
+
+	* libsylph/prefs_common.h
+	  src/compose.c
+	  src/main.c: made user-agent string configurable from plug-ins.
+
 2010-06-15
 
 	* version 3.1.0beta1
diff --git a/libsylph/prefs_common.h b/libsylph/prefs_common.h
index 88cd41f9..1ce4724d 100644
--- a/libsylph/prefs_common.h
+++ b/libsylph/prefs_common.h
@@ -315,6 +315,8 @@ struct _PrefsCommon
 	gboolean recipients_autoreg;         /* Send */
 	gboolean enable_address_completion;  /* Compose */
 	gboolean fullauto_completion_mode;   /* Compose */
+
+	gchar *user_agent_str;
 };
 
 extern PrefsCommon prefs_common;
diff --git a/src/compose.c b/src/compose.c
index ccb465db..d1c96479 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -4704,17 +4704,15 @@ static gint compose_write_headers(Compose *compose, FILE *fp,
 	}
 
 	/* Program version and system info */
-	if (compose->to_list && !IS_IN_CUSTOM_HEADER("X-Mailer")) {
-		fprintf(fp, "X-Mailer: %s (GTK+ %d.%d.%d; %s)\n",
-			prog_version,
-			gtk_major_version, gtk_minor_version, gtk_micro_version,
-			TARGET_ALIAS);
-	}
-	if (compose->newsgroup_list && !IS_IN_CUSTOM_HEADER("X-Newsreader")) {
-		fprintf(fp, "X-Newsreader: %s (GTK+ %d.%d.%d; %s)\n",
-			prog_version,
-			gtk_major_version, gtk_minor_version, gtk_micro_version,
-			TARGET_ALIAS);
+	if (prefs_common.user_agent_str) {
+		if (compose->to_list && !IS_IN_CUSTOM_HEADER("X-Mailer")) {
+			fprintf(fp, "X-Mailer: %s\n",
+				prefs_common.user_agent_str);
+		}
+		if (compose->newsgroup_list && !IS_IN_CUSTOM_HEADER("X-Newsreader")) {
+			fprintf(fp, "X-Newsreader: %s\n",
+				prefs_common.user_agent_str);
+		}
 	}
 
 	/* custom headers */
diff --git a/src/main.c b/src/main.c
index f0604674..30ba2b69 100644
--- a/src/main.c
+++ b/src/main.c
@@ -265,6 +265,12 @@ int main(int argc, char *argv[])
 	prefs_display_header_read_config();
 	colorlabel_read_config();
 
+	prefs_common.user_agent_str = g_strdup_printf
+		("%s (GTK+ %d.%d.%d; %s)",
+		 prog_version,
+		 gtk_major_version, gtk_minor_version, gtk_micro_version,
+		 TARGET_ALIAS);
+
 #ifdef G_OS_WIN32
 	{
 		gchar *path;