[Freeswitch-branches] [commit] r5430 - in freeswitch/branches/greenlizard: src/mod/endpoints/mod_dingaling src/mod/endpoints/mod_iax src/mod/endpoints/mod_portaudio src/mod/endpoints/mod_woomera w32/Setup

Freeswitch SVN greenlizard at freeswitch.org
Wed Jun 20 14:59:06 EDT 2007


Author: greenlizard
Date: Wed Jun 20 14:59:05 2007
New Revision: 5430

Modified:
   freeswitch/branches/greenlizard/src/mod/endpoints/mod_dingaling/mod_dingaling.c
   freeswitch/branches/greenlizard/src/mod/endpoints/mod_iax/mod_iax.c
   freeswitch/branches/greenlizard/src/mod/endpoints/mod_portaudio/mod_portaudio.c
   freeswitch/branches/greenlizard/src/mod/endpoints/mod_woomera/mod_woomera.c
   freeswitch/branches/greenlizard/w32/Setup/Setup.vdproj

Log:
merge trunk 5427 to 5429

Modified: freeswitch/branches/greenlizard/src/mod/endpoints/mod_dingaling/mod_dingaling.c
==============================================================================
--- freeswitch/branches/greenlizard/src/mod/endpoints/mod_dingaling/mod_dingaling.c	(original)
+++ freeswitch/branches/greenlizard/src/mod/endpoints/mod_dingaling/mod_dingaling.c	Wed Jun 20 14:59:05 2007
@@ -1817,7 +1817,7 @@
 	/* connect my internal structure to the blank pointer passed to me */
 	*module_interface = switch_loadable_module_create_module_interface(pool, modname);
 	channel_endpoint_interface = switch_loadable_module_create_interface(*module_interface, SWITCH_ENDPOINT_INTERFACE);
-	channel_endpoint_interface->interface_name = modname;
+	channel_endpoint_interface->interface_name = "digngaling";
 	channel_endpoint_interface->io_routines = &channel_io_routines;
 	channel_endpoint_interface->state_handler = &channel_event_handlers;
 

Modified: freeswitch/branches/greenlizard/src/mod/endpoints/mod_iax/mod_iax.c
==============================================================================
--- freeswitch/branches/greenlizard/src/mod/endpoints/mod_iax/mod_iax.c	(original)
+++ freeswitch/branches/greenlizard/src/mod/endpoints/mod_iax/mod_iax.c	Wed Jun 20 14:59:05 2007
@@ -868,7 +868,7 @@
 
 	*module_interface = switch_loadable_module_create_module_interface(pool, modname);
 	channel_endpoint_interface = switch_loadable_module_create_interface(*module_interface, SWITCH_ENDPOINT_INTERFACE);
-	channel_endpoint_interface->interface_name = modname;
+	channel_endpoint_interface->interface_name = "iax";
 	channel_endpoint_interface->io_routines = &channel_io_routines;
 	channel_endpoint_interface->state_handler = &channel_state_handlers;
 

Modified: freeswitch/branches/greenlizard/src/mod/endpoints/mod_portaudio/mod_portaudio.c
==============================================================================
--- freeswitch/branches/greenlizard/src/mod/endpoints/mod_portaudio/mod_portaudio.c	(original)
+++ freeswitch/branches/greenlizard/src/mod/endpoints/mod_portaudio/mod_portaudio.c	Wed Jun 20 14:59:05 2007
@@ -852,7 +852,7 @@
 	/* connect my internal structure to the blank pointer passed to me */
 	*module_interface = switch_loadable_module_create_module_interface(pool, modname);
 	channel_endpoint_interface = switch_loadable_module_create_interface(*module_interface, SWITCH_ENDPOINT_INTERFACE);
-	channel_endpoint_interface->interface_name = modname;
+	channel_endpoint_interface->interface_name = "portaudio";
 	channel_endpoint_interface->io_routines = &channel_io_routines;
 	channel_endpoint_interface->state_handler = &channel_event_handlers;
 

Modified: freeswitch/branches/greenlizard/src/mod/endpoints/mod_woomera/mod_woomera.c
==============================================================================
--- freeswitch/branches/greenlizard/src/mod/endpoints/mod_woomera/mod_woomera.c	(original)
+++ freeswitch/branches/greenlizard/src/mod/endpoints/mod_woomera/mod_woomera.c	Wed Jun 20 14:59:05 2007
@@ -1353,7 +1353,7 @@
 	/* connect my internal structure to the blank pointer passed to me */
 	*module_interface = switch_loadable_module_create_module_interface(pool, modname);
 	woomera_endpoint_interface = switch_loadable_module_create_interface(*module_interface, SWITCH_ENDPOINT_INTERFACE);
-	woomera_endpoint_interface->interface_name = modname;
+	woomera_endpoint_interface->interface_name = "woomera";
 	woomera_endpoint_interface->io_routines = &woomera_io_routines;
 	woomera_endpoint_interface->state_handler = &woomera_event_handlers;
 

Modified: freeswitch/branches/greenlizard/w32/Setup/Setup.vdproj
==============================================================================
--- freeswitch/branches/greenlizard/w32/Setup/Setup.vdproj	(original)
+++ freeswitch/branches/greenlizard/w32/Setup/Setup.vdproj	Wed Jun 20 14:59:05 2007
@@ -15,12 +15,6 @@
     {
         "Entry"
         {
-        "MsmKey" = "8:_0A2A2813738E4157B2CC6A4EF2A303BB"
-        "OwnerKey" = "8:_UNDEFINED"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
         "MsmKey" = "8:_0F091427EEA0245FBA87474748D35ABD"
         "OwnerKey" = "8:_4A285D260C3748A4BEFA6E5A9004D128"
         "MsmSig" = "8:_UNDEFINED"
@@ -45,199 +39,199 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D"
+        "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2"
         "OwnerKey" = "8:_1CFB1AB04E024FC993E0EB4859DF8408"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D"
+        "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2"
         "OwnerKey" = "8:_FBB0E565B1DE49CE9C827ACAC337AC5B"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D"
+        "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2"
         "OwnerKey" = "8:_FB1B9FBDC3294F1C96DAC4246C013C22"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D"
+        "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2"
         "OwnerKey" = "8:_F84240319757424DB1C58AD0AD420127"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D"
+        "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2"
         "OwnerKey" = "8:_F0B800E719294692A02518CFD8CBAEFF"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D"
+        "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2"
         "OwnerKey" = "8:_EF14CB99F3414BB689D0CB0E6D6B8AB8"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D"
+        "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2"
         "OwnerKey" = "8:_E763C699DF0948B6984DDEB96A2DFD06"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D"
+        "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2"
         "OwnerKey" = "8:_D7EC5795A9C645AC8E129C2EE6D461ED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D"
+        "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2"
         "OwnerKey" = "8:_D6F0F5845FAD4707975CE012A33CD607"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D"
+        "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2"
         "OwnerKey" = "8:_D2EF447106B24E67907DAED3D39CFBB1"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D"
+        "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2"
         "OwnerKey" = "8:_D1269F1E49D442CF8EAC96C23E60325D"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D"
+        "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2"
         "OwnerKey" = "8:_D0BB09AFB8D94B76918F0EE85BCCAD0A"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D"
+        "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2"
         "OwnerKey" = "8:_C81AC700C1BC4A55B98DF12C0CBAFD6F"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D"
+        "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2"
         "OwnerKey" = "8:_C105055EE271471A999CE7022E617EB7"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D"
+        "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2"
         "OwnerKey" = "8:_B20769E090034897B32E3EA4EC1BA8A0"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D"
+        "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2"
         "OwnerKey" = "8:_B0A2E9B4C45D4098AFD734D0C4E3EAFB"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D"
+        "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2"
         "OwnerKey" = "8:_AD2EB44FE6D548F2A8DA4F9F2CE817AC"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D"
+        "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2"
         "OwnerKey" = "8:_A0D5F714A0F94250A1C39603B699AB82"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D"
+        "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2"
         "OwnerKey" = "8:_87768631363249B2B301143C193612F7"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D"
+        "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2"
         "OwnerKey" = "8:_83C1B93AD71B4F8F9E074F9607B60DF1"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D"
+        "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2"
         "OwnerKey" = "8:_7358123D2D064AD1BC517911A8B23D1B"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D"
+        "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2"
         "OwnerKey" = "8:_6E5C001E7A314DCEA0A4BF52BF74BCAD"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D"
+        "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2"
         "OwnerKey" = "8:_684D96FA2BDD46909367E651099D8C4E"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D"
+        "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2"
         "OwnerKey" = "8:_5A636BB90F7F4B86ACB8839EA2C899AA"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D"
+        "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2"
         "OwnerKey" = "8:_59CFED0C4EC0492C945E4EBC04FE965F"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D"
+        "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2"
         "OwnerKey" = "8:_4A285D260C3748A4BEFA6E5A9004D128"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D"
+        "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2"
         "OwnerKey" = "8:_3FBEFE0119944C6781F81104ECEF37CA"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D"
+        "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2"
         "OwnerKey" = "8:_3E37631016BC45B2B672FE23257D542B"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D"
+        "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2"
         "OwnerKey" = "8:_318FCC99E8D143D6B4F9F534E63009B3"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D"
+        "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2"
         "OwnerKey" = "8:_2F2FEC549F02436EB87961BD1B9E5783"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D"
+        "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2"
         "OwnerKey" = "8:_2D09AB81AB8D45FF97E9DFA4DAC3465D"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D"
+        "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2"
         "OwnerKey" = "8:_28FBC5A60B44423B8A2CC378347483CE"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D"
+        "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2"
         "OwnerKey" = "8:_2814E641538B42EFA83525986A9D5AC1"
         "MsmSig" = "8:_UNDEFINED"
         }
@@ -273,14 +267,14 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_329D8DAE6C01FCF026E9DFB48B932203"
-        "OwnerKey" = "8:_28FBC5A60B44423B8A2CC378347483CE"
+        "MsmKey" = "8:_326CFBAF7BA54A989CB1BF8A9CF959D8"
+        "OwnerKey" = "8:_245904E3D36D4A86B2FB963505EB83D2"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_35FACDFFDDB943568B7588D14D0513A7"
-        "OwnerKey" = "8:_27200676A75147D0BB7FA5500BB31A6D"
+        "MsmKey" = "8:_329D8DAE6C01FCF026E9DFB48B932203"
+        "OwnerKey" = "8:_28FBC5A60B44423B8A2CC378347483CE"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -303,18 +297,6 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_525E8ED430D44113995AB8FBF1945569"
-        "OwnerKey" = "8:_548996CD77304E3598846F122E79431A"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_548996CD77304E3598846F122E79431A"
-        "OwnerKey" = "8:_D1269F1E49D442CF8EAC96C23E60325D"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
         "MsmKey" = "8:_59CFED0C4EC0492C945E4EBC04FE965F"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -417,12 +399,6 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_A40E3F2045F44C60A8509FDFE47E6C45"
-        "OwnerKey" = "8:_UNDEFINED"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
         "MsmKey" = "8:_A944ADCEDF884574A23F7BA5420A6BA1"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -742,26 +718,6 @@
         }
         "File"
         {
-            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_0A2A2813738E4157B2CC6A4EF2A303BB"
-            {
-            "SourcePath" = "8:..\\..\\AUTHORS"
-            "TargetName" = "8:AUTHORS"
-            "Tag" = "8:"
-            "Folder" = "8:_04AC783F1C9F41AEB4E947C46CE9C9FF"
-            "Condition" = "8:"
-            "Transitive" = "11:FALSE"
-            "Vital" = "11:TRUE"
-            "ReadOnly" = "11:FALSE"
-            "Hidden" = "11:FALSE"
-            "System" = "11:FALSE"
-            "Permanent" = "11:FALSE"
-            "SharedLegacy" = "11:FALSE"
-            "PackageAs" = "3:1"
-            "Register" = "3:1"
-            "Exclude" = "11:FALSE"
-            "IsDependency" = "11:FALSE"
-            "IsolateTo" = "8:"
-            }
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_0F091427EEA0245FBA87474748D35ABD"
             {
             "SourcePath" = "8:js32.dll"
@@ -962,26 +918,6 @@
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
-            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A40E3F2045F44C60A8509FDFE47E6C45"
-            {
-            "SourcePath" = "8:..\\..\\COPYING"
-            "TargetName" = "8:COPYING"
-            "Tag" = "8:"
-            "Folder" = "8:_04AC783F1C9F41AEB4E947C46CE9C9FF"
-            "Condition" = "8:"
-            "Transitive" = "11:FALSE"
-            "Vital" = "11:TRUE"
-            "ReadOnly" = "11:FALSE"
-            "Hidden" = "11:FALSE"
-            "System" = "11:FALSE"
-            "Permanent" = "11:FALSE"
-            "SharedLegacy" = "11:FALSE"
-            "PackageAs" = "3:1"
-            "Register" = "3:1"
-            "Exclude" = "11:FALSE"
-            "IsDependency" = "11:FALSE"
-            "IsolateTo" = "8:"
-            }
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_ADA22D44BCDEBA509E09A5D4C155AA41"
             {
             "SourcePath" = "8:ODBC32.dll"
@@ -1173,7 +1109,7 @@
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:Freeswitch"
         "ProductCode" = "8:{317A9CC0-40DC-4803-A13E-5937F05F9D2E}"
-        "PackageCode" = "8:{35A30F10-964D-4C59-A882-360D2CAC47EC}"
+        "PackageCode" = "8:{F98461BC-9B50-4BEA-A554-74A6F557BECF}"
         "UpgradeCode" = "8:{8080E3A5-7ADD-4173-8913-BDA439D1C8DD}"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:FALSE"
@@ -1447,53 +1383,6 @@
                             }
                         }
                     }
-                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_E8A0FD168FA4401FBF582E01DA819A71"
-                    {
-                    "Sequence" = "3:210"
-                    "DisplayName" = "8:License Agreement"
-                    "UseDynamicProperties" = "11:TRUE"
-                    "IsDependency" = "11:FALSE"
-                    "SourcePath" = "8:<VsdDialogDir>\\VsdAdminLicenseDlg.wid"
-                        "Properties"
-                        {
-                            "BannerBitmap"
-                            {
-                            "Name" = "8:BannerBitmap"
-                            "DisplayName" = "8:#1001"
-                            "Description" = "8:#1101"
-                            "Type" = "3:8"
-                            "ContextData" = "8:Bitmap"
-                            "Attributes" = "3:4"
-                            "Setting" = "3:1"
-                            "UsePlugInResources" = "11:TRUE"
-                            }
-                            "EulaText"
-                            {
-                            "Name" = "8:EulaText"
-                            "DisplayName" = "8:#1008"
-                            "Description" = "8:#1108"
-                            "Type" = "3:6"
-                            "ContextData" = "8:"
-                            "Attributes" = "3:0"
-                            "Setting" = "3:2"
-                            "Value" = "8:_A40E3F2045F44C60A8509FDFE47E6C45"
-                            "UsePlugInResources" = "11:TRUE"
-                            }
-                            "Sunken"
-                            {
-                            "Name" = "8:Sunken"
-                            "DisplayName" = "8:#1007"
-                            "Description" = "8:#1107"
-                            "Type" = "3:5"
-                            "ContextData" = "8:4;True=4;False=0"
-                            "Attributes" = "3:0"
-                            "Setting" = "3:0"
-                            "Value" = "3:4"
-                            "DefaultValue" = "3:4"
-                            "UsePlugInResources" = "11:TRUE"
-                            }
-                        }
-                    }
                 }
             }
             "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_9237AC900FC7421096FC1C1F479A57D9"
@@ -1595,53 +1484,6 @@
                             }
                         }
                     }
-                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_1229F6668E004795AE90C753D37CA881"
-                    {
-                    "Sequence" = "3:300"
-                    "DisplayName" = "8:License Agreement"
-                    "UseDynamicProperties" = "11:TRUE"
-                    "IsDependency" = "11:FALSE"
-                    "SourcePath" = "8:<VsdDialogDir>\\VsdLicenseDlg.wid"
-                        "Properties"
-                        {
-                            "BannerBitmap"
-                            {
-                            "Name" = "8:BannerBitmap"
-                            "DisplayName" = "8:#1001"
-                            "Description" = "8:#1101"
-                            "Type" = "3:8"
-                            "ContextData" = "8:Bitmap"
-                            "Attributes" = "3:4"
-                            "Setting" = "3:1"
-                            "UsePlugInResources" = "11:TRUE"
-                            }
-                            "EulaText"
-                            {
-                            "Name" = "8:EulaText"
-                            "DisplayName" = "8:#1008"
-                            "Description" = "8:#1108"
-                            "Type" = "3:6"
-                            "ContextData" = "8:"
-                            "Attributes" = "3:0"
-                            "Setting" = "3:2"
-                            "Value" = "8:_A40E3F2045F44C60A8509FDFE47E6C45"
-                            "UsePlugInResources" = "11:TRUE"
-                            }
-                            "Sunken"
-                            {
-                            "Name" = "8:Sunken"
-                            "DisplayName" = "8:#1007"
-                            "Description" = "8:#1107"
-                            "Type" = "3:5"
-                            "ContextData" = "8:4;True=4;False=0"
-                            "Attributes" = "3:0"
-                            "Setting" = "3:0"
-                            "Value" = "3:4"
-                            "DefaultValue" = "3:4"
-                            "UsePlugInResources" = "11:TRUE"
-                            }
-                        }
-                    }
                     "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_E4748A502E1E4F89B72F6B70E40E6954"
                     {
                     "Sequence" = "3:400"
@@ -1804,7 +1646,7 @@
         }
         "MergeModule"
         {
-            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_27200676A75147D0BB7FA5500BB31A6D"
+            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_245904E3D36D4A86B2FB963505EB83D2"
             {
             "UseDynamicProperties" = "11:TRUE"
             "IsDependency" = "11:TRUE"
@@ -1818,7 +1660,7 @@
             "Feature" = "8:"
             "IsolateTo" = "8:"
             }
-            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_35FACDFFDDB943568B7588D14D0513A7"
+            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_326CFBAF7BA54A989CB1BF8A9CF959D8"
             {
             "UseDynamicProperties" = "11:TRUE"
             "IsDependency" = "11:TRUE"
@@ -1832,34 +1674,6 @@
             "Feature" = "8:"
             "IsolateTo" = "8:"
             }
-            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_525E8ED430D44113995AB8FBF1945569"
-            {
-            "UseDynamicProperties" = "11:TRUE"
-            "IsDependency" = "11:TRUE"
-            "SourcePath" = "8:policy_8_0_microsoft_vc80_crt_x86.msm"
-                "Properties"
-                {
-                }
-            "LanguageId" = "3:0"
-            "Exclude" = "11:FALSE"
-            "Folder" = "8:"
-            "Feature" = "8:"
-            "IsolateTo" = "8:"
-            }
-            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_548996CD77304E3598846F122E79431A"
-            {
-            "UseDynamicProperties" = "11:TRUE"
-            "IsDependency" = "11:TRUE"
-            "SourcePath" = "8:Microsoft_VC80_CRT_x86.msm"
-                "Properties"
-                {
-                }
-            "LanguageId" = "3:0"
-            "Exclude" = "11:FALSE"
-            "Folder" = "8:"
-            "Feature" = "8:"
-            "IsolateTo" = "8:"
-            }
         }
         "ProjectOutput"
         {



More information about the Freeswitch-branches mailing list