Move src/sip-media-* to tpsip/media-*

11 files changed, 24 insertions, 25 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 345dbbd..1acf418 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -36,12 +36,6 @@ noinst_LTLIBRARIES = libtpsip-convenience.la
 # ----------------------------------------------------------------------
 # Rules for building the targets
 
-signals-marshal.c: ${srcdir}/signals-marshal.list
-	glib-genmarshal --body --prefix=_tpsip_marshal $< >$@ || rm -f $@
-
-signals-marshal.h: ${srcdir}/signals-marshal.list
-	glib-genmarshal --header --prefix=_tpsip_marshal $< >$@ || rm -f $@
-
 # rules for makeing the glib enum objects
 %-enumtypes.h: %.h
 	glib-mkenums \
@@ -68,18 +62,10 @@ sofiasip.manager: write-mgr-file
 	fi
 
 BUILT_SOURCES = \
-		signals-marshal.h \
-		signals-marshal.c \
 		sip-connection-enumtypes.h \
 		sip-connection-enumtypes.c
 
 libtpsip_convenience_la_SOURCES = \
-    sip-media-channel.h \
-    sip-media-channel.c \
-    sip-media-session.h \
-    sip-media-session.c \
-    sip-media-stream.h \
-    sip-media-stream.c \
     sip-connection.h \
     sip-connection.c \
     sip-connection-manager.h \
diff --git a/src/media-factory.c b/src/media-factory.c
index 6f1d9ff..4b6e1c4 100644
--- a/src/media-factory.c
+++ b/src/media-factory.c
@@ -26,7 +26,7 @@
 #include <telepathy-glib/dbus.h>
 #include <telepathy-glib/interfaces.h>
 
-#include "sip-media-channel.h"
+#include "tpsip/media-channel.h"
 #include <tpsip/base-connection.h>
 #include <tpsip/handles.h>
 
diff --git a/src/signals-marshal.list b/src/signals-marshal.list
deleted file mode 100644
index 6cb7431..0000000
--- a/src/signals-marshal.list
+++ /dev/null
@@ -1 +0,0 @@
-VOID:UINT,UINT
diff --git a/tpsip/Makefile.am b/tpsip/Makefile.am
index cf07c99..d291544 100644
--- a/tpsip/Makefile.am
+++ b/tpsip/Makefile.am
@@ -38,6 +38,12 @@ libtpsip_la_SOURCES = \
 	event-target.c \
 	handles.c \
 	debug.c \
+	media-channel.h \
+	media-channel.c \
+	media-session.h \
+	media-session.c \
+	media-stream.h \
+	media-stream.c \
 	text-channel.h \
 	text-channel.c \
 	text-manager.c \
diff --git a/src/sip-media-channel.c b/tpsip/media-channel.c
index 66b3970..4484725 100644
--- a/src/sip-media-channel.c
+++ b/tpsip/media-channel.c
@@ -23,7 +23,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "sip-media-channel.h"
+#include "config.h"
+
+#include "tpsip/media-channel.h"
 
 #include <stdlib.h>
 #include <string.h>
@@ -40,10 +42,9 @@
 #define DEBUG_FLAG TPSIP_DEBUG_MEDIA
 #include "tpsip/debug.h"
 
+#include <tpsip/media-session.h>
 #include <tpsip/base-connection.h>
 
-#include "sip-media-session.h"
-
 #define TPSIP_CHANNEL_CALL_STATE_PROCEEDING_MASK \
     (TP_CHANNEL_CALL_STATE_RINGING | \
      TP_CHANNEL_CALL_STATE_QUEUED | \
diff --git a/src/sip-media-channel.h b/tpsip/media-channel.h
index 9cb28b7..9cb28b7 100644
--- a/src/sip-media-channel.h
+++ b/tpsip/media-channel.h
diff --git a/src/sip-media-session.c b/tpsip/media-session.c
index 3808f53..b63630e 100644
--- a/src/sip-media-session.c
+++ b/tpsip/media-session.c
@@ -23,6 +23,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
+
+#include "tpsip/media-session.h"
+
 #include <dbus/dbus-glib.h>
 #include <stdlib.h>
 #include <time.h>
@@ -40,9 +44,9 @@
 
 #include <tpsip/base-connection.h>
 
-#include "sip-media-session.h"
-#include "sip-media-channel.h"
-#include "sip-media-stream.h"
+#include "tpsip/media-channel.h"
+#include "tpsip/media-stream.h"
+
 #include "signals-marshal.h"
 
 #define DEBUG_FLAG TPSIP_DEBUG_MEDIA
diff --git a/src/sip-media-session.h b/tpsip/media-session.h
index 164c1d2..8553fd6 100644
--- a/src/sip-media-session.h
+++ b/tpsip/media-session.h
@@ -21,7 +21,7 @@
 #ifndef __TPSIP_MEDIA_SESSION_H__
 #define __TPSIP_MEDIA_SESSION_H__
 
-#include "sip-media-stream.h"
+#include <tpsip/media-stream.h>
 
 #include <glib-object.h>
 #include <telepathy-glib/handle.h>
diff --git a/src/sip-media-stream.c b/tpsip/media-stream.c
index f87e502..70170b4 100644
--- a/src/sip-media-stream.c
+++ b/tpsip/media-stream.c
@@ -23,6 +23,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
+#include "tpsip/media-stream.h"
+
 #include <dbus/dbus-glib.h>
 #include <stdlib.h>
 #include <string.h>
@@ -40,8 +43,7 @@
 
 #include <tpsip/codec-param-formats.h>
 
-#include "sip-media-stream.h"
-#include "sip-media-session.h"
+#include "tpsip/media-session.h"
 
 #include <sofia-sip/msg_parser.h>
 
diff --git a/src/sip-media-stream.h b/tpsip/media-stream.h
index f1fc032..f1fc032 100644
--- a/src/sip-media-stream.h
+++ b/tpsip/media-stream.h
diff --git a/tpsip/signals-marshal.list b/tpsip/signals-marshal.list
index 20e25f6..ec706c4 100644
--- a/tpsip/signals-marshal.list
+++ b/tpsip/signals-marshal.list
@@ -1 +1,2 @@
 BOOLEAN:POINTER,POINTER
+VOID:UINT,UINT