Update the Jabber.NET library to 2.1.2 release.

emclient · Apr 8, 2009 · 598590c · 598590c
1 parent 6600aac
commit 598590c
Show file tree

Hide file tree

Showing 219 changed files with 2,794 additions and 1,076 deletions.
diff --git a/2005-jabber-net.csproj b/2005-jabber-net.csproj
@@ -83,10 +83,7 @@
     <DefineConstants Condition="'$(BuildMono)'=='true'">TRACE;DEBUG</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>pdbonly</DebugType>
-    <DebugSymbols>true</DebugSymbols>
-    <Optimize>false</Optimize>
+    <DefineConstants>TRACE</DefineConstants>
   </PropertyGroup>
   <ItemGroup Condition="'$(BuildMono)'==''">
     <Reference Include="System">
@@ -144,6 +141,9 @@
     <Compile Include="bedrock\io\BufferAggregate.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="jabber\client\BookmarkManager.cs">
+      <SubType>Component</SubType>
+    </Compile>
     <Compile Include="jabber\connection\FileMap.cs" />
     <Compile Include="bedrock\io\ReadEventStream.cs">
       <SubType>Code</SubType>
@@ -304,6 +304,7 @@
     <Compile Include="jabber\protocol\iq\Auth.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="jabber\protocol\iq\Bookmarks.cs" />
     <Compile Include="jabber\protocol\iq\Browse.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -324,6 +325,7 @@
     <Compile Include="jabber\protocol\iq\OOB.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="jabber\protocol\iq\Private.cs" />
     <Compile Include="jabber\protocol\iq\PubSub.cs" />
     <Compile Include="jabber\protocol\iq\PubSubErrors.cs" />
     <Compile Include="jabber\protocol\iq\PubSubEvent.cs" />
@@ -435,13 +437,11 @@
     <EmbeddedResource Include="jabber\client\JabberClient.bmp" />
     <EmbeddedResource Include="jabber\client\JabberClient.resx">
       <DependentUpon>JabberClient.cs</DependentUpon>
-      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="jabber\client\PresenceManager.bmp" />
     <EmbeddedResource Include="jabber\client\RosterManager.bmp" />
     <EmbeddedResource Include="jabber\client\RosterManager.resx">
       <DependentUpon>RosterManager.cs</DependentUpon>
-      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="jabber\connection\XmppStream.resx">
       <DependentUpon>XmppStream.cs</DependentUpon>
@@ -450,7 +450,6 @@
     <EmbeddedResource Include="jabber\server\JabberService.bmp" />
     <EmbeddedResource Include="jabber\server\JabberService.resx">
       <DependentUpon>JabberService.cs</DependentUpon>
-      <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
@@ -473,31 +472,14 @@
     <EmbeddedResource Include="jabber\connection\ConferenceManager.bmp" />
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="System.Data" />
-  </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 2.0 %28x86%29</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.0">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.0 %28x86%29</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="netlib.Dns\netlib.Dns.csproj">
+    <ProjectReference Condition="'$(BuildMono)'==''" Include="netlib.Dns\netlib.Dns.csproj">
       <Project>{40AC7A7C-D3E5-46DF-B740-06BD9D2A00E1}</Project>
       <Name>netlib.Dns</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Reference Include="System.Data" />
+  </ItemGroup>
   <Import Condition="'$(BuildMono)'==''" Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PreBuildEvent>
@@ -507,24 +489,8 @@
     <SignAssembly>false</SignAssembly>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
+    <OldToolsVersion>2.0</OldToolsVersion>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <ProductVersion>9.0.21022</ProductVersion>
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
 </Project>
diff --git a/2005-jabber-net.csproj.user b/2005-jabber-net.csproj.user
@@ -11,18 +11,6 @@
     <CopyProjectOption>0</CopyProjectOption>
     <ProjectView>ProjectFiles</ProjectView>
     <ProjectTrust>0</ProjectTrust>
-    <PublishUrlHistory>
-    </PublishUrlHistory>
-    <InstallUrlHistory>
-    </InstallUrlHistory>
-    <SupportUrlHistory>
-    </SupportUrlHistory>
-    <UpdateUrlHistory>
-    </UpdateUrlHistory>
-    <BootstrapperUrlHistory>
-    </BootstrapperUrlHistory>
-    <FallbackCulture>en-US</FallbackCulture>
-    <VerifyUploadedFiles>false</VerifyUploadedFiles>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <EnableASPDebugging>false</EnableASPDebugging>

diff --git a/AssemblyInfo.cs b/AssemblyInfo.cs
@@ -18,7 +18,7 @@
 [assembly: AssemblyCompany("Cursive Systems, Inc.")]
 [assembly: AssemblyProduct("jabber-net")]
 [assembly: AssemblyCopyright("Copyright (c) Cursive, Inc. 2000-2008")]
-[assembly: AssemblyVersion("2.1.0.702")]
+[assembly: AssemblyVersion("2.1.2.760")]
 [assembly: AssemblyDelaySign(false)]
 [assembly: CLSCompliant(true)]
 [assembly: AssemblyKeyFile("../../jabbernet.key")]

diff --git a/ConsoleClient/AssemblyInfo.cs b/ConsoleClient/AssemblyInfo.cs
@@ -8,7 +8,7 @@
  *
  * License
  *
- * Jabber-Net can be used under either JOSL or the GPL.
+ * Jabber-Net is licensed under the LGPL.
  * See LICENSE.txt for details.
  * --------------------------------------------------------------------------*/
 using System.Reflection;

diff --git a/ConsoleClient/Main.cs b/ConsoleClient/Main.cs
@@ -8,7 +8,7 @@
  *
  * License
  *
- * Jabber-Net can be used under either JOSL or the GPL.
+ * Jabber-Net is licensed under the LGPL.
  * See LICENSE.txt for details.
  * --------------------------------------------------------------------------*/
 using System;
@@ -27,7 +27,7 @@ namespace ConsoleClient
     /// <summary>
     /// Summary description for Class1.
     /// </summary>
-    [SVN(@"$Id: Main.cs 676 2008-06-12 17:05:11Z hildjj $")]
+    [SVN(@"$Id: Main.cs 725 2008-08-06 18:14:18Z hildjj $")]
     class Class1
     {
         [CommandLine("j", "user@host Jabber ID", true)]

diff --git a/Example/AddContact.cs b/Example/AddContact.cs
@@ -8,7 +8,7 @@
  *
  * License
  *
- * Jabber-Net can be used under either JOSL or the GPL.
+ * Jabber-Net is licensed under the LGPL.
  * See LICENSE.txt for details.
  * --------------------------------------------------------------------------*/
 using System;
@@ -22,7 +22,7 @@
 
 namespace Example
 {
-    [SVN(@"$Id: AddContact.cs 579 2008-02-13 21:29:33Z hildjj $")]
+    [SVN(@"$Id: AddContact.cs 725 2008-08-06 18:14:18Z hildjj $")]
     public class AddContact : Form
     {
 

diff --git a/Example/AddGroup.cs b/Example/AddGroup.cs
@@ -8,7 +8,7 @@
  *
  * License
  *
- * Jabber-Net can be used under either JOSL or the GPL.
+ * Jabber-Net is licensed under the LGPL.
  * See LICENSE.txt for details.
  * --------------------------------------------------------------------------*/
 using System;
@@ -21,7 +21,7 @@
 
 namespace Example
 {
-    [SVN(@"$Id: AddGroup.cs 579 2008-02-13 21:29:33Z hildjj $")]
+    [SVN(@"$Id: AddGroup.cs 725 2008-08-06 18:14:18Z hildjj $")]
     public class AddGroup : Form
     {
         private System.Windows.Forms.TextBox textBox1;

diff --git a/Example/AssemblyInfo.cs b/Example/AssemblyInfo.cs
@@ -8,7 +8,7 @@
  *
  * License
  *
- * Jabber-Net can be used under either JOSL or the GPL.
+ * Jabber-Net is licensed under the LGPL.
  * See LICENSE.txt for details.
  * --------------------------------------------------------------------------*/
 using System.Reflection;

diff --git a/Example/ConferenceForm.cs b/Example/ConferenceForm.cs
@@ -8,7 +8,7 @@
  *
  * License
  *
- * Jabber-Net can be used under either JOSL or the GPL.
+ * Jabber-Net is licensed under the LGPL.
  * See LICENSE.txt for details.
  * --------------------------------------------------------------------------*/
 using System;
@@ -24,7 +24,7 @@
 
 namespace Example
 {
-    [SVN(@"$Id: ConferenceForm.cs 580 2008-02-13 21:49:19Z hildjj $")]
+    [SVN(@"$Id: ConferenceForm.cs 733 2008-09-07 23:03:44Z hildjj $")]
     public class ConferenceForm : Form
     {
         private Label label1;
@@ -54,6 +54,14 @@ public DiscoManager DiscoManager
             set { m_disco = value; }
         }
 
+        public JID RoomJID
+        {
+            get
+            {
+                return new JID(txtRoom.Text, cmbJID.Text, null);
+            }
+        }
+
         public JID RoomAndNick
         {
             get
@@ -62,14 +70,22 @@ public JID RoomAndNick
             }
             set
             {
-                cmbJID.Text = value.Server;
-                txtRoom.Text = value.User;
-                txtNick.Text = value.Resource;
+                if (value == null)
+                {
+                    cmbJID.Text = txtRoom.Text = txtNick.Text = "";
+                }
+                else
+                {
+                    cmbJID.Text = value.Server;
+                    txtRoom.Text = value.User;
+                    txtNick.Text = value.Resource;
+                }
             }
         }
 
         public string Nick
         {
+            get { return txtNick.Text; }
             set { txtNick.Text = value; }
         }
 
@@ -213,15 +229,25 @@ private void ConferenceForm_Shown(object sender, EventArgs e)
         {
             cmbJID.BeginUpdate();
             cmbJID.Items.Clear();
-            foreach (DiscoNode component in m_disco.Root.Children)
+            if (m_disco != null)
+                m_disco.BeginGetItems(null, GotRoot, null);
+            else
+                cmbJID.EndUpdate();
+        }
+
+        private void GotRoot(DiscoManager sender, DiscoNode node, object state)
+        {
+            if (node.Children != null)
             {
-                if (component.HasFeature(jabber.protocol.URI.MUC))
-                    cmbJID.Items.Add(component.JID);
+                foreach (DiscoNode component in node.Children)
+                {
+                    if (component.HasFeature(jabber.protocol.URI.MUC))
+                        cmbJID.Items.Add(component.JID);
+                }
+                if (cmbJID.Items.Count > 0)
+                    cmbJID.SelectedIndex = 0;
             }
-            if (cmbJID.Items.Count > 0)
-                cmbJID.SelectedIndex = 0;
             cmbJID.EndUpdate();
         }
-
     }
 }