dbus: Rename old D-Bus API files to include "_old"

This makes it easier to figure out which file is used by which
D-Bus interface.

wpa_supplicant/Makefile

@@ -1042,9 +1042,9 @@ endif
 ifdef CONFIG_CTRL_IFACE_DBUS
 DBUS=y
 DBUS_CFLAGS += -DCONFIG_CTRL_IFACE_DBUS -DDBUS_API_SUBJECT_TO_CHANGE
-DBUS_OBJS += dbus/dbus.o dbus/dbus_handlers.o
+DBUS_OBJS += dbus/dbus_old.o dbus/dbus_old_handlers.o
 ifdef CONFIG_WPS
-DBUS_OBJS += dbus/dbus_handlers_wps.o
+DBUS_OBJS += dbus/dbus_old_handlers_wps.o
 endif
 DBUS_OBJS += dbus/dbus_dict_helpers.o
 ifndef DBUS_LIBS

wpa_supplicant/dbus/Makefile

@@ -64,15 +64,16 @@ DBUS_INCLUDE += -DDBUS_VERSION_MINOR=$(DBUS_VERSION_MINOR)
 CFLAGS += $(DBUS_INCLUDE)
 
 LIB_OBJS= \
-	dbus.o \
-	dbus_handlers.o \
+	dbus_common.o \
+	dbus_old.o \
+	dbus_old_handlers.o \
 	dbus_new.o \
 	dbus_new_handlers.o \
 	dbus_new_helpers.o \
 	dbus_dict_helpers.o
 
 ifdef CONFIG_WPS
-LIB_OBJS += dbus_handlers_wps.o
+LIB_OBJS += dbus_old_handlers_wps.o
 LIB_OBJS += dbus_new_handlers_wps.o
 endif
 

wpa_supplicant/dbus/dbus_common.c

@@ -22,7 +22,7 @@
 #include "dbus_common.h"
 #include "dbus_common_i.h"
 #include "dbus_new.h"
-#include "dbus.h"
+#include "dbus_old.h"
 
 
 /**

wpa_supplicant/dbus/dbus.c → wpa_supplicant/dbus/dbus_old.c

@@ -20,8 +20,8 @@
 #include "wps/wps.h"
 #include "../config.h"
 #include "../wpa_supplicant_i.h"
-#include "dbus.h"
-#include "dbus_handlers.h"
+#include "dbus_old.h"
+#include "dbus_old_handlers.h"
 #include "dbus_common.h"
 #include "dbus_common_i.h"
 

wpa_supplicant/dbus/dbus_handlers.c → wpa_supplicant/dbus/dbus_old_handlers.c

@@ -24,8 +24,8 @@
 #include "../driver_i.h"
 #include "../notify.h"
 #include "../wpas_glue.h"
-#include "dbus.h"
-#include "dbus_handlers.h"
+#include "dbus_old.h"
+#include "dbus_old_handlers.h"
 #include "dbus_dict_helpers.h"
 
 extern int wpa_debug_level;

wpa_supplicant/dbus/dbus_handlers_wps.c → wpa_supplicant/dbus/dbus_old_handlers_wps.c

@@ -18,8 +18,8 @@
 #include "../config.h"
 #include "../wpa_supplicant_i.h"
 #include "../wps_supplicant.h"
-#include "dbus.h"
-#include "dbus_handlers.h"
+#include "dbus_old.h"
+#include "dbus_old_handlers.h"
 
 /**
  * wpas_dbus_iface_wps_pbc - Request credentials using WPS PBC method

wpa_supplicant/notify.c

@@ -20,7 +20,7 @@
 #include "wpa_supplicant_i.h"
 #include "wps_supplicant.h"
 #include "dbus/dbus_common.h"
-#include "dbus/dbus.h"
+#include "dbus/dbus_old.h"
 #include "dbus/dbus_new.h"
 #include "notify.h"