Changeset 9486

Timestamp:

Nov 7, 2009, 2:03:12 AM (13 years ago)

Author:

charles

Message:

(trunk gtk) fix a couple of build errors on older versions of GTK+

Location:

trunk/gtk

Files:

• my-valgrind.sh (modified) (1 diff)
• tr-core.c (modified) (2 diffs)
• tr-prefs.c (modified) (1 diff)

trunk/gtk/my-valgrind.sh

@@ -3 +3 @@
 export G_DEBUG=gc-friendly
 export GLIBCXX_FORCE_NEW=1
-valgrind --tool=memcheck --leak-check=full --leak-resolution=high --num-callers=64 --log-file=x-valgrind --show-reachable=yes ./transmission -g /tmp/crash
+valgrind --tool=memcheck --leak-check=full --leak-resolution=high --num-callers=48 --log-file=x-valgrind --show-reachable=yes ./transmission -g /tmp/test

trunk/gtk/tr-core.c

@@ -459 +459 @@
 }
 
+static int
+tr_strcmp( const void * a,
+           const void * b )
+{
+    if( a && b ) return strcmp( a, b );
+    if( a ) return 1;
+    if( b ) return -1;
+    return 0;
+}
+
 #ifdef HAVE_GIO
 
@@ -596 +606 @@
         g_dir_close( dir );
     }
-}
-
-static int
-tr_strcmp( const void * a,
-           const void * b )
-{
-    if( a && b ) return strcmp( a, b );
-    if( a ) return 1;
-    if( b ) return -1;
-    return 0;
 }
 

trunk/gtk/tr-prefs.c

@@ -273 +273 @@
     GtkWidget *  w;
     GtkWidget *  w2;
-
-#ifdef HAVE_GIO
     GtkWidget *  l;
-#endif
 
     t = hig_workarea_create( );