# HG changeset patch
# User Luke Bratch <l_bratch@yahoo.co.uk>
# Date 1215969641 0
# Node ID ad0d0efa30dd38819ebf31e18235115a19c981be
# Parent  8553e5e19bd2361ca852e9dc052b752e3e9ec885
Allow not creating a different directory for each user. Closes #5997.

committer: Sadrul Habib Chowdhury <imadil@gmail.com>

diff -r 8553e5e19bd2 -r ad0d0efa30dd libpurple/plugins/autoaccept.c
--- a/libpurple/plugins/autoaccept.c	Sun Jul 13 17:00:50 2008 +0000
+++ b/libpurple/plugins/autoaccept.c	Sun Jul 13 17:20:41 2008 +0000
@@ -51,6 +51,7 @@
 #define PREF_PATH		PREF_PREFIX "/path"
 #define PREF_STRANGER	PREF_PREFIX "/reject_stranger"
 #define PREF_NOTIFY		PREF_PREFIX "/notify"
+#define PREF_NEWDIR     PREF_PREFIX "/newdir"
 
 typedef enum
 {
@@ -116,7 +117,11 @@
 			{
 				int count = 1;
 				const char *escape;
-				dirname = g_build_filename(pref, purple_normalize(account, xfer->who), NULL);
+
+				if (purple_prefs_get_bool(PREF_NEWDIR))
+					dirname = g_build_filename(pref, purple_normalize(account, xfer->who), NULL);
+				else
+					dirname = g_build_filename(pref, NULL);
 
 				if (!ensure_path_exists(dirname))
 				{
@@ -236,6 +241,10 @@
 					  "(only when there's no conversation with the sender)"));
 	purple_plugin_pref_frame_add(frame, pref);
 
+	pref = purple_plugin_pref_new_with_name_and_label(PREF_NEWDIR,
+			_("Create a new directory for each user"));
+	purple_plugin_pref_frame_add(frame, pref);
+
 	return frame;
 }
 
@@ -294,6 +303,7 @@
 	purple_prefs_add_string(PREF_PATH, dirname);
 	purple_prefs_add_bool(PREF_STRANGER, TRUE);
 	purple_prefs_add_bool(PREF_NOTIFY, TRUE);
+	purple_prefs_add_bool(PREF_NEWDIR, TRUE);
 	g_free(dirname);
 }