From 6fbc5160dff89422e1fe4aef1dc60b8d09ffb579 Mon Sep 17 00:00:00 2001
From: Lars Uebernickel <lars.uebernickel@canonical.com>
Date: Tue, 19 Nov 2013 11:37:14 +0100
Subject: im_menu_insert: make sorting logic more readable

---
 src/im-menu.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'src/im-menu.c')

diff --git a/src/im-menu.c b/src/im-menu.c
index 0aa042c..55ea99c 100644
--- a/src/im-menu.c
+++ b/src/im-menu.c
@@ -179,18 +179,17 @@ im_menu_insert_section (ImMenu      *menu,
 
   for (position = 1; position < g_menu_model_get_n_items(G_MENU_MODEL (priv->menu)) - 1; position++)
     {
-      gchar * item_sort = NULL;
+      gchar *item_sort;
 
       if (g_menu_model_get_item_attribute(G_MENU_MODEL(priv->menu), position, "x-messaging-menu-sort-string", "s", &item_sort))
         {
-          if (g_utf8_collate(sort_string, item_sort) < 0)
-            {
-              g_free (item_sort);
-              break;
-            }
-        }
+          gint cmp;
 
-      g_free(item_sort);
+          cmp = g_utf8_collate(sort_string, item_sort);
+          g_free (item_sort);
+          if (cmp < 0)
+            break;
+        }
     }
 
   item = g_menu_item_new_section (NULL, section);
-- 
cgit v1.2.3