Changeset 269 for trunk/gtk/tr_backend.c

Timestamp:

May 31, 2006, 11:20:59 PM (16 years ago)

Author:

joshe

Message:

Wait and try to send a stopped event when removing a torrent.

File:

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

trunk/gtk/tr_backend.c

@@ -202 +202 @@
 tr_backend_save_state(TrBackend *back, char **errstr) {
   benc_val_t state;
-  int ii;
-  GList *jj;
+  GList *ii;
 
   TR_IS_BACKEND(back);
@@ -209 +208 @@
   bzero(&state, sizeof(state));
   state.type = TYPE_LIST;
-  state.val.l.alloc = state.val.l.count = g_list_length(back->torrents);
+  state.val.l.alloc = g_list_length(back->torrents);
   state.val.l.vals = g_new0(benc_val_t, state.val.l.alloc);
 
-  for(ii = 0, jj = back->torrents; NULL != jj; ii++, jj = jj->next)
-    tr_torrent_get_state(jj->data, state.val.l.vals + ii);
+  for(ii = back->torrents; NULL != ii; ii = ii->next) {
+    tr_torrent_get_state(ii->data, state.val.l.vals + state.val.l.count);
+    if(0 != state.val.l.vals[state.val.l.count].type)
+      state.val.l.count++;
+  }
 
   cf_savestate(&state, errstr);
@@ -269 +271 @@
 
   for(ii = back->torrents; NULL != ii; ii = ii->next)
-    if(TR_STATUS_ACTIVE & tr_torrent_stat(ii->data)->status)
-      tr_torrentStop(tr_torrent_handle(ii->data));
+    tr_torrent_stop_politely(ii->data);
 }
 
 gboolean
 tr_backend_torrents_stopped(TrBackend *back) {
-  GList *ii;
-
-  TR_IS_BACKEND(back);
-
-  for(ii = back->torrents; NULL != ii; ii = ii->next)
-    if(TR_STATUS_ACTIVE & tr_torrent_stat(ii->data)->status)
-      return FALSE;
-
-  return TRUE;
-}
+  GList *ii, *list;
+  gboolean ret = TRUE;
+
+  TR_IS_BACKEND(back);
+
+  list = g_list_copy(back->torrents);
+  for(ii = list; NULL != ii; ii = ii->next)
+    if(!(TR_STATUS_PAUSE & tr_torrent_stat_polite(ii->data)->status))
+      ret = FALSE;
+  g_list_free(list);
+
+  return ret;
+}