diff options
| author | Pekka Pessi <Pekka.Pessi@nokia.com> | 2011-02-07 20:36:44 +0200 |
|---|---|---|
| committer | Pekka Pessi <Pekka.Pessi@nokia.com> | 2011-02-07 22:00:57 +0200 |
| commit | 674e943231bf519168f59769b4f135c8ae8cd255 (patch) | |
| tree | 6dd075df38171894443ed8a064303ddee30c83f5 | |
| parent | 331154bb38f00852103bfcf5c95320ee1305f50f (diff) | |
Move src/sip-text-channel to tpsip/text-channel
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | tpsip/Makefile.am | 2 | ||||
| -rw-r--r-- | tpsip/text-channel.c (renamed from src/sip-text-channel.c) | 8 | ||||
| -rw-r--r-- | tpsip/text-channel.h (renamed from src/sip-text-channel.h) | 0 |
4 files changed, 7 insertions, 5 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 0ec9a9d..62ad84f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -74,8 +74,6 @@ BUILT_SOURCES = \ sip-connection-enumtypes.c libtpsip_convenience_la_SOURCES = \ - sip-text-channel.h \ - sip-text-channel.c \ sip-media-channel.h \ sip-media-channel.c \ sip-media-session.h \ diff --git a/tpsip/Makefile.am b/tpsip/Makefile.am index 98ef29d..f12ea1a 100644 --- a/tpsip/Makefile.am +++ b/tpsip/Makefile.am @@ -37,6 +37,8 @@ libtpsip_la_SOURCES = \ event-target.c \ handles.c \ debug.c \ + text-channel.h \ + text-channel.c \ util.c nodist_libtpsip_la_SOURCES = \ diff --git a/src/sip-text-channel.c b/tpsip/text-channel.c index f55f597..131f6ba 100644 --- a/src/sip-text-channel.c +++ b/tpsip/text-channel.c @@ -23,7 +23,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "sip-text-channel.h" +#include "config.h" + +#include "tpsip/text-channel.h" #include <stdlib.h> #include <string.h> @@ -38,8 +40,8 @@ #include <telepathy-glib/svc-channel.h> #include <telepathy-glib/svc-generic.h> -#include <tpsip/event-target.h> -#include <tpsip/base-connection.h> +#include "tpsip/event-target.h" +#include "tpsip/base-connection.h" #include <sofia-sip/sip_protos.h> #include <sofia-sip/sip_status.h> diff --git a/src/sip-text-channel.h b/tpsip/text-channel.h index 4be5d51..4be5d51 100644 --- a/src/sip-text-channel.h +++ b/tpsip/text-channel.h |