Changeset 5450 for trunk/gtk/tr-prefs.c

Timestamp:

Mar 30, 2008, 3:20:18 AM (14 years ago)

Author:

charles

Message:

(gtk) better support for older versions of glib

File:

• trunk/gtk/tr-prefs.c (modified) (6 diffs)

trunk/gtk/tr-prefs.c

@@ -17 +17 @@
 #include <third-party/miniupnp/miniwget.h>
 #include <libtransmission/transmission.h>
+#include <libtransmission/utils.h>
 #include "conf.h"
 #include "hig.h"
@@ -310 +311 @@
     char * text = NULL;
     gchar * filename = NULL;
+    gchar * filename2 = NULL;
     int fd = -1;
     int ok = 1;
@@ -333 +335 @@
     {
         GError * err = NULL;
-        fd = g_file_open_tmp( "transmission-blockfile-XXXXXX.gz", &filename, &err );
+        fd = g_file_open_tmp( "transmission-blockfile-XXXXXX", &filename, &err );
         if( err ) {
             g_snprintf( data->secondary, sizeof( data->secondary ),
@@ -348 +350 @@
     if( ok && !data->abortFlag )
     {
+        filename2 = g_strdup_printf( "%s.txt", filename );
         g_snprintf( data->secondary, sizeof( data->secondary ),
                     _( "Uncompressing blocklist..." ) );
         g_idle_add( blocklistDialogSetSecondary, data );
-        char * cmd = g_strdup_printf( "gunzip %s", filename );
+        char * cmd = g_strdup_printf( "zcat %s > %s ", filename, filename2 );
+        tr_dbg( "%s", cmd );
         system( cmd );
         g_free( cmd );
@@ -360 +364 @@
                     _( "Parsing blocklist..." ) );
         g_idle_add( blocklistDialogSetSecondary, data );
-        filename[ strlen(filename) - 3 ] = '\0';
-        rules = tr_blocklistSetContent( tr_core_handle( data->core ), filename );
+        rules = tr_blocklistSetContent( tr_core_handle( data->core ), filename2 );
     }
     if( ok && !data->abortFlag )
@@ -373 +376 @@
     free( text );
     /* g_free( data ); */
-    unlink( filename );
+    if( filename2 ) {
+        unlink( filename2 );
+        g_free( filename2 );
+    }
+    if( filename ) {
+        unlink( filename );
+        g_free( filename );
+    }
     return NULL;
 }