summaryrefslogtreecommitdiff
path: root/include/asterisk
diff options
context:
space:
mode:
authorMatt O'Gorman <mogorman@digium.com>2006-09-21 23:55:13 +0000
committerMatt O'Gorman <mogorman@digium.com>2006-09-21 23:55:13 +0000
commit08368f00ab4e5b52c4b67bc0052d74cb0a6e2118 (patch)
tree3d9f2d9d4a82594051b05130d2aa126de6a04d17 /include/asterisk
parent859bc68383b66088d4b044017a7cde73ac09b1a3 (diff)
Merged revisions 43466 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r43466 | mogorman | 2006-09-21 18:50:56 -0500 (Thu, 21 Sep 2006) | 2 lines updates for better compontent support ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43467 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include/asterisk')
-rw-r--r--include/asterisk/jabber.h7
1 files changed, 1 insertions, 6 deletions
diff --git a/include/asterisk/jabber.h b/include/asterisk/jabber.h
index f4ea1c55a..ccad068e5 100644
--- a/include/asterisk/jabber.h
+++ b/include/asterisk/jabber.h
@@ -40,11 +40,6 @@ enum aji_btype {
AJI_UTRANS=2
};
-enum aji_type {
- AJI_COMPONENT,
- AJI_CLIENT,
-};
-
struct aji_version {
char version[50];
int jingle;
@@ -120,7 +115,7 @@ struct aji_client {
int message_timeout;
int authorized;
unsigned int flags;
- enum aji_type component;
+ int component; /* 0 client, 1 component */
struct aji_buddy_container buddies;
AST_LIST_HEAD(messages,aji_message) messages;
void *jingle;