[gnome-shell/wip/fmuellner/notification-redux+sass: 114/141] messageTray: Remove mute support



commit 86fa29db3a7bc8f11b6b180d1f0dcee2c1fdf868
Author: Florian Müllner <fmuellner gnome org>
Date:   Tue Feb 17 03:49:24 2015 +0100

    messageTray: Remove mute support
    
    It was a nice feature, but with sources no longer being represented in
    the UI, there is no longer a way for users to make use of it. If we want
    to bring the feature back in the future, it would probably make more
    sense to implement via the chat source's policy anyway.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=744850

 js/ui/messageTray.js |   30 ++++--------------------------
 1 files changed, 4 insertions(+), 26 deletions(-)
---
diff --git a/js/ui/messageTray.js b/js/ui/messageTray.js
index 82d4b77..4baed6a 100644
--- a/js/ui/messageTray.js
+++ b/js/ui/messageTray.js
@@ -1245,7 +1245,6 @@ const Source = new Lang.Class({
         this.iconName = iconName;
 
         this.isChat = false;
-        this.isMuted = false;
 
         this.notifications = [];
 
@@ -1286,13 +1285,6 @@ const Source = new Lang.Class({
         this.emit('title-changed');
     },
 
-    setMuted: function(muted) {
-        if (!this.isChat || this.isMuted == muted)
-            return;
-        this.isMuted = muted;
-        this.emit('muted-changed');
-    },
-
     // Called to create a new icon actor.
     // Provides a sane default implementation, override if you need
     // something more fancy.
@@ -1332,15 +1324,10 @@ const Source = new Lang.Class({
         notification.acknowledged = false;
         this.pushNotification(notification);
 
-        if (!this.isMuted) {
-            // Play the sound now, if banners are disabled.
-            // Otherwise, it will be played when the notification
-            // is next shown.
-            if (this.policy.showBanners) {
-                this.emit('notify', notification);
-            } else {
-                notification.playSound();
-            }
+        if (this.policy.showBanners) {
+            this.emit('notify', notification);
+        } else {
+            notification.playSound();
         }
     },
 
@@ -1811,7 +1798,6 @@ const MessageTray = new Lang.Class({
             source: source,
             notifyId: 0,
             destroyId: 0,
-            mutedChangedId: 0
         };
 
         if (source.isClearable)
@@ -1821,13 +1807,6 @@ const MessageTray = new Lang.Class({
 
         obj.notifyId = source.connect('notify', Lang.bind(this, this._onNotify));
         obj.destroyId = source.connect('destroy', Lang.bind(this, this._onSourceDestroy));
-        obj.mutedChangedId = source.connect('muted-changed', Lang.bind(this,
-            function () {
-                if (source.isMuted)
-                    this._notificationQueue = this._notificationQueue.filter(function(notification) {
-                        return source != notification.source;
-                    });
-            }));
 
         this.emit('source-added', source);
 
@@ -1843,7 +1822,6 @@ const MessageTray = new Lang.Class({
 
         source.disconnect(obj.notifyId);
         source.disconnect(obj.destroyId);
-        source.disconnect(obj.mutedChangedId);
 
         this.emit('source-removed', source);
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]