Merge lp:~philip.scott/switchboard-plug-notifications/other-to-bottom into lp:~elementary-pantheon/switchboard-plug-notifications/trunk

[Felipe Escoto]

AppList: Push gala-other.desktop to the bottom

Depends on: https://code.launchpad.net/~philip.scott/gala/notifications-app-ids/+merge/298930

Makes the Other app entry appear at the bottom

[Cody Garver (codygarver)]

Rename other.desktop to gala-other.desktop

review: Needs Fixing

[lp:~philip.scott/switchboard-plug-notifications/other-to-bottom]

174. By Felipe Escoto on 2016-07-11

AppList: Push other.desktop to the bottom

[Felipe Escoto (philip.scott)]

Updated the .desktop name. Now all we need is for Rico to approve the Gala branch

=== modified file 'src/Widgets/AppList.vala'
--- src/Widgets/AppList.vala	2015-10-11 11:46:15 +0000
+++ src/Widgets/AppList.vala	2016-07-11 16:06:34 +0000
@@ -18,6 +18,8 @@
  */
 
 public class Widgets.AppList : Gtk.ListBox {
+    private const string FALLBACK_APP_ID = "gala-other.desktop";
+
     construct {
         this.selection_mode = Gtk.SelectionMode.SINGLE;
         this.set_sort_func (sort_func);
@@ -68,6 +70,12 @@
             return 0;
         }
 
+        if (((AppEntry)row1).app.app_info.get_id () == FALLBACK_APP_ID) {
+            return 1;
+        } else if (((AppEntry)row2).app.app_info.get_id () == FALLBACK_APP_ID) {
+            return -1;
+        }
+
         string row_name1 = ((AppEntry)row1).app.app_info.get_display_name ();
         string row_name2 = ((AppEntry)row2).app.app_info.get_display_name ();
 
@@ -75,4 +83,4 @@
 
         return order.clamp (-1, 1);
     }
-}
\ No newline at end of file
+}