v2.0.0.16.1 - fixes Priority issue with forwarded notifications

swsch · Jul 8, 2009 · 436a1aa · 436a1aa
1 parent 2ae287d
commit 436a1aa
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 7 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/Growl/_source/Controller.cs b/Growl/Growl/_source/Controller.cs
@@ -827,17 +827,18 @@ Growl.Connector.Response gntpListener_NotifyReceived(Growl.Connector.Notificatio
                 {
                     RegisteredNotification rn = ra.Notifications[notification.Name];
 
+                    bool sticky = rn.ShouldStayOnScreen(false, this.activityMonitor.IsIdle, notification.Sticky);
+                    Growl.Connector.Priority priority = rn.Priority(notification.Priority);
+
                     if (ra.Enabled && rn.Enabled)
                     {
-                        bool sticky = rn.ShouldStayOnScreen(false, this.activityMonitor.IsIdle, notification.Sticky);
-
                         DisplayStyle.Notification n = new Growl.DisplayStyle.Notification();
                         n.UUID = requestInfo.RequestID;
                         n.NotificationID = requestInfo.RequestID;
                         n.ApplicationName = notification.ApplicationName;
                         n.Description = notification.Text;
                         n.Name = notification.Name;
-                        n.Priority = (int)rn.Priority(notification.Priority);
+                        n.Priority = (int)priority;
                         n.Sticky = sticky;
                         n.Title = notification.Title;
                         n.Duration = rn.Duration;
@@ -889,6 +890,7 @@ Growl.Connector.Response gntpListener_NotifyReceived(Growl.Connector.Notificatio
                             System.Drawing.Image icon = (Image)notification.Icon;
                             notification.Icon = icon;
                         }
+                        notification.Priority = priority;
 
                         HandleForwarding(notification, callbackInfo, requestInfo, limitToTheseComputers);
                     }

diff --git a/Growl/Growl/update.manifest b/Growl/Growl/update.manifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest>
-  <version>2.0.0.16</version>
+  <version>2.0.0.16.1</version>
   <required>True</required>
   <updateLocation>http://www.growlforwindows.com/gfw/updates/gfw2.manifest</updateLocation>
   <installerLocation>http://www.growlforwindows.com/gfw/d.ashx?f=Growl_v2.0b16.msi</installerLocation>

diff --git a/Growl/Windows Deployment/Windows Deployment.vdproj b/Growl/Windows Deployment/Windows Deployment.vdproj
@@ -1425,14 +1425,14 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:Growl for Windows"
-        "ProductCode" = "8:{8EBEAB6E-70C9-4232-A546-6366FAD14821}"
-        "PackageCode" = "8:{353BA8E4-5698-42DC-9F5F-EB4EB631C44B}"
+        "ProductCode" = "8:{84A48DF5-84B7-4549-8119-A8AC87444EB6}"
+        "PackageCode" = "8:{8218DC5E-50A8-4A36-BDEC-3B78E9BB13F3}"
         "UpgradeCode" = "8:{54381489-14E3-47B6-8B92-DEB266DCF6E9}"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:FALSE"
-        "ProductVersion" = "8:2.0.00160"
+        "ProductVersion" = "8:2.0.00161"
         "Manufacturer" = "8:Growl"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:"