Mercurial > pidgin3 / changeset

--- a/libpurple/plugins/filectl.c	Mon Nov 27 20:55:41 2017 -0600
+++ b/libpurple/plugins/filectl.c	Thu Dec 07 21:06:54 2017 -0600
@@ -86,27 +86,6 @@
 			free(arg1);
 			free(arg2);
 
-/* purple_find_conversation() is gone in 2.0.0. */
-#if 0
-		} else if (!g_ascii_strncasecmp(command, "send", 4)) {
-			PurpleConversation *conv;
-
-			arg1 = getarg(buffer, 1, 0);
-			arg2 = getarg(buffer, 2, 1);
-
-			conv = purple_find_conversation(PURPLE_CONV_TYPE_ANY, arg1);
-			if (conv != NULL)
-			{
-				/*
-				purple_conversation_write(conv, arg2, WFLAG_SEND, NULL, time(NULL), -1);
-				purple_serv_send_im(conv->gc, arg1, arg2, 0);
-				*/
-			}
-
-			free(arg1);
-			free(arg2);
-#endif
-
 		} else if (!g_ascii_strncasecmp(command, "away", 4)) {
 			arg1 = getarg(buffer, 1, 1);
 			/* serv_set_away_all(arg1); */

--- a/libpurple/plugins/log_reader.c	Mon Nov 27 20:55:41 2017 -0600
+++ b/libpurple/plugins/log_reader.c	Thu Dec 07 21:06:54 2017 -0600
@@ -2444,35 +2444,6 @@
 	if (path) {
 		/* Read talk.ini file to find the log directory. */
 		GError *error = NULL;
-
-#if 0 /* FIXME: Not tested yet. */
-		GKeyFile *key_file;
-
-		purple_debug_info("Trillian talk.ini read", "Reading %s\n", path);
-
-		error = NULL;
-		if (!g_key_file_load_from_file(key_file, path, G_KEY_FILE_NONE, GError &error)) {
-			purple_debug_error("Trillian talk.ini read",
-			                   "Error reading talk.ini\n");
-			if (error)
-				g_error_free(error);
-		} else {
-			char *logdir = g_key_file_get_string(key_file, "Logging", "Directory", &error);
-			if (error) {
-				purple_debug_error("Trillian talk.ini read",
-				                   "Error reading Directory value from Logging section\n");
-				g_error_free(error);
-			}
-
-			if (logdir) {
-				g_strchomp(logdir);
-				purple_prefs_add_string("/plugins/core/log_reader/trillian/log_directory", logdir);
-				found = TRUE;
-			}
-
-			g_key_file_free(key_file);
-		}
-#else
 		gchar *contents = NULL;
 
 		if (g_file_test(path, G_FILE_TEST_IS_REGULAR)) {
@@ -2514,7 +2485,6 @@
 			g_free(contents);
 		}
 		g_free(path);
-#endif
 	} /* path */
 
 	if (!found) {