Move slp aka msnp2p stuff to 'cvr' subdir.

Don't ask me why, but it seems cvr is the right name.
felipec · Jan 27, 2008 · 9fd00e0 · 9fd00e0
1 parent 301e675
commit 9fd00e0
Show file tree

Hide file tree

Showing 18 changed files with 29 additions and 25 deletions.
diff --git a/Makefile b/Makefile
@@ -16,11 +16,6 @@ objects = \
 	object.o \
 	page.o \
 	session.o \
-	slp.o \
-	slpcall.o \
-	slplink.o \
-	slpmsg.o \
-	slpsession.o \
 	state.o \
 	switchboard.o \
 	sync.o \
@@ -39,6 +34,11 @@ objects = \
 	io/conn.o \
 	io/cmd_conn.o \
 	io/http_conn.o \
+	cvr/slp.o \
+	cvr/slpcall.o \
+	cvr/slplink.o \
+	cvr/slpmsg.o \
+	cvr/slpsession.o \
 	fix-purple.o
 
 sources = $(patsubst %.o,%.c,$(objects))

diff --git a/ab/user.c b/ab/user.c
@@ -24,7 +24,7 @@
 #include "user_private.h"
 #include "userlist_private.h"
 
-#include "slp.h"
+#include "cvr/slp.h"
 #include "fix-purple.h"
 
 #include <string.h>

diff --git a/slp.c → cvr/slp.c b/slp.c → cvr/slp.c
diff --git a/slp.h → cvr/slp.h b/slp.h → cvr/slp.h
diff --git a/slpcall.c → cvr/slpcall.c b/slpcall.c → cvr/slpcall.c
diff --git a/slpcall.h → cvr/slpcall.h b/slpcall.h → cvr/slpcall.h
diff --git a/slplink.c → cvr/slplink.c b/slplink.c → cvr/slplink.c
diff --git a/slplink.h → cvr/slplink.h b/slplink.h → cvr/slplink.h
@@ -34,10 +34,11 @@ struct MsnSlpSession;
 
 struct _PurpleXfer;
 
-#include <slpcall.h>
-#include <object.h>
 #include <glib.h>
 
+#include "slpcall.h"
+#include "object.h"
+
 typedef void (*MsnSlpCb) (MsnSlpCall *slpcall, const guchar *data, gsize size);
 typedef void (*MsnSlpEndCb) (MsnSlpCall *slpcall, struct MsnSession *session);
 

diff --git a/slpmsg.c → cvr/slpmsg.c b/slpmsg.c → cvr/slpmsg.c
diff --git a/slpmsg.h → cvr/slpmsg.h b/slpmsg.h → cvr/slpmsg.h
diff --git a/slpsession.c → cvr/slpsession.c b/slpsession.c → cvr/slpsession.c
diff --git a/slpsession.h → cvr/slpsession.h b/slpsession.h → cvr/slpsession.h
diff --git a/directconn.c b/directconn.c
@@ -25,8 +25,8 @@
 #include "msn_log.h"
 
 #include "session.h"
-#include "slp.h"
-#include "slpmsg.h"
+#include "cvr/slp.h"
+#include "cvr/slpmsg.h"
 
 #include "io/conn.h"
 

diff --git a/directconn.h b/directconn.h
@@ -25,8 +25,8 @@
 
 typedef struct MsnDirectConn MsnDirectConn;
 
-#include "slplink.h"
-#include "slp.h"
+#include "cvr/slplink.h"
+#include "cvr/slp.h"
 
 #include "cmd/msg.h"
 

diff --git a/msn.c b/msn.c
@@ -25,34 +25,35 @@
 #include <glib.h>
 
 #include "msn.h"
-#include "accountopt.h"
 #include "page.h"
-#include "pluginpref.h"
-#include "prefs.h"
 #include "session.h"
 #include "state.h"
-#include "util.h"
-#include "cmds.h"
-#include "core.h"
-#include "prpl.h"
 #include "msn_util.h"
-#include "version.h"
 
 #include "switchboard.h"
 #include "notification.h"
 #include "sync.h"
-#include "slplink.h"
 
 #include "session_private.h"
 
 #include "cmd/msg.h"
 
 #include "ab/user_private.h"
 
+#include "cvr/slplink.h"
+
 /* libpurple stuff. */
 #include <debug.h>
 #include <privacy.h>
 #include <request.h>
+#include <accountopt.h>
+#include <pluginpref.h>
+#include <cmds.h>
+#include <version.h>
+#include <core.h>
+#include <prpl.h>
+#include <util.h>
+#include <prefs.h>
 #include "internal.h"
 
 #if PHOTO_SUPPORT

diff --git a/notification.c b/notification.c
@@ -25,6 +25,7 @@
 #include "sync.h"
 #include "nexus.h"
 
+#include "session.h"
 #include "session_private.h"
 
 #include "cmd/cmdproc_private.h"
@@ -41,10 +42,10 @@
 #include "io/conn_private.h"
 #include "io/cmd_conn_private.h"
 
-#include "session.h"
+#include "cvr/slplink.h" /* for slplink_destroy */
+
 #include "error.h" /* for error_get_text */
 #include "msn_util.h" /* for parse_socket */
-#include "slplink.h" /* for slplink_destroy */
 
 #include "msn_intl.h"
 

diff --git a/session.c b/session.c
@@ -25,7 +25,8 @@
 #include "notification.h"
 #include "fix-purple.h"
 
-#include "slplink.h"
+#include "cvr/slplink.h"
+
 #include "sync.h"
 #include "nexus.h"
 

diff --git a/switchboard.c b/switchboard.c
@@ -24,7 +24,7 @@
 #include "session.h"
 #include "switchboard.h"
 #include "notification.h"
-#include "slplink.h"
+#include "cvr/slplink.h"
 
 #include "session_private.h"