Changeset 10

Timestamp:

Jan 12, 2006, 6:45:41 PM (15 years ago)

Author:

root

Message:

Update 2005-12-01

Location:

trunk

Files:

• configure (modified) (1 diff)
• gtk/main.c (modified) (2 diffs)

trunk/configure

@@ -48 +48 @@
   if pkg-config gtk+-2.0 > /dev/null 2>&1
   then
-    cat > testconf.c << EOF
-    #include <gtk/gtk.h>
-    int main()
-    {
-      gtk_main();
-    }
-EOF
-    if $CC `pkg-config gtk+-2.0 --cflags --libs` -o testconf testconf.c > /dev/null 2>&1
+    if expr `pkg-config --modversion gtk+-2.0` '>=' 2.6.0 > /dev/null 2>&1
     then
-      echo "GTK+:    yes"
-      GTK=yes
-      GTKCCFLAGS=`pkg-config gtk+-2.0 --cflags`
-      GTKLINKLIBS=`pkg-config gtk+-2.0 --libs`
+      cat > testconf.c << EOF
+      #include <gtk/gtk.h>
+      int main()
+      {
+        gtk_main();
+      }
+EOF
+      if $CC `pkg-config gtk+-2.0 --cflags --libs` -o testconf testconf.c > /dev/null 2>&1
+      then
+        echo "GTK+:    yes"
+        GTK=yes
+        GTKCCFLAGS=`pkg-config gtk+-2.0 --cflags`
+        GTKLINKLIBS=`pkg-config gtk+-2.0 --libs`
+      else
+        echo "GTK+:    no"
+        GTK=no
+      fi
+      rm -f testconf.c testconf
     else
-      echo "GTK+:    no"
+      echo "GTK+:    no (2.6.0 or later is required)"
       GTK=no
     fi
-    rm -f testconf.c testconf
   else
     echo "GTK+:    no"

trunk/gtk/main.c

@@ -473 +473 @@
   free(st);
 
+  /* remove any excess rows */
+  if(gtk_tree_model_iter_next(GTK_TREE_MODEL(data->model), &iter))
+    while(gtk_list_store_remove(data->model, &iter))
+      ;
+
   return TRUE;
 }
@@ -593 +598 @@
         free(sb);
         tr_torrentClose(data->tr, index);
-        gtk_list_store_remove(GTK_LIST_STORE(model), &iter);
         savetorrents(data->tr, data->wind, -1, NULL);
+        updatemodel(data);
         break;
       case ACT_INFO: