pidgin: libpurple/plugins/autoaccept.c comparison

comparison libpurple/plugins/autoaccept.c @ 31364:ea2a155b4439

propagate from branch 'im.pidgin.pidgin' (head 7d1d85421a7221e67b586df32625c65c1434f195) to branch 'im.pidgin.pidgin.next.minor' (head 5806c0bc47c791300ede51ab92336dd817bd149c)

author	John Bailey <rekkanoryo@rekkanoryo.org>
date	Sat, 08 Jan 2011 03:10:40 +0000
parents	a8cc50c2279f
children	26a4f6fc8024 bba25395d28e

comparison

equal deleted inserted replaced

-:539aa44be788
+:ea2a155b4439
 #include <notify.h>
 #include <util.h>
 #define PREF_PREFIX		"/plugins/core/" PLUGIN_ID
 #define PREF_PATH		PREF_PREFIX "/path"
-#define PREF_STRANGER	PREF_PREFIX "/reject_stranger"
+#define PREF_STRANGER	PREF_PREFIX "/stranger"
 #define PREF_NOTIFY		PREF_PREFIX "/notify"
 #define PREF_NEWDIR     PREF_PREFIX "/newdir"
+#define PREF_ESCAPE     PREF_PREFIX "/escape"
+#define PREF_STRANGER_OLD PREF_PREFIX "/reject_stranger"
 typedef enum
 {
 	FT_ASK,
 	FT_ACCEPT,
 	PurpleBlistNode *node;
 	const char *pref;
 	char *filename;
 	char *dirname;
+int accept_setting;
 	account = xfer->account;
 	node = PURPLE_BLIST_NODE(purple_find_buddy(account, xfer->who));
-	if (!node)
+	/* If person is on buddy list, use the buddy setting; otherwise, use the
-	{
+	   stranger setting. */
-		if (purple_prefs_get_bool(PREF_STRANGER))
+	if (node) {
-			xfer->status = PURPLE_XFER_STATUS_CANCEL_LOCAL;
+		node = purple_blist_node_get_parent(node);
-		return;
+		g_return_if_fail(PURPLE_BLIST_NODE_IS_CONTACT(node));
+		accept_setting = purple_blist_node_get_int(node, "autoaccept");
+	} else {
+		accept_setting = purple_prefs_get_int(PREF_STRANGER);
 	}
-	node = purple_blist_node_get_parent(node);
+	switch (accept_setting)
-	g_return_if_fail(PURPLE_BLIST_NODE_IS_CONTACT(node));
-	pref = purple_prefs_get_string(PREF_PATH);
-	switch (purple_blist_node_get_int(node, "autoaccept"))
 	{
 		case FT_ASK:
 			break;
 		case FT_ACCEPT:
+pref = purple_prefs_get_string(PREF_PATH);
 			if (ensure_path_exists(pref))
 			{
 				int count = 1;
 				const char *escape;
 				gchar **name_and_ext;
 				{
 					g_free(dirname);
 					break;
 				}
-				escape = purple_escape_filename(xfer->filename);
+				/* Escape filename (if escaping is turned on) */
+				if (purple_prefs_get_bool(PREF_ESCAPE)) {
+					escape = purple_escape_filename(xfer->filename);
+				} else {
+					escape = xfer->filename;
+				}
 				filename = g_build_filename(dirname, escape, NULL);
 				/* Split at the first dot, to avoid uniquifying "foo.tar.gz" to "foo.tar-2.gz" */
 				name_and_ext = g_strsplit(escape, ".", 2);
 				name = name_and_ext[0];
 	if (PURPLE_BLIST_NODE_IS_BUDDY(node))
 		node = purple_blist_node_get_parent(node);
 	g_return_if_fail(PURPLE_BLIST_NODE_IS_CONTACT(node));
 	message = g_strdup_printf(_("When a file-transfer request arrives from %s"),
 					purple_contact_get_alias((PurpleContact *)node));
 	purple_request_choice(plugin, _("Set Autoaccept Setting"), message,
 						NULL, purple_blist_node_get_int(node, "autoaccept"),
 						_("_Save"), G_CALLBACK(save_cb),
 						_("_Cancel"), NULL,
 }
 static gboolean
 plugin_load(PurplePlugin *plugin)
 {
+	/* migrate the old pref (we should only care if the plugin is actually *used*) */
+	/*
+	 * TODO: We should eventually call purple_prefs_remove(PREFS_STRANGER_OLD)
+	 *       to clean up after ourselves, but we don't want to do it yet
+	 *       so that we don't break users who share a .purple directory
+	 *       between old libpurple clients and new libpurple clients.
+	 *                                             --Mark Doliner, 2011-01-03
+	 */
+	if(purple_prefs_get_bool(PREF_STRANGER_OLD))
+		purple_prefs_set_int(PREF_STRANGER, FT_REJECT);
 	purple_signal_connect(purple_xfers_get_handle(), "file-recv-request", plugin,
 						PURPLE_CALLBACK(file_recv_request_cb), plugin);
 	purple_signal_connect(purple_blist_get_handle(), "blist-node-extended-menu", plugin,
 						PURPLE_CALLBACK(context_menu), plugin);
 	return TRUE;
 	pref = purple_plugin_pref_new_with_name_and_label(PREF_PATH, _("Path to save the files in\n"
 								"(Please provide the full path)"));
 	purple_plugin_pref_frame_add(frame, pref);
 	pref = purple_plugin_pref_new_with_name_and_label(PREF_STRANGER,
-					_("Automatically reject from users not in buddy list"));
+					_("When a file-transfer request arrives from a user who is\n"
+"*not* on your buddy list:"));
+	purple_plugin_pref_set_type(pref, PURPLE_PLUGIN_PREF_CHOICE);
+	purple_plugin_pref_add_choice(pref, _("Ask"), GINT_TO_POINTER(FT_ASK));
+	purple_plugin_pref_add_choice(pref, _("Auto Accept"), GINT_TO_POINTER(FT_ACCEPT));
+	purple_plugin_pref_add_choice(pref, _("Auto Reject"), GINT_TO_POINTER(FT_REJECT));
 	purple_plugin_pref_frame_add(frame, pref);
 	pref = purple_plugin_pref_new_with_name_and_label(PREF_NOTIFY,
 					_("Notify with a popup when an autoaccepted file transfer is complete\n"
 					  "(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);
+	pref = purple_plugin_pref_new_with_name_and_label(PREF_ESCAPE,
+			_("Escape the filenames"));
 	purple_plugin_pref_frame_add(frame, pref);
 	return frame;
 }
 	char *dirname;
 	dirname = g_build_filename(purple_user_dir(), "autoaccept", NULL);
 	purple_prefs_add_none(PREF_PREFIX);
 	purple_prefs_add_string(PREF_PATH, dirname);
-	purple_prefs_add_bool(PREF_STRANGER, TRUE);
+	purple_prefs_add_int(PREF_STRANGER, FT_ASK);
 	purple_prefs_add_bool(PREF_NOTIFY, TRUE);
 	purple_prefs_add_bool(PREF_NEWDIR, TRUE);
+	purple_prefs_add_bool(PREF_ESCAPE, TRUE);
 	g_free(dirname);
 }
 PURPLE_INIT_PLUGIN(PLUGIN_STATIC_NAME, init_plugin, info)

Mercurial > pidgin

comparison libpurple/plugins/autoaccept.c @ 31364:ea2a155b4439