Author: bklaas
Date: Sat Jan 16 08:37:10 2010
New Revision: 8361
URL: http://svn.slimdevices.com/jive?rev=8361&view=rev
Log:
r38...@daddymac-520 (orig r8354): bklaas | 2010-01-15 09:18:02 -0500
Bug: n/a
Description: georgeWireless.lua is effectively cruft at this point. Removing...
r38...@daddymac-520 (orig r8355): bklaas | 2010-01-15 09:20:20 -0500
Bug: 14194
Description: add BSD license footer to AlarmSnoozeApplet
r38...@daddymac-520 (orig r8360): bklaas | 2010-01-16 10:35:52 -0500
Bug: 14870
Description: don't ignore volume_up and volume_down actions
Removed:
7.5/trunk/squeezeplay/src/squeezeplay_test/share/jive/net/
Modified:
7.5/trunk/ (props changed)
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/AlarmSnooze/AlarmSnoozeApplet.lua
Propchange: 7.5/trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Sat Jan 16 08:37:10 2010
@@ -12,7 +12,7 @@
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/private-branches/fab4-autoswitch:5831
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/private-branches/fab4-skin:4552
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/private-branches/new-alsa:6567
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:8347
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:8360
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:2013
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
Modified:
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/AlarmSnooze/AlarmSnoozeApplet.lua
URL:
http://svn.slimdevices.com/jive/7.5/trunk/squeezeplay/src/squeezeplay/share/applets/AlarmSnooze/AlarmSnoozeApplet.lua?rev=8361&r1=8360&r2=8361&view=diff
==============================================================================
---
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/AlarmSnooze/AlarmSnoozeApplet.lua
(original)
+++
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/AlarmSnooze/AlarmSnoozeApplet.lua
Sat Jan 16 08:37:10 2010
@@ -475,7 +475,7 @@
menu:addActionListener("power", self, offAction)
menu:addActionListener("mute", self, snoozeAction)
- window:ignoreAllInputExcept({ 'go', 'back', 'power', 'mute' },
hideWindowAction)
+ window:ignoreAllInputExcept({ 'go', 'back', 'power', 'mute',
'volume_up', 'volume_down' }, hideWindowAction)
menu:setHeaderWidget(headerGroup)
@@ -624,3 +624,14 @@
self.alarmWindow = nil
return false
end
+
+--[[
+
+=head1 LICENSE
+
+Copyright 2010 Logitech. All Rights Reserved.
+
+This file is licensed under BSD. Please see the LICENSE file for details.
+
+=cut
+--]]
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
