v2.0.5

swsch · Oct 22, 2010 · 9dbeb21 · 9dbeb21
1 parent 3a00fc3
commit 9dbeb21
Show file tree

Hide file tree

Showing 58 changed files with 1,988 additions and 581 deletions.
diff --git a/Growl Connectors/NET/libraries/Growl.Connector.dll b/Growl Connectors/NET/libraries/Growl.Connector.dll
diff --git a/Growl Connectors/NET/libraries/Growl.CoreLibrary.dll b/Growl Connectors/NET/libraries/Growl.CoreLibrary.dll
diff --git a/Growl Extras/Growl Display SDK/libraries/Growl.CoreLibrary.dll b/Growl Extras/Growl Display SDK/libraries/Growl.CoreLibrary.dll
diff --git a/Growl Extras/Growl Display SDK/libraries/Growl.DisplayStyle.dll b/Growl Extras/Growl Display SDK/libraries/Growl.DisplayStyle.dll
diff --git a/Growl Extras/Growl Visual Studio Add-In/Deployment/Deployment.vdproj b/Growl Extras/Growl Visual Studio Add-In/Deployment/Deployment.vdproj
@@ -27,14 +27,14 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_2A3D301AE43B4562686ECF2B7D48C150"
-        "OwnerKey" = "8:_E6C013D54794CC24E6A5582343AF2461"
+        "MsmKey" = "8:_3043C73CE0C279A17D3071830EDA9786"
+        "OwnerKey" = "8:_19B4E534DB884CD4B2361ED36CF74D53"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_2A3D301AE43B4562686ECF2B7D48C150"
-        "OwnerKey" = "8:_19B4E534DB884CD4B2361ED36CF74D53"
+        "MsmKey" = "8:_603B588D7CC1941C398B7096BD170E74"
+        "OwnerKey" = "8:_71120D991C3E676FE3571286CCDD7F4B"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -45,44 +45,44 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_79BDF4C205924B49B8831E1ADD9F87A7"
-        "OwnerKey" = "8:_UNDEFINED"
+        "MsmKey" = "8:_76D0C56093107682A32A7F890E355CAE"
+        "OwnerKey" = "8:_3043C73CE0C279A17D3071830EDA9786"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_7BAF36BA2952BE759BC25B9ECB385DF8"
-        "OwnerKey" = "8:_71120D991C3E676FE3571286CCDD7F4B"
+        "MsmKey" = "8:_76D0C56093107682A32A7F890E355CAE"
+        "OwnerKey" = "8:_19B4E534DB884CD4B2361ED36CF74D53"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_7BAF36BA2952BE759BC25B9ECB385DF8"
-        "OwnerKey" = "8:_19B4E534DB884CD4B2361ED36CF74D53"
+        "MsmKey" = "8:_79BDF4C205924B49B8831E1ADD9F87A7"
+        "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_91829F179D1BDCBEAA2CDA4891BBFA7D"
-        "OwnerKey" = "8:_7BAF36BA2952BE759BC25B9ECB385DF8"
+        "MsmKey" = "8:_7BAF36BA2952BE759BC25B9ECB385DF8"
+        "OwnerKey" = "8:_71120D991C3E676FE3571286CCDD7F4B"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_A09C159B75102C4DA5A54263A888DC2B"
-        "OwnerKey" = "8:_1562E11048561AEC8DE26748107511F5"
+        "MsmKey" = "8:_7BAF36BA2952BE759BC25B9ECB385DF8"
+        "OwnerKey" = "8:_19B4E534DB884CD4B2361ED36CF74D53"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_B5AB5DAE83BABEC8D502B95FD0F1C15A"
-        "OwnerKey" = "8:_71120D991C3E676FE3571286CCDD7F4B"
+        "MsmKey" = "8:_B6BCC26D9E028ABB478851084CBF2255"
+        "OwnerKey" = "8:_7BAF36BA2952BE759BC25B9ECB385DF8"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_E6C013D54794CC24E6A5582343AF2461"
-        "OwnerKey" = "8:_19B4E534DB884CD4B2361ED36CF74D53"
+        "MsmKey" = "8:_EE90F078D3D55EB92A43705942883D94"
+        "OwnerKey" = "8:_1562E11048561AEC8DE26748107511F5"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -118,13 +118,13 @@
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_E6C013D54794CC24E6A5582343AF2461"
+        "OwnerKey" = "8:_3043C73CE0C279A17D3071830EDA9786"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_2A3D301AE43B4562686ECF2B7D48C150"
+        "OwnerKey" = "8:_76D0C56093107682A32A7F890E355CAE"
         "MsmSig" = "8:_UNDEFINED"
         }
     }
@@ -243,20 +243,20 @@
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
-            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_2A3D301AE43B4562686ECF2B7D48C150"
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_3043C73CE0C279A17D3071830EDA9786"
             {
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:Growl.CoreLibrary, Version=2.0.0.0, Culture=neutral, PublicKeyToken=13e59d82e007b064, processorArchitecture=MSIL"
+            "AssemblyAsmDisplayName" = "8:Growl.Connector, Version=2.0.0.0, Culture=neutral, PublicKeyToken=980c2339411be384, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
-                    "_2A3D301AE43B4562686ECF2B7D48C150"
+                    "_3043C73CE0C279A17D3071830EDA9786"
                     {
-                    "Name" = "8:Growl.CoreLibrary.dll"
+                    "Name" = "8:Growl.Connector.dll"
                     "Attributes" = "3:512"
                     }
                 }
-            "SourcePath" = "8:Growl.CoreLibrary.dll"
+            "SourcePath" = "8:Growl.Connector.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_23C09D819B7543F589BC560DA2FE7C74"
@@ -274,21 +274,10 @@
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
-            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_71120D991C3E676FE3571286CCDD7F4B"
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_603B588D7CC1941C398B7096BD170E74"
             {
-            "AssemblyRegister" = "3:1"
-            "AssemblyIsInGAC" = "11:TRUE"
-            "AssemblyAsmDisplayName" = "8:EnvDTE80, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
-                "ScatterAssemblies"
-                {
-                    "_71120D991C3E676FE3571286CCDD7F4B"
-                    {
-                    "Name" = "8:EnvDTE80.dll"
-                    "Attributes" = "3:512"
-                    }
-                }
-            "SourcePath" = "8:EnvDTE80.dll"
-            "TargetName" = "8:"
+            "SourcePath" = "8:dte80.olb"
+            "TargetName" = "8:dte80.olb"
             "Tag" = "8:"
             "Folder" = "8:_23C09D819B7543F589BC560DA2FE7C74"
             "Condition" = "8:"
@@ -305,10 +294,21 @@
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
-            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_79BDF4C205924B49B8831E1ADD9F87A7"
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_71120D991C3E676FE3571286CCDD7F4B"
             {
-            "SourcePath" = "8:..\\Growl Visual Studio Add-In\\installer.jpg"
-            "TargetName" = "8:installer.jpg"
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:TRUE"
+            "AssemblyAsmDisplayName" = "8:EnvDTE80, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
+                "ScatterAssemblies"
+                {
+                    "_71120D991C3E676FE3571286CCDD7F4B"
+                    {
+                    "Name" = "8:EnvDTE80.dll"
+                    "Attributes" = "3:512"
+                    }
+                }
+            "SourcePath" = "8:EnvDTE80.dll"
+            "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_23C09D819B7543F589BC560DA2FE7C74"
             "Condition" = "8:"
@@ -322,23 +322,23 @@
             "PackageAs" = "3:1"
             "Register" = "3:1"
             "Exclude" = "11:FALSE"
-            "IsDependency" = "11:FALSE"
+            "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
-            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_7BAF36BA2952BE759BC25B9ECB385DF8"
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_76D0C56093107682A32A7F890E355CAE"
             {
             "AssemblyRegister" = "3:1"
-            "AssemblyIsInGAC" = "11:TRUE"
-            "AssemblyAsmDisplayName" = "8:EnvDTE, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:Growl.CoreLibrary, Version=2.0.0.0, Culture=neutral, PublicKeyToken=13e59d82e007b064, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
-                    "_7BAF36BA2952BE759BC25B9ECB385DF8"
+                    "_76D0C56093107682A32A7F890E355CAE"
                     {
-                    "Name" = "8:EnvDTE.dll"
+                    "Name" = "8:Growl.CoreLibrary.dll"
                     "Attributes" = "3:512"
                     }
                 }
-            "SourcePath" = "8:EnvDTE.dll"
+            "SourcePath" = "8:Growl.CoreLibrary.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_23C09D819B7543F589BC560DA2FE7C74"
@@ -356,10 +356,10 @@
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
-            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_91829F179D1BDCBEAA2CDA4891BBFA7D"
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_79BDF4C205924B49B8831E1ADD9F87A7"
             {
-            "SourcePath" = "8:dte80a.olb"
-            "TargetName" = "8:dte80a.olb"
+            "SourcePath" = "8:..\\Growl Visual Studio Add-In\\installer.jpg"
+            "TargetName" = "8:installer.jpg"
             "Tag" = "8:"
             "Folder" = "8:_23C09D819B7543F589BC560DA2FE7C74"
             "Condition" = "8:"
@@ -373,13 +373,24 @@
             "PackageAs" = "3:1"
             "Register" = "3:1"
             "Exclude" = "11:FALSE"
-            "IsDependency" = "11:TRUE"
+            "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
-            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A09C159B75102C4DA5A54263A888DC2B"
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_7BAF36BA2952BE759BC25B9ECB385DF8"
             {
-            "SourcePath" = "8:vsmso.olb"
-            "TargetName" = "8:vsmso.olb"
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:TRUE"
+            "AssemblyAsmDisplayName" = "8:EnvDTE, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
+                "ScatterAssemblies"
+                {
+                    "_7BAF36BA2952BE759BC25B9ECB385DF8"
+                    {
+                    "Name" = "8:EnvDTE.dll"
+                    "Attributes" = "3:512"
+                    }
+                }
+            "SourcePath" = "8:EnvDTE.dll"
+            "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_23C09D819B7543F589BC560DA2FE7C74"
             "Condition" = "8:"
@@ -396,10 +407,10 @@
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
-            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B5AB5DAE83BABEC8D502B95FD0F1C15A"
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B6BCC26D9E028ABB478851084CBF2255"
             {
-            "SourcePath" = "8:dte80.olb"
-            "TargetName" = "8:dte80.olb"
+            "SourcePath" = "8:dte80a.olb"
+            "TargetName" = "8:dte80a.olb"
             "Tag" = "8:"
             "Folder" = "8:_23C09D819B7543F589BC560DA2FE7C74"
             "Condition" = "8:"
@@ -416,21 +427,10 @@
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
-            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_E6C013D54794CC24E6A5582343AF2461"
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_EE90F078D3D55EB92A43705942883D94"
             {
-            "AssemblyRegister" = "3:1"
-            "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:Growl.Connector, Version=2.0.0.0, Culture=neutral, PublicKeyToken=980c2339411be384, processorArchitecture=MSIL"
-                "ScatterAssemblies"
-                {
-                    "_E6C013D54794CC24E6A5582343AF2461"
-                    {
-                    "Name" = "8:Growl.Connector.dll"
-                    "Attributes" = "3:512"
-                    }
-                }
-            "SourcePath" = "8:Growl.Connector.dll"
-            "TargetName" = "8:"
+            "SourcePath" = "8:vsmso.olb"
+            "TargetName" = "8:vsmso.olb"
             "Tag" = "8:"
             "Folder" = "8:_23C09D819B7543F589BC560DA2FE7C74"
             "Condition" = "8:"
@@ -577,14 +577,14 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:Growl Add-In for Visual Studio"
-        "ProductCode" = "8:{424A466B-D45E-4B05-AD18-C8FFDCA2D754}"
-        "PackageCode" = "8:{0617B1F0-961F-4AB6-91EA-0FE8109B2011}"
+        "ProductCode" = "8:{02306E10-5615-49FE-A393-5568FBF944DA}"
+        "PackageCode" = "8:{7EDCA542-4566-4A3A-ABF8-394EEBB4310E}"
         "UpgradeCode" = "8:{F831506E-1E2C-4B2E-B02A-EAB81096EF29}"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:TRUE"
-        "ProductVersion" = "8:1.0.6"
+        "ProductVersion" = "8:1.0.7"
         "Manufacturer" = "8:Growl Extras"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:"
@@ -1130,8 +1130,5 @@
                 }
             }
         }
-        "VJSharpPlugin"
-        {
-        }
     }
 }
diff --git a/Growl Extras/Growl Visual Studio Add-In/Growl Visual Studio Add-In/Connect.cs b/Growl Extras/Growl Visual Studio Add-In/Growl Visual Studio Add-In/Connect.cs
diff --git a/Growl Extras/iRate iTunes Display/iRate iTunes Display/iRateWindow.cs b/Growl Extras/iRate iTunes Display/iRate iTunes Display/iRateWindow.cs
@@ -23,7 +23,7 @@ public iRateWindow()
 
             this.starRating.RatingValueChanged += new iRate.Controls.StarRating.RatingValueChangedEventHandler(starRating_RatingValueChanged);
 
-            this.AutoClose(5000);
+            this.SetAutoCloseInterval(5000);
         }
 
         void iRateWindow_Load(object sender, EventArgs e)
@@ -46,7 +46,8 @@ public override void SetNotification(Notification n)
         {
             base.SetNotification(n);
 
-            if (n.Duration > 0) this.AutoClose(n.Duration * 1000);
+            if (n.Duration > 0) this.SetAutoCloseInterval(n.Duration * 1000);
+            this.Sticky = n.Sticky;
 
             Image image = n.Image;
             if (image != null)

diff --git a/Growl/Growl.Connector/ErrorDescription.cs b/Growl/Growl.Connector/ErrorDescription.cs
@@ -76,7 +76,7 @@ public static class ErrorDescription
         /// <summary>
         /// Flash-based connections are not allowed
         /// </summary>
-        public const string FLASH_CONNECTIONS_NOT_ALLOWED = "Flash-based connections are not allowed";
+        public const string BROWSER_CONNECTIONS_NOT_ALLOWED = "Browser-based connections are not allowed";
         /// <summary>
         /// This server does not allow subscriptions
         /// </summary>

diff --git a/Growl/Growl.Connector/Properties/AssemblyInfo.cs b/Growl/Growl.Connector/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("2.0.0.0")]
-[assembly: AssemblyFileVersion("2.0.4.2")]
-[assembly: AssemblyInformationalVersion("2.0.4")]
+[assembly: AssemblyFileVersion("2.0.5.2")]
+[assembly: AssemblyInformationalVersion("2.0.5")]
diff --git a/Growl/Growl.CoreLibrary/Properties/AssemblyInfo.cs b/Growl/Growl.CoreLibrary/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("2.0.0.0")]
-[assembly: AssemblyFileVersion("2.0.4.2")]
-[assembly: AssemblyInformationalVersion("2.0.4")]
+[assembly: AssemblyFileVersion("2.0.5.2")]
+[assembly: AssemblyInformationalVersion("2.0.5")]
diff --git a/Growl/Growl.Daemon/AsyncSocket.cs b/Growl/Growl.Daemon/AsyncSocket.cs
@@ -1866,6 +1866,18 @@ private void MaybeClose(object ignore)
             }
         }
 
+        public void Shutdown(SocketShutdown how)
+        {
+            if (socket6 != null)
+            {
+                socket6.Shutdown(how);
+            }
+            if (socket4 != null)
+            {
+                socket4.Shutdown(how);
+            }
+        }
+
         /// <summary>
         /// In the event of an error, this method may be called during SocketWillClose
         /// to read any data that's left on the socket.

diff --git a/Growl/Growl.Daemon/GNTPFlashSocketReader.cs b/Growl/Growl.Daemon/GNTPFlashSocketReader.cs
@@ -81,7 +81,7 @@ void ReadPolicyRequest(AsyncSocket sender, byte[] readBytes, long tag)
                     }
                     else
                     {
-                        OnError(ErrorCode.NOT_AUTHORIZED, ErrorDescription.FLASH_CONNECTIONS_NOT_ALLOWED);
+                        OnError(ErrorCode.NOT_AUTHORIZED, ErrorDescription.BROWSER_CONNECTIONS_NOT_ALLOWED);
                     }
                 }
                 else

diff --git a/Growl/Growl.Daemon/GNTPParser.cs b/Growl/Growl.Daemon/GNTPParser.cs
@@ -915,6 +915,9 @@ private int GetNumberOfPointers()
             }
             int p = this.pointers.Count;
 
+            // TODO: this effectively causes no cached resources to ever be used
+            //c = int.MaxValue;
+
             // check to see if all pointers were already cached
             if (p == c) p = 0;  // if #cached == total#, we dont need to read any
             else