[gnome-software] Sort 'Other' to the end

[Matthias Clasen <matthiasc src gnome org>]

commit 022c07c7c1e92e0850471d6e3e2ab00ef64794d0
Author: Matthias Clasen <mclasen redhat com>
Date:   Wed Sep 18 19:18:44 2013 -0400

    Sort 'Other' to the end
    
    That seems fitting, since it is 'everything else'.

 src/gs-category.c |   17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 deletions(-)
---
diff --git a/src/gs-category.c b/src/gs-category.c
index 6828377..7341fc3 100644
--- a/src/gs-category.c
+++ b/src/gs-category.c
@@ -117,8 +117,17 @@ gs_category_add_subcategory (GsCategory *category, GsCategory *subcategory)
 static gint
 gs_category_sort_subcategories_cb (gconstpointer a, gconstpointer b)
 {
-       return g_strcmp0 (gs_category_get_name (GS_CATEGORY (a)),
-                         gs_category_get_name (GS_CATEGORY (b)));
+       GsCategory *ca = GS_CATEGORY (a);
+       GsCategory *cb = GS_CATEGORY (b);
+       const gchar *id_a = gs_category_get_id (ca);
+       const gchar *id_b = gs_category_get_id (cb);
+
+       if (!id_a)
+               return 1;
+       if (!id_b)
+               return -1;
+
+       return g_strcmp0 (gs_category_get_name (ca), gs_category_get_name (cb));
 }
 
 /**
@@ -131,6 +140,7 @@ gs_category_sort_subcategories (GsCategory *category)
        GList *l;
        GsCategory *all;
        GsCategoryPrivate *priv = category->priv;
+       const gchar *id;
 
        /* nothing here */
        if (priv->subcategories == NULL)
@@ -138,7 +148,8 @@ gs_category_sort_subcategories (GsCategory *category)
 
        /* ensure there is a general entry */
        for (l = priv->subcategories; l != NULL; l = l->next) {
-               if (gs_category_get_id (GS_CATEGORY (l->data)) == NULL) {
+               id = gs_category_get_id (GS_CATEGORY (l->data));
+               if (id == NULL) {
                        subcat_all = TRUE;
                        break;
                }