Changeset 12669 for trunk/gtk/main.c

Timestamp:

Aug 13, 2011, 5:03:18 AM (11 years ago)

Author:

jordan

Message:

(trunk gtk) simplify the implementation of get_details_dialog_key()

File:

• trunk/gtk/main.c (modified) (3 diffs)

trunk/gtk/main.c

@@ -93 +93 @@
 };
 
+static void
+gtr_window_present( GtkWindow * window )
+{
+    gtk_window_present_with_time( window, gtk_get_current_event_time( ) );
+}
+
 /***
 ****
@@ -99 +105 @@
 ***/
 
-static void
-gtr_window_present( GtkWindow * window )
-{
-    gtk_window_present_with_time( window, gtk_get_current_event_time( ) );
-}
-
-/***
-****
-****  DETAILS DIALOGS MANAGEMENT
-****
-***/
-
 static int
-compare_integers( const void * a, const void * b )
-{
-    return *(int*)a - *(int*)b;
+compare_integers( gconstpointer a, gconstpointer b )
+{
+    return (int)a - (int)b;
 }
 
@@ -120 +114 @@
 get_details_dialog_key( GSList * id_list )
 {
-    int i;
-    int n;
-    int * ids;
     GSList * l;
+    GSList * tmp = g_slist_sort( g_slist_copy( id_list ), compare_integers );
     GString * gstr = g_string_new( NULL );
 
-    n = g_slist_length( id_list );
-    ids = g_new( int, n );
-    i = 0;
-    for( l=id_list; l!=NULL; l=l->next )
-        ids[i++] = GPOINTER_TO_INT( l->data );
-    g_assert( i == n );
-    qsort( ids, n, sizeof(int), compare_integers );
-
-    for( i=0; i<n; ++i )
-        g_string_append_printf( gstr, "%d ", ids[i] );
-
-    g_free( ids );
+    for( l=tmp; l!=NULL; l=l->next )
+        g_string_append_printf( gstr, "%d ", (int)l->data );
+
+    g_slist_free( tmp );
     return g_string_free( gstr, FALSE );
 }