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.

diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile
index 5a9cc522ce9779d84d8c85d844e0c89e5e8bf342..9385485ff0dfcbc8cf24060f52068c258a03cd73 100644 (file)
--- a/wpa_supplicant/Makefile
+++ b/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

diff --git a/wpa_supplicant/dbus/Makefile b/wpa_supplicant/dbus/Makefile
index b4f269abccdd145f62366a5487f2b97e57963fce..4d7a4d8e45bf8baa8d76ce749e569967643f2419 100644 (file)
--- a/wpa_supplicant/dbus/Makefile
+++ b/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
 

diff --git a/wpa_supplicant/dbus/dbus_common.c b/wpa_supplicant/dbus/dbus_common.c
index 77319f30c7bfa21067d5dde41d95d79a497f9bb9..69277ab0ad21aa323cf4a7d407c51ed3d303235a 100644 (file)
--- a/wpa_supplicant/dbus/dbus_common.c
+++ b/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"
 
 
 /**

diff --git a/wpa_supplicant/dbus/dbus.c b/wpa_supplicant/dbus/dbus_old.c
similarity index 99%
rename from wpa_supplicant/dbus/dbus.c
rename to wpa_supplicant/dbus/dbus_old.c
index e171a074b003534860b73b8fc059258fd8f38695..aa0494b79ac54fe36f6b4bbb5b20f300ecf9c7ba 100644 (file)
--- a/wpa_supplicant/dbus/dbus.c
+++ b/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"
 

diff --git a/wpa_supplicant/dbus/dbus.h b/wpa_supplicant/dbus/dbus_old.h
similarity index 100%
rename from wpa_supplicant/dbus/dbus.h
rename to wpa_supplicant/dbus/dbus_old.h

diff --git a/wpa_supplicant/dbus/dbus_handlers.c b/wpa_supplicant/dbus/dbus_old_handlers.c
similarity index 99%
rename from wpa_supplicant/dbus/dbus_handlers.c
rename to wpa_supplicant/dbus/dbus_old_handlers.c
index 4e1ad123d0d610fe374d57847f50d5f9a40d336b..e848f25cd7075ce15c7dc873a9c462ba62187f12 100644 (file)
--- a/wpa_supplicant/dbus/dbus_handlers.c
+++ b/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;

diff --git a/wpa_supplicant/dbus/dbus_handlers.h b/wpa_supplicant/dbus/dbus_old_handlers.h
similarity index 100%
rename from wpa_supplicant/dbus/dbus_handlers.h
rename to wpa_supplicant/dbus/dbus_old_handlers.h

diff --git a/wpa_supplicant/dbus/dbus_handlers_wps.c b/wpa_supplicant/dbus/dbus_old_handlers_wps.c
similarity index 98%
rename from wpa_supplicant/dbus/dbus_handlers_wps.c
rename to wpa_supplicant/dbus/dbus_old_handlers_wps.c
index 42bed1cc7f27df10cb4b58e83081e516bf5ce1ab..79dfdab20abce238280f4c47b560901295cc7f8a 100644 (file)
--- a/wpa_supplicant/dbus/dbus_handlers_wps.c
+++ b/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

diff --git a/wpa_supplicant/notify.c b/wpa_supplicant/notify.c
index 7dd945f07a81853973c7a1d0b45ee3cba2d3e458..a95ce03157cc6abf4ac64d40e7838e2ae5648e1b 100644 (file)
--- a/wpa_supplicant/notify.c
+++ b/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"