fix merge conflict

Author: fredcw

files/usr/share/cinnamon/applets/notifications@cinnamon.org/applet.js

@@ -28,7 +28,7 @@ class CinnamonNotificationsApplet extends Applet.TextIconApplet {
         this.settings.bind("keyOpen", "keyOpen", this._setKeybinding);
         this.settings.bind("keyClear", "keyClear", this._setKeybinding);
         this.settings.bind("showNotificationCount", "showNotificationCount", this.update_list);
-        this.settings.bind("showNewestFirst", "showNewestFirst", this.update_list);
+        this.settings.bind("showNewestFirst", "showNewestFirst", null);
         this._setKeybinding();
 
         // Layout
@@ -66,10 +66,16 @@ class CinnamonNotificationsApplet extends Applet.TextIconApplet {
     _openMenu() {
         this._update_timestamp();
 
-        this.notifications.forEach(notification => {
-            if (notification.actor.get_parent() !== this._notificationbin) 
+        this._notificationbin.remove_all_children();
+        if (this.showNewestFirst) {
+            for (let i = this.notifications.length - 1; i >= 0; i--) {
+                global.reparentActor(this.notifications[i].actor, this._notificationbin);
+            }
+        } else {
+            this.notifications.forEach(notification => {
                 global.reparentActor(notification.actor, this._notificationbin);
-        });
+            });
+        }
 
         this.menu.toggle();
     }
@@ -175,7 +181,6 @@ class CinnamonNotificationsApplet extends Applet.TextIconApplet {
                 this.actor.show();
                 this.clear_action.actor.show();
                 this.set_applet_label(count.toString());
-                this._reorderNotifications();
                 // Find max urgency and derive list icon.
                 let max_urgency = -1;
                 for (let i = 0; i < count; i++) {
@@ -234,25 +239,6 @@ class CinnamonNotificationsApplet extends Applet.TextIconApplet {
         this.update_list();
     }
 
-    _reorderNotifications() {
-        let orderedNotifications = this.notifications.slice();
-
-        if (this.showNewestFirst) {
-            orderedNotifications.reverse();
-        }
-
-        // Remove all children without destroying them.
-        let children = this._notificationbin.get_children();
-        for (let i = 0; i < children.length; i++) {
-            this._notificationbin.remove_child(children[i]);
-        }
-
-        // Add them back in desired order.
-        for (let i = 0; i < orderedNotifications.length; i++) {
-            this._notificationbin.add_child(orderedNotifications[i].actor);
-        }
-    }
-
     _show_hide_tray() { // Show or hide the notification tray.
         if(!global.settings.get_boolean(PANEL_EDIT_MODE_KEY)) {
             if (this.notifications.length || this.showEmptyTray) {