xmlrpc: Rename files

https://bugzilla.gnome.org/show_bug.cgi?id=746495

7 files changed, 24 insertions, 24 deletions

diff --git a/libsoup/Makefile.am b/libsoup/Makefile.am
index 48cf1097..5c51e251 100644
--- a/libsoup/Makefile.am
+++ b/libsoup/Makefile.am
@@ -72,7 +72,7 @@ soup_headers =			\
 	soup-value-utils.h	\
 	soup-websocket.h	\
 	soup-websocket-connection.h	\
-	soup-xmlrpc.h
+	soup-xmlrpc-old.h
 
 libsoupinclude_HEADERS =	\
 	$(soup_headers)		\
@@ -194,7 +194,7 @@ libsoup_2_4_la_SOURCES =		\
 	soup-version.c			\
 	soup-websocket.c		\
 	soup-websocket-connection.c	\
-	soup-xmlrpc.c
+	soup-xmlrpc-old.c
 
 # TLD rules
 EXTRA_DIST += tld-parser.py
diff --git a/libsoup/soup-xmlrpc.c b/libsoup/soup-xmlrpc-old.c
index e428c2e9..df80985d 100644
--- a/libsoup/soup-xmlrpc.c
+++ b/libsoup/soup-xmlrpc-old.c
@@ -13,7 +13,7 @@
 
 #include <libxml/tree.h>
 
-#include "soup-xmlrpc.h"
+#include "soup-xmlrpc-old.h"
 #include "soup.h"
 
 /**
diff --git a/libsoup/soup-xmlrpc.h b/libsoup/soup-xmlrpc-old.h
index d25e3804..f96deec7 100644
--- a/libsoup/soup-xmlrpc.h
+++ b/libsoup/soup-xmlrpc-old.h
@@ -3,8 +3,8 @@
  * Copyright (C) 2007 Red Hat, Inc.
  */
 
-#ifndef SOUP_XMLRPC_H
-#define SOUP_XMLRPC_H 1
+#ifndef SOUP_XMLRPC_OLD_H
+#define SOUP_XMLRPC_OLD_H 1
 
 #include <libsoup/soup-types.h>
 
@@ -76,4 +76,4 @@ typedef enum {
 
 G_END_DECLS
 
-#endif /* SOUP_XMLRPC_H */
+#endif /* SOUP_XMLRPC_OLD_H */
diff --git a/libsoup/soup.h b/libsoup/soup.h
index 7106cc5e..8790b172 100644
--- a/libsoup/soup.h
+++ b/libsoup/soup.h
@@ -52,7 +52,7 @@ extern "C" {
 #include <libsoup/soup-version.h>
 #include <libsoup/soup-websocket.h>
 #include <libsoup/soup-websocket-connection.h>
-#include <libsoup/soup-xmlrpc.h>
+#include <libsoup/soup-xmlrpc-old.h>
 
 #ifdef __cplusplus
 }
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 662ab79d..f2f9f0c4 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -42,8 +42,8 @@ test_programs =			\
 	tld-test		\
 	uri-parsing		\
 	websocket-test		\
-	xmlrpc-server-test	\
-	xmlrpc-test
+	xmlrpc-old-server-test	\
+	xmlrpc-old-test
 
 test_extra_programs =		\
 	ntlm-test-helper	\
diff --git a/tests/xmlrpc-server-test.c b/tests/xmlrpc-old-server-test.c
index bd8341de..eb73f570 100644
--- a/tests/xmlrpc-server-test.c
+++ b/tests/xmlrpc-old-server-test.c
@@ -246,7 +246,7 @@ run_xmlrpc_test (char **argv,
 	gboolean ok;
 	int status;
 
-	argv[0] = g_test_build_filename (G_TEST_BUILT, "xmlrpc-test", NULL);
+	argv[0] = g_test_build_filename (G_TEST_BUILT, "xmlrpc-old-test", NULL);
 	ok = g_spawn_sync (NULL, argv, NULL, 0, NULL, NULL,
 			   stdout_out, stderr_out, &status,
 			   error);
@@ -334,7 +334,7 @@ main (int argc, char **argv)
 		list_argv[3] = NULL;
 
 		if (!run_xmlrpc_test (list_argv, &out, NULL, &error)) {
-			g_printerr ("'xmlrpc-test -l' failed: %s\n", error->message);
+			g_printerr ("'xmlrpc-old-test -l' failed: %s\n", error->message);
 			g_error_free (error);
 			return 1;
 		}
@@ -343,8 +343,8 @@ main (int argc, char **argv)
 		g_free (out);
 
 		for (i = 0; tests[i] && *tests[i]; i++) {
-			g_assert_true (g_str_has_prefix (tests[i], "/xmlrpc/"));
-			path = g_strdup_printf ("/xmlrpc-server/%s", tests[i] + strlen ("/xmlrpc/"));
+			g_assert_true (g_str_has_prefix (tests[i], "/xmlrpc-old/"));
+			path = g_strdup_printf ("/xmlrpc-old-server/%s", tests[i] + strlen ("/xmlrpc-old/"));
 			g_test_add_data_func (path, tests[i], do_one_xmlrpc_test);
 			g_free (path);
 		}
diff --git a/tests/xmlrpc-test.c b/tests/xmlrpc-old-test.c
index cf9cb917..d6ecd051 100644
--- a/tests/xmlrpc-test.c
+++ b/tests/xmlrpc-old-test.c
@@ -475,7 +475,7 @@ static GOptionEntry xmlrpc_entries[] = {
         { "uri", 'U', 0, G_OPTION_ARG_STRING, &uri,
           "Alternate URI for server", NULL },
         { "server-test", 'S', 0, G_OPTION_ARG_NONE, &server_test,
-          "If this is being run from xmlrpc-server-test", NULL },
+          "If this is being run from xmlrpc-old-server-test", NULL },
         { NULL }
 };
 
@@ -493,16 +493,16 @@ main (int argc, char **argv)
 
 	session = soup_test_session_new (SOUP_TYPE_SESSION_SYNC, NULL);
 
-	g_test_add_func ("/xmlrpc/sum", test_sum);
-	g_test_add_func ("/xmlrpc/countBools", test_countBools);
-	g_test_add_func ("/xmlrpc/md5sum", test_md5sum);
-	g_test_add_func ("/xmlrpc/dateChange", test_dateChange);
-	g_test_add_func ("/xmlrpc/echo", test_echo);
-	g_test_add_data_func ("/xmlrpc/ping/empty-params", GINT_TO_POINTER (TRUE), test_ping);
-	g_test_add_data_func ("/xmlrpc/ping/no-params", GINT_TO_POINTER (FALSE), test_ping);
-	g_test_add_func ("/xmlrpc/fault/malformed", test_fault_malformed);
-	g_test_add_func ("/xmlrpc/fault/method", test_fault_method);
-	g_test_add_func ("/xmlrpc/fault/args", test_fault_args);
+	g_test_add_func ("/xmlrpc-old/sum", test_sum);
+	g_test_add_func ("/xmlrpc-old/countBools", test_countBools);
+	g_test_add_func ("/xmlrpc-old/md5sum", test_md5sum);
+	g_test_add_func ("/xmlrpc-old/dateChange", test_dateChange);
+	g_test_add_func ("/xmlrpc-old/echo", test_echo);
+	g_test_add_data_func ("/xmlrpc-old/ping/empty-params", GINT_TO_POINTER (TRUE), test_ping);
+	g_test_add_data_func ("/xmlrpc-old/ping/no-params", GINT_TO_POINTER (FALSE), test_ping);
+	g_test_add_func ("/xmlrpc-old/fault/malformed", test_fault_malformed);
+	g_test_add_func ("/xmlrpc-old/fault/method", test_fault_method);
+	g_test_add_func ("/xmlrpc-old/fault/args", test_fault_args);
 
 	ret = g_test_run ();