[asterisk-scf-commits] asterisk-scf/integration/sip.git branch "master" updated.

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  ced04471c97606702e42079c429e2fe777117b2a (commit)
      from  ce5b7989275947ff1fa15a83155297afa4519a2e (commit)

Summary of changes:
 local-slice/CMakeLists.txt         |    3 ++-
 local-slice/SipConfigurationIf.ice |   15 ++++++---------
 2 files changed, 8 insertions(+), 10 deletions(-)


- Log -----------------------------------------------------------------
commit ced04471c97606702e42079c429e2fe777117b2a
Author: Mark Michelson <mmichelson at digium.com>
Date:   Wed Sep 1 16:49:19 2010 -0500

    Add SipConfigurationIf.ice to cmake and fix syntax errors in the slice.

diff --git a/local-slice/CMakeLists.txt b/local-slice/CMakeLists.txt
index 4f986a0..8c9d223 100644
--- a/local-slice/CMakeLists.txt
+++ b/local-slice/CMakeLists.txt
@@ -1,2 +1,3 @@
 # Compile SIP Channel Service Component's own slice
-hydra_compile_slice(SipIf.ice lib "SIP Service Slice Types" SipChannelService)
\ No newline at end of file
+hydra_compile_slice(SipIf.ice lib "SIP Service Slice Types" SipChannelService)
+hydra_compile_slice(SipConfigurationIf.ice lib "SIP Configuration Slice Types" SipChannelService)
diff --git a/local-slice/SipConfigurationIf.ice b/local-slice/SipConfigurationIf.ice
index d4a102b..706a3bf 100644
--- a/local-slice/SipConfigurationIf.ice
+++ b/local-slice/SipConfigurationIf.ice
@@ -105,7 +105,7 @@ module V1
 		// On inbound registrations, the smallest
 		// expiration we allow.
 		int inboundMinExpiry;
-	}
+	};
 
 	/**
 	 * Session options. Deals with INVITE sessions,
@@ -135,7 +135,7 @@ module V1
 	class SipEndpointMediaConfig
 	{
 		CodecSeq allowedCodecs;
-	}
+	};
 
 	enum SubscriptionRole
 	{
@@ -143,15 +143,12 @@ module V1
 		NOTIFIER,
 		EVENTPUBLICATIONAGENT,
 		EVENTSTATECOMPOSITOR
-	}
+	};
 	/**
 	 * Subscription options. Deals with options
-	 * for subscriptions. This is an interface
-	 * rather than a class because each event
-	 * package will have its own event-specific
-	 * data to keep up with.
+	 * for subscriptions
 	 */
-	interface SipEndpointSubscriptionConfig
+	class SipEndpointSubscriptionConfig
 	{
 		// The role Asterisk SCF plays in the
 		// subscription.
@@ -168,7 +165,7 @@ module V1
 		// The name of the event package, as would
 		// appear in the Event header of SIP messages.
 		string eventPackage;
-	}
+	};
 }; //module V1
 }; //module SIP
 }; //module Hydra

-----------------------------------------------------------------------


-- 
asterisk-scf/integration/sip.git