From bacfd05fe5355209777c9d468255802859232f0a Mon Sep 17 00:00:00 2001
From: Jouni Malinen <j@w1.fi>
Date: Thu, 31 Dec 2009 21:55:32 +0200
Subject: [PATCH] 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                                            | 4 ++--
 wpa_supplicant/dbus/Makefile                                       | 7 ++++---
 wpa_supplicant/dbus/dbus_common.c                                  | 2 +-
 wpa_supplicant/dbus/{dbus.c => dbus_old.c}                         | 4 ++--
 wpa_supplicant/dbus/{dbus.h => dbus_old.h}                         | 0
 wpa_supplicant/dbus/{dbus_handlers.c => dbus_old_handlers.c}       | 4 ++--
 wpa_supplicant/dbus/{dbus_handlers.h => dbus_old_handlers.h}       | 0
 .../dbus/{dbus_handlers_wps.c => dbus_old_handlers_wps.c}          | 4 ++--
 wpa_supplicant/notify.c                                            | 2 +-
 9 files changed, 14 insertions(+), 13 deletions(-)
 rename wpa_supplicant/dbus/{dbus.c => dbus_old.c} (99%)
 rename wpa_supplicant/dbus/{dbus.h => dbus_old.h} (100%)
 rename wpa_supplicant/dbus/{dbus_handlers.c => dbus_old_handlers.c} (99%)
 rename wpa_supplicant/dbus/{dbus_handlers.h => dbus_old_handlers.h} (100%)
 rename wpa_supplicant/dbus/{dbus_handlers_wps.c => dbus_old_handlers_wps.c} (98%)

diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile
index 5a9cc52..9385485 100644
--- 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 b4f269a..4d7a4d8 100644
--- 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 77319f3..69277ab 100644
--- 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 e171a07..aa0494b 100644
--- 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 4e1ad12..e848f25 100644
--- 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 42bed1c..79dfdab 100644
--- 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 7dd945f..a95ce03 100644
--- 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"
 
-- 
2.1.4