v2.0 Final Release

swsch · Nov 17, 2009 · 193620d · 193620d
1 parent 92859b3
commit 193620d
Show file tree

Hide file tree

Showing 40 changed files with 565 additions and 375 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/Feed Monitor/Feed Monitor Deployment/Feed Monitor Deployment.vdproj b/Growl Extras/Feed Monitor/Feed Monitor Deployment/Feed Monitor Deployment.vdproj
@@ -278,14 +278,14 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:Feed Monitor"
-        "ProductCode" = "8:{68CB74CC-4B56-4F28-A218-C20C36C37CBC}"
-        "PackageCode" = "8:{B00A0528-865B-42F6-9457-13E6FEB49D9E}"
+        "ProductCode" = "8:{D99BA834-77E8-4EF6-A7A2-EBEE443D008D}"
+        "PackageCode" = "8:{EE845C0A-695D-4FC6-B6AF-2E4DD4718025}"
         "UpgradeCode" = "8:{E8D784D8-949E-4CC9-BA80-A316D25574D7}"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:FALSE"
-        "ProductVersion" = "8:1.0.6"
+        "ProductVersion" = "8:1.0.7"
         "Manufacturer" = "8:element code project"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:"

diff --git a/Growl Extras/Feed Monitor/GrowlExtras.FeedMonitor/Properties/AssemblyInfo.cs b/Growl Extras/Feed Monitor/GrowlExtras.FeedMonitor/Properties/AssemblyInfo.cs
@@ -33,4 +33,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.6.0")]
+[assembly: AssemblyFileVersion("1.0.7.0")]
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 Outlook Add-In/GrowlOutlookAddInSetup/GrowlOutlookAddInSetup b/Growl Extras/Growl Outlook Add-In/GrowlOutlookAddInSetup/GrowlOutlookAddInSetup
@@ -588,14 +588,14 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:Growl Outlook Add-In"
-        "ProductCode" = "8:{0A05FD1F-F708-427B-AEB5-12E4FBD11F53}"
-        "PackageCode" = "8:{1E02761D-BF46-4F66-A266-658AAFED77C0}"
+        "ProductCode" = "8:{E13C155F-65F1-4224-8504-742CD5055E96}"
+        "PackageCode" = "8:{2769BA2A-82FC-43B3-8A4D-BD33E4B96471}"
         "UpgradeCode" = "8:{49A7FB61-9235-4718-B57C-A8C2DB8C84C8}"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:FALSE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:FALSE"
-        "ProductVersion" = "8:1.0.5"
+        "ProductVersion" = "8:1.0.6"
         "Manufacturer" = "8:Growl Extras"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:"

diff --git a/Growl Extras/Growl Visual Studio Add-In/Deployment/Deployment.vdproj b/Growl Extras/Growl Visual Studio Add-In/Deployment/Deployment.vdproj
@@ -577,14 +577,14 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:Growl Add-In for Visual Studio"
-        "ProductCode" = "8:{BB29F808-40C0-4886-9AB9-393D73628676}"
-        "PackageCode" = "8:{C5E155D7-72FB-4A43-9C77-7470469897C3}"
+        "ProductCode" = "8:{D2845283-9C1A-46C7-9F5B-D21189255872}"
+        "PackageCode" = "8:{0AD5B415-B5CD-4206-A380-DB5D4BC04D0A}"
         "UpgradeCode" = "8:{F831506E-1E2C-4B2E-B02A-EAB81096EF29}"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:TRUE"
-        "ProductVersion" = "8:1.0.3"
+        "ProductVersion" = "8:1.0.4"
         "Manufacturer" = "8:Growl Extras"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:"

diff --git a/Growl Extras/MiniVisor/MiniVisor/MiniVisorWindow.cs b/Growl Extras/MiniVisor/MiniVisor/MiniVisorWindow.cs
@@ -22,7 +22,7 @@ public partial class MiniVisorWindow : NotificationWindow
         Bitmap bitmap;
         int x = 0;
         int y = 0;
-        int moveBy = 5;
+        int moveBy = 1;
         bool closed = true;
         int originalHeight;
 
@@ -82,7 +82,7 @@ void slideOutTimer_Tick(object sender, EventArgs e)
         {
             if (!this.closed)
             {
-                bool result = MoveWindow(-this.moveBy, this.startY, false);
+                bool result = MoveWindow(-this.moveBy * 2, this.startY, false);
                 if (result)
                 {
                     this.slideOutTimer.Stop();
@@ -138,7 +138,7 @@ private void SlideIn()
             this.endY = 0;
 
             // start sliding the window in
-            this.slideInTimer.Interval = 100;
+            this.slideInTimer.Interval = 10;
             this.slideInTimer.Start();
         }
 
@@ -147,7 +147,7 @@ private void SlideOut()
             // start sliding the window out
             this.slideInTimer.Stop();
             this.displayTimer.Stop();
-            this.slideOutTimer.Interval = 100;
+            this.slideOutTimer.Interval = 10;
             this.slideOutTimer.Start();
         }
 

diff --git a/Growl Extras/Risor/Risor/RisorWindow.cs b/Growl Extras/Risor/Risor/RisorWindow.cs
@@ -58,7 +58,7 @@ void displayTimer_Tick(object sender, EventArgs e)
 
         void slideInTimer_Tick(object sender, EventArgs e)
         {
-            bool result = MoveWindow(-10, this.endY, false);
+            bool result = MoveWindow(-2, this.endY, false);
             if (result)
             {
                 this.slideInTimer.Stop();
@@ -73,7 +73,7 @@ void slideInTimer_Tick(object sender, EventArgs e)
 
         void slideOutTimer_Tick(object sender, EventArgs e)
         {
-            bool result = MoveWindow(10, this.startY, true);
+            bool result = MoveWindow(3, this.startY, true);
             if (result)
             {
                 this.slideOutTimer.Stop();
@@ -124,7 +124,7 @@ private void SlideIn()
             this.endY = this.screenHeight - this.Height;
 
             // start sliding the window in
-            this.slideInTimer.Interval = 100;
+            this.slideInTimer.Interval = 10;
             this.slideInTimer.Start();
         }
 
@@ -133,7 +133,7 @@ private void SlideOut()
             // start sliding the window out
             this.slideInTimer.Stop();
             this.displayTimer.Stop();
-            this.slideOutTimer.Interval = 100;
+            this.slideOutTimer.Interval = 10;
             this.slideOutTimer.Start();
         }
 

diff --git a/Growl/Growl.Connector/ConnectorBase.cs b/Growl/Growl.Connector/ConnectorBase.cs
@@ -389,7 +389,7 @@ private void CleanUpSocket(ConnectState state)
                     if (state.Client != null && state.Client.Client != null)
                     {
                         state.Client.Client.Blocking = true;
-                        state.Client.Client.Shutdown(SocketShutdown.Both);
+                        try { state.Client.Client.Shutdown(SocketShutdown.Both); } catch { }
                         state.Client.Client.Close();
                         state.Client.Close();
                     }

diff --git a/Growl/Growl.Connector/MessageBuilder.cs b/Growl/Growl.Connector/MessageBuilder.cs
@@ -140,8 +140,22 @@ public override byte[] GetBytes()
             allBytes.AddRange(protocolHeaderBytes);
             allBytes.AddRange(GetStringBytes(s.ToUpper()));
             allBytes.AddRange(blankLineBytes);
-            allBytes.AddRange(result.EncryptedBytes);
-            if (key.EncryptionAlgorithm != Cryptography.SymmetricAlgorithmType.PlainText) allBytes.AddRange(blankLineBytes);
+
+            if (key.EncryptionAlgorithm != Cryptography.SymmetricAlgorithmType.PlainText)
+            {
+                /* use this to add the Length: header to the main section
+                MessageSection lengthSection = new MessageSection();
+                lengthSection.AddHeader(new Header(Header.RESOURCE_LENGTH, result.EncryptedBytes.Length.ToString()));
+                lengthSection.AddBlankLine();
+                allBytes.AddRange(lengthSection.GetBytes());
+                 * */
+                allBytes.AddRange(result.EncryptedBytes);
+                allBytes.AddRange(blankLineBytes);
+            }
+            else
+            {
+                allBytes.AddRange(result.EncryptedBytes);
+            }
 
             // handle binary resources
             foreach (BinaryData data in allBinaryData)

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.0.24")]
+[assembly: AssemblyFileVersion("2.0.0.25")]
 [assembly: AssemblyInformationalVersion("2.0")]
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.0.24")]
+[assembly: AssemblyFileVersion("2.0.0.25")]
 [assembly: AssemblyInformationalVersion("2.0")]
diff --git a/Growl/Growl.Daemon/CallbackInfo.cs b/Growl/Growl.Daemon/CallbackInfo.cs
@@ -12,30 +12,64 @@ namespace Growl.Daemon
     /// </summary>
     public class CallbackInfo
     {
+        /// <summary>
+        /// The callback context from the request
+        /// </summary>
+        private CallbackContext context;
+
+        /// <summary>
+        /// The MessageHandler that will peform the callback write
+        /// </summary>
+        private MessageHandler messageHandler;
+
         /// <summary>
         /// The unique notification ID
         /// </summary>
         private string notificationID;
 
-        // TODO: see below
-        private RequestInfo requestInfo;
-
+        /// <summary>
+        /// Indicates if a callback associated with this notification has already been triggered
+        /// </summary>
         private bool alreadyResponded;
 
+        /// <summary>
+        /// Any additional information to return in the callback
+        /// </summary>
         private Dictionary<string, string> additionalInfo;
 
+        // TODO: see below
+        private RequestInfo requestInfo;
+
+
         /// <summary>
         /// The callback context from the request
         /// </summary>
-        public CallbackContext Context;
+        public CallbackContext Context
+        {
+            get
+            {
+                return this.context;
+            }
+            set
+            {
+                this.context = value;
+            }
+        }
 
         /// <summary>
         /// The MessageHandler that will peform the callback write
         /// </summary>
-        public MessageHandler MessageHandler;
-
-        // TODO: figure out if this really should be in here or not
-        public RequestInfo RequestInfo;
+        public MessageHandler MessageHandler
+        {
+            get
+            {
+                return this.messageHandler;
+            }
+            set
+            {
+                this.messageHandler = value;
+            }
+        }
 
         /// <summary>
         /// Gets or sets the unique notification ID provided in the request
@@ -55,6 +89,39 @@ internal set
             }
         }
 
+        /// <summary>
+        /// Indicates if the request that spawned this callback has already been responded to.
+        /// </summary>
+        /// <remarks>
+        /// When a notification is forwarded to another computer, the notification may be clicked/handled on both computers.
+        /// Only the first response action is returned and all subsequent actions are ignored.
+        /// </remarks>
+        public bool AlreadyResponded
+        {
+            get
+            {
+                return this.alreadyResponded;
+            }
+            internal set
+            {
+                this.alreadyResponded = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets a list of all extended-information key/value pairs that should be returned with the callback response.
+        /// </summary>
+        internal Dictionary<string, string> AdditionalInfo
+        {
+            get
+            {
+                return this.additionalInfo;
+            }
+        }
+
+        // TODO: figure out if this really should be in here or not
+        public RequestInfo RequestInfo;
+
         /// <summary>
         /// Indicates if the server should keep the connection open to perform the callback
         /// </summary>
@@ -70,6 +137,17 @@ public bool ShouldKeepConnectionOpen()
                 return false;
         }
 
+        /// <summary>
+        /// Saves all extended information that should be returned with the callback response.
+        /// </summary>
+        /// <param name="additionalInfo">A <see cref="Dictionary{TKey, TValue}"/> containing all of the additional information key/value pairs</param>
+        public void SetAdditionalInfo(Dictionary<string, string> additionalInfo)
+        {
+            this.additionalInfo = additionalInfo;
+        }
+
+
+
         /*
         /// <summary>
         /// Gets the url-formatted callback data that is to be sent for url callbacks.
@@ -90,44 +168,5 @@ public string GetUrlCallbackData(CallbackResult result)
             return data;
         }
          * */
-
-        /// <summary>
-        /// Saves all extended information that should be returned with the callback response.
-        /// </summary>
-        /// <param name="additionalInfo">A <see cref="Dictionary{TKey, TValue}"/> containing all of the additional information key/value pairs</param>
-        public void SetAdditionalInfo(Dictionary<string, string> additionalInfo)
-        {
-            this.additionalInfo = additionalInfo;
-        }
-
-        /// <summary>
-        /// Gets a list of all extended-information key/value pairs that should be returned with the callback response.
-        /// </summary>
-        internal Dictionary<string, string> AdditionalInfo
-        {
-            get
-            {
-                return this.additionalInfo;
-            }
-        }
-
-        /// <summary>
-        /// Indicates if the request that spawned this callback has already been responded to.
-        /// </summary>
-        /// <remarks>
-        /// When a notification is forwarded to another computer, the notification may be clicked/handled on both computers.
-        /// Only the first response action is returned and all subsequent actions are ignored.
-        /// </remarks>
-        public bool AlreadyResponded
-        {
-            get
-            {
-                return this.alreadyResponded;
-            }
-            internal set
-            {
-                this.alreadyResponded = value;
-            }
-        }
     }
 }
diff --git a/Growl/Growl.Daemon/GrowlServer.cs b/Growl/Growl.Daemon/GrowlServer.cs
@@ -800,6 +800,11 @@ void socketCleanupTimer_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
             if(this.isStarted) this.socketCleanupTimer.Start();
         }
 
+        /// <summary>
+        /// Called when a socket is done being used (for example, after all responses and callbacks
+        /// have been returned to the caller).
+        /// </summary>
+        /// <param name="socket">The <see cref="AsyncSocket"/> that has completed</param>
         void mh_SocketUsageComplete(AsyncSocket socket)
         {
             if (this.connectedSockets.Contains(socket))