[Gpredict-svn] SF.net SVN: gpredict:[951] trunk

[<aa...@us...>]

Revision: 951
          http://gpredict.svn.sourceforge.net/gpredict/?rev=951&view=rev
Author:   aa1vs
Date:     2011-11-12 18:15:03 +0000 (Sat, 12 Nov 2011)
Log Message:
-----------
Sort satellite list in popup.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/gtk-sat-module-popup.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2011-11-12 17:50:10 UTC (rev 950)
+++ trunk/ChangeLog	2011-11-12 18:15:03 UTC (rev 951)
@@ -3,7 +3,10 @@
     * doc/um/gpredict-user-manual.odt
     Update user manual for GPSD and other features.
 
+    * src/gtk-sat-module-popup.c
+    Sort satellite list in popup.
 
+
 2011-11-06 Charles Suprin <hamaa1vs at gmail.com>
 
     * src/gtk-sat-map.c

Modified: trunk/src/gtk-sat-module-popup.c
===================================================================
--- trunk/src/gtk-sat-module-popup.c	2011-11-12 17:50:10 UTC (rev 950)
+++ trunk/src/gtk-sat-module-popup.c	2011-11-12 18:15:03 UTC (rev 951)
@@ -65,9 +65,9 @@
 static void destroy_rigctrl  (GtkWidget *window, gpointer data);
 static void destroy_skg      (GtkWidget *window, gpointer data);
 static gint window_delete    (GtkWidget *widget, GdkEvent *event, gpointer data);
+static sat_nickname_compare (sat_t *a, sat_t *b);
 
 
-
 /** \brief Create and run GtkSatModule popup menu.
  *  \param module The module that should have the popup menu attached to it.
  *
@@ -157,7 +157,9 @@
     satsubmenu = gtk_menu_new();
     gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), satsubmenu);
     
-    sats = g_hash_table_get_values(module->satellites);  // FIXME: sort list
+    sats = g_hash_table_get_values(module->satellites);  
+    sats = g_list_sort(sats , sat_nickname_compare );
+
     n = g_list_length(sats);
     for (i = 0; i < n; i++) {
         sat = SAT(g_list_nth_data(sats, i));
@@ -1230,3 +1232,7 @@
     /* continue to handle event normally */
     return FALSE;
 }
+
+static sat_nickname_compare (sat_t *a, sat_t *b) {
+    gpredict_strcmp(a->nickname, b->nickname);
+}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.