Changeset 269 for trunk/gtk/tr_torrent.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_torrent.c (modified) (5 diffs)

trunk/gtk/tr_torrent.c

@@ -91 +91 @@
 tr_torrent_class_init(gpointer g_class, gpointer g_class_data SHUTUP) {
   GObjectClass *gobject_class = G_OBJECT_CLASS(g_class);
-  //TrTorrentClass *klass = TR_TORRENT_CLASS(g_class);
+  TrTorrentClass *klass = TR_TORRENT_CLASS(g_class);
   GParamSpec *pspec;
 
@@ -118 +118 @@
                                G_PARAM_READWRITE);
   g_object_class_install_property(gobject_class, TR_TORRENT_PAUSED, pspec);
+
+  klass->paused_signal_id = g_signal_newv("politely-stopped",
+                                          G_TYPE_FROM_CLASS(g_class),
+                                          G_SIGNAL_RUN_LAST, NULL, NULL, NULL,
+                                          g_cclosure_marshal_VOID__VOID,
+                                          G_TYPE_NONE, 0, NULL);
 }
 
@@ -127 +133 @@
   self->back = NULL;
   self->dir = NULL;
+  self->closing = FALSE;
   self->disposed = FALSE;
 }
@@ -341 +348 @@
     return;
 
+  if(tor->closing)
+    return;
+
   state->type = TYPE_DICT;
   state->val.l.vals = g_new0(benc_val_t, len);
@@ -379 +389 @@
   return (TR_STATUS_INACTIVE & st->status ? TRUE : FALSE);
 }
+
+void
+tr_torrent_stop_politely(TrTorrent *tor) {
+  tr_stat_t *st;
+
+  TR_IS_TORRENT(tor);
+
+  if(tor->disposed)
+    return;
+
+  if(!tor->closing) {
+    st = tr_torrent_stat(tor);
+    tor->closing = TRUE;
+    if(TR_STATUS_ACTIVE & st->status)
+      tr_torrentStop(tor->handle);
+  }
+}
+
+tr_stat_t *
+tr_torrent_stat_polite(TrTorrent *tor) {
+  TrTorrentClass *klass;
+  tr_stat_t *st = tr_torrentStat(tor->handle);
+
+  if(tor->disposed)
+    return st;
+
+  if(tor->closing && TR_STATUS_PAUSE & st->status) {
+    tor->closing = FALSE;
+    klass = g_type_class_peek(TR_TORRENT_TYPE);
+    g_signal_emit(tor, klass->paused_signal_id, 0, NULL);
+  }
+
+  return st;
+}