Changeset 161

Timestamp:

Mar 20, 2006, 7:35:36 PM (16 years ago)

Author:

joshe

Message:

Update the GTK code for the new API.
Use a new scheme for handling fatal signals which should be more reliable.

Location:

branches/new_api/gtk

Files:

• conf.c (modified) (3 diffs)
• conf.h (modified) (1 diff)
• dialogs.c (modified) (10 diffs)
• dialogs.h (modified) (2 diffs)
• main.c (modified) (43 diffs)
• po/transmission-gtk.pot (modified) (14 diffs)
• util.c (modified) (2 diffs)
• util.h (modified) (1 diff)

branches/new_api/gtk/conf.c

@@ -415 +415 @@
 
 gboolean
-cf_savestate(int count, tr_stat_t *torrents, char **errstr) {
+cf_savestate(GList *torrents, char **errstr) {
   char *file = g_build_filename(confdir, FILE_STATE, NULL);
   char *tmpfile = g_build_filename(confdir, FILE_STATE_TMP, NULL);
   GIOChannel *io = NULL;
   GError *err;
-  int fd, ii;
+  int fd;
   char *torrentfile, *torrentdir, *line;
   gsize written;
   gboolean paused;
   GIOStatus res;
+  tr_stat_t *sb;
+  tr_info_t *in;
 
   *errstr = NULL;
@@ -445 +447 @@
 
   err = NULL;
-  for(ii = 0; ii < count; ii++) {
-    /* XXX need a better way to query running/stopped state */
-    paused = ((TR_STATUS_STOPPING | TR_STATUS_PAUSE) & torrents[ii].status);
-    torrentfile = g_strescape(torrents[ii].info.torrent, "");
-    torrentdir = g_strescape(torrents[ii].folder, "");
+  while(NULL != torrents) {
+    sb = tr_torrentStat(torrents->data);
+    in = tr_torrentInfo(torrents->data);
+    paused = (TR_STATUS_INACTIVE & sb->status);
+    torrentfile = g_strescape(in->torrent, "");
+    torrentdir = g_strescape(tr_torrentGetFolder(torrents->data), "");
     /* g_strcompress */
     line = g_strdup_printf("torrent=\"%s\" dir=\"%s\" paused=\"%s\"%c",
@@ -467 +470 @@
         goto done;
     }
+    torrents = torrents->next;
   }
   if(NULL != err ||

branches/new_api/gtk/conf.h

@@ -51 +51 @@
 cf_loadstate(char **errstr);
 gboolean
-cf_savestate(int count, tr_stat_t *torrents, char **errstr);
+cf_savestate(GList *torrents, char **errstr);
 void
 cf_freestate(struct cf_torrentstate *state);

branches/new_api/gtk/dialogs.c

@@ -50 +50 @@
   add_torrent_func_t addfunc;
   GtkWindow *parent;
-  tr_handle_t *tr;
   torrents_added_func_t donefunc;
-  void *donedata;
+  void *data;
   gboolean autostart;
   gboolean usingaltdir;
@@ -220 +219 @@
     }
 
+    /* XXX would be nice to have errno strings, are they printed to stdout? */
     tr_setBindPort(data->tr, gtk_spin_button_get_value_as_int(data->port));
     setlimit(data->tr);
@@ -241 +241 @@
 
 void
-makeaddwind(add_torrent_func_t addfunc, GtkWindow *parent, tr_handle_t *tr,
-            torrents_added_func_t donefunc, void *donedata) {
+makeaddwind(GtkWindow *parent, add_torrent_func_t addfunc,
+            torrents_added_func_t donefunc, void *cbdata) {
   GtkWidget *wind = gtk_file_chooser_dialog_new(_("Add a Torrent"), parent,
     GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
@@ -261 +261 @@
   data->addfunc = addfunc;
   data->parent = parent;
-  data->tr = tr;
   data->donefunc = donefunc;
-  data->donedata = donedata;
+  data->data = cbdata;
   data->autostart = TRUE;
   data->usingaltdir = FALSE;
@@ -327 +326 @@
     files = gtk_file_chooser_get_filenames(GTK_FILE_CHOOSER(widget));
     for(ii = files; NULL != ii; ii = ii->next)
-      if(data->addfunc(data->tr, data->parent, ii->data, dir,
+      if(data->addfunc(data->data, ii->data, dir,
+                       /* XXX need to group errors here */
                        !data->autostart, NULL))
         added = TRUE;
     if(added)
-      data->donefunc(data->donedata);
+      data->donefunc(data->data);
     if(NULL != dir)
       g_free(dir);
@@ -376 +376 @@
 
 void
-makeinfowind(GtkWindow *parent, tr_handle_t *tr, int id) {
+makeinfowind(GtkWindow *parent, tr_torrent_t *tor) {
   tr_stat_t *sb;
+  tr_info_t *in;
   GtkWidget *wind, *label;
   int ii;
@@ -384 +385 @@
   GtkWidget *table = gtk_table_new(rowcount, 2, FALSE);
 
-  /* XXX would be nice to be able to stat just one */
-  if(id >= tr_torrentStat(tr, &sb))
-    assert(!"XXX ");
-  str = g_strdup_printf(_("%s Properties"), sb[id].info.name);
+  sb = tr_torrentStat(tor);
+  in = tr_torrentInfo(tor);
+  str = g_strdup_printf(_("%s Properties"), in->name);
   wind = gtk_dialog_new_with_buttons(str, parent,
     GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR,
@@ -402 +402 @@
   label = gtk_label_new(NULL);
   gtk_label_set_selectable(GTK_LABEL(label), TRUE);
-  str = g_markup_printf_escaped("<big>%s</big>", sb[id].info.name);
+  str = g_markup_printf_escaped("<big>%s</big>", in->name);
   gtk_label_set_markup(GTK_LABEL(label), str);
   g_free(str);
@@ -411 +411 @@
   INFOSEP(table, ii);
 
-  if(80 == sb[id].info.trackerPort)
+  if(80 == in->trackerPort)
     INFOLINEA(table, ii, _("Tracker:"), g_strdup_printf("http://%s",
-              sb[id].info.trackerAddress));
+              in->trackerAddress));
   else
     INFOLINEA(table, ii, _("Tracker:"), g_strdup_printf("http://%s:%i",
-              sb[id].info.trackerAddress, sb[id].info.trackerPort));
-  INFOLINE(table, ii, _("Announce:"), sb[id].info.trackerAnnounce);
-  INFOLINEA(table, ii, _("Piece Size:"), readablesize(sb[id].info.pieceSize));
-  INFOLINEF(table, ii, "%i", _("Pieces:"), sb[id].info.pieceCount);
-  INFOLINEA(table, ii, _("Total Size:"), readablesize(sb[id].info.totalSize));
-  if(0 > sb[id].seeders)
+              in->trackerAddress, in->trackerPort));
+  INFOLINE(table, ii, _("Announce:"), in->trackerAnnounce);
+  INFOLINEA(table, ii, _("Piece Size:"), readablesize(in->pieceSize));
+  INFOLINEF(table, ii, "%i", _("Pieces:"), in->pieceCount);
+  INFOLINEA(table, ii, _("Total Size:"), readablesize(in->totalSize));
+  if(0 > sb->seeders)
     INFOLINE(table, ii, _("Seeders:"), _("?"));
   else
-    INFOLINEF(table, ii, "%i", _("Seeders:"), sb[id].seeders);
-  if(0 > sb[id].leechers)
+    INFOLINEF(table, ii, "%i", _("Seeders:"), sb->seeders);
+  if(0 > sb->leechers)
     INFOLINE(table, ii, _("Leechers:"), _("?"));
   else
-    INFOLINEF(table, ii, "%i", _("Leechers:"), sb[id].leechers);
+    INFOLINEF(table, ii, "%i", _("Leechers:"), sb->leechers);
 
   INFOSEP(table, ii);
 
-  INFOLINE(table, ii, _("Directory:"), sb[id].folder);
-  INFOLINEA(table, ii, _("Downloaded:"), readablesize(sb[id].downloaded));
-  INFOLINEA(table, ii, _("Uploaded:"), readablesize(sb[id].uploaded));
+  INFOLINE(table, ii, _("Directory:"), tr_torrentGetFolder(tor));
+  INFOLINEA(table, ii, _("Downloaded:"), readablesize(sb->downloaded));
+  INFOLINEA(table, ii, _("Uploaded:"), readablesize(sb->uploaded));
 
   INFOSEP(table, ii);
@@ -444 +444 @@
                    G_CALLBACK(gtk_widget_destroy), NULL);
   gtk_widget_show_all(wind);
-  free(sb);
-}
+}

branches/new_api/gtk/dialogs.h

@@ -38 +38 @@
 #define DEFAULT_UPLIMIT         20
 
-typedef gboolean (*add_torrent_func_t)(tr_handle_t*, GtkWindow*, const char*, const char *, gboolean, GList **);
+typedef gboolean (*add_torrent_func_t)(void *, const char *, const char *, gboolean, GList **);
 typedef void (*torrents_added_func_t)(void *);
 
@@ -50 +50 @@
 /* show the "add a torrent" dialog */
 void
-makeaddwind(add_torrent_func_t addfunc, GtkWindow *parent, tr_handle_t *tr,
-            torrents_added_func_t donefunc, void *donedata);
+makeaddwind(GtkWindow *parent, add_torrent_func_t addfunc,
+            torrents_added_func_t donefunc, void *cbdata);
 
 /* show the info window for a torrent */
 void
-makeinfowind(GtkWindow *parent, tr_handle_t *tr, int index);
+makeinfowind(GtkWindow *parent, tr_torrent_t *tor);
 
 #endif /* TG_PREFS_H */

branches/new_api/gtk/main.c

@@ -28 +28 @@
 #include <assert.h>
 #include <errno.h>
+#include <signal.h>
 #include <string.h>
 #include <stdio.h>
@@ -51 +52 @@
   tr_handle_t *tr;
   GtkWindow *wind;
-  GtkListStore *model;
+  GtkTreeModel *model;
   GtkTreeView *view;
   GtkStatusbar *bar;
@@ -78 +79 @@
 void
 makewind(GtkWidget *wind, tr_handle_t *tr, GList *saved);
-gboolean
-winclose(GtkWidget *widget, GdkEvent *event, gpointer gdata);
-gboolean
-exitcheck(gpointer gdata);
-void
-stoptransmission(void *tr);
-void
-setupdrag(GtkWidget *widget, struct cbdata *data);
-void
-gotdrag(GtkWidget *widget, GdkDragContext *dc, gint x, gint y,
-        GtkSelectionData *sel, guint info, guint time, gpointer gdata);
 GtkWidget *
 makewind_toolbar(struct cbdata *data);
 GtkWidget *
 makewind_list(struct cbdata *data);
+gboolean
+winclose(GtkWidget *widget, GdkEvent *event, gpointer gdata);
+gboolean
+exitcheck(gpointer gdata);
+void
+stoptransmission(tr_handle_t *tr);
+void
+setupdrag(GtkWidget *widget, struct cbdata *data);
+void
+gotdrag(GtkWidget *widget, GdkDragContext *dc, gint x, gint y,
+        GtkSelectionData *sel, guint info, guint time, gpointer gdata);
 static void
 stylekludge(GObject *obj, GParamSpec *spec, gpointer gdata);
@@ -114 +115 @@
             GList *ids, int status);
 void
-killmenu(GtkWidget *menu, gpointer *gdata SHUTUP);
+killmenu(GtkWidget *menu, gpointer *gdata);
 void
 actionclick(GtkWidget *widget, gpointer gdata);
+void
+findtorrent(GtkTreeModel *model, tr_torrent_t *tor, GtkTreeIter *iter);
 gint
 intrevcmp(gconstpointer a, gconstpointer b);
@@ -124 +127 @@
 
 gboolean
-addtorrent(tr_handle_t *tr, GtkWindow *parentwind, const char *torrent,
-           const char *dir, gboolean paused, GList **errs);
+addtorrent(void *vdata, const char *torrent, const char *dir, gboolean paused,
+           GList **errs);
 void
 addedtorrents(void *vdata);
 gboolean
-savetorrents(tr_handle_t *tr, GtkWindow *wind, int count, tr_stat_t *stat);
+savetorrents(tr_handle_t *tr, GtkWindow *wind);
 void
 orstatus(GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter,
@@ -136 +139 @@
 makeidlist(GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter,
            gpointer gdata);
+void
+maketorrentlist(tr_torrent_t *tor, void *data);
+void
+setupsighandlers(void);
+void
+fatalsig(int sig);
 
 #define TR_TYPE_PIECES_NAME     "tr-type-pieces"
@@ -147 +156 @@
 enum listfrom { FROM_BUTTON, FROM_POPUP };
 
-#define LIST_INDEX            "torrent-list-indexes"
+#define LIST_IDS              "torrent-list-ids"
 #define LIST_MENU_WIDGET      "torrent-list-popup-menu-widget"
 
@@ -156 +165 @@
    N_("Add a new torrent"), "XXX"},
   {N_("Start"),       GTK_STOCK_EXECUTE,      ACT_START,  FALSE,
-   (TR_STATUS_STOPPING | TR_STATUS_PAUSE),
+   TR_STATUS_INACTIVE,
    N_("Start a torrent that is not running"), "XXX"},
   {N_("Stop"),        GTK_STOCK_STOP,         ACT_STOP,   FALSE,
-   ~(TR_STATUS_STOPPING | TR_STATUS_PAUSE),
+   TR_STATUS_ACTIVE,
    N_("Stop a torrent that is running"), "XXX"},
   {N_("Remove"),      GTK_STOCK_REMOVE,       ACT_DELETE, FALSE, ~0,
@@ -170 +179 @@
 
 #define CBDATA_PTR              "callback-data-pointer"
+
+#define SIGCOUNT_MAX            3
+
+static sig_atomic_t global_sigcount = 0;
+static int global_lastsig = 0;
+
 int
 main(int argc, char **argv) {
@@ -179 +194 @@
   long intval;
 
+  setupsighandlers();
+
   gtk_init(&argc, &argv);
 
@@ -187 +204 @@
 
   tr = tr_init();
-
-  setuphandlers(stoptransmission, tr);
 
   gtk_rc_parse_string(
@@ -306 +321 @@
   for(ii = g_list_first(saved); NULL != ii; ii = ii->next) {
     ts = ii->data;
-    addtorrent(tr, GTK_WINDOW(wind), ts->ts_torrent, ts->ts_directory,
-               ts->ts_paused, &loaderrs);
+    addtorrent(data, ts->ts_torrent, ts->ts_directory, ts->ts_paused,
+               &loaderrs);
     cf_freestate(ts);
   }
@@ -320 +335 @@
     g_list_free(loaderrs);
     g_free(str);
-    savetorrents(tr, GTK_WINDOW(wind), -1, NULL);
+    savetorrents(tr, GTK_WINDOW(wind));
   }
 
@@ -341 +356 @@
 }
 
-/* XXX is this the right thing to do? */
-#define TR_TORRENT_NEEDS_STOP(t) \
-  ((t) & TR_STATUS_CHECK || (t) & TR_STATUS_DOWNLOAD || (t) & TR_STATUS_SEED)
+GtkWidget *
+makewind_toolbar(struct cbdata *data) {
+  GtkWidget *bar = gtk_toolbar_new();
+  GtkToolItem *item;
+  unsigned int ii;
+
+  gtk_toolbar_set_tooltips(GTK_TOOLBAR(bar), TRUE);
+  gtk_toolbar_set_show_arrow(GTK_TOOLBAR(bar), FALSE);
+  gtk_toolbar_set_style(GTK_TOOLBAR(bar), GTK_TOOLBAR_BOTH);
+
+  data->buttons = g_new(GtkWidget*, ALEN(actionitems));
+
+  for(ii = 0; ii < ALEN(actionitems); ii++) {
+    item = gtk_tool_button_new_from_stock(actionitems[ii].id);
+    data->buttons[ii] = GTK_WIDGET(item);
+    gtk_tool_button_set_label(GTK_TOOL_BUTTON(item),
+                              gettext(actionitems[ii].name));
+    gtk_tool_item_set_tooltip(GTK_TOOL_ITEM(item), GTK_TOOLBAR(bar)->tooltips,
+                              gettext(actionitems[ii].ttext),
+                              actionitems[ii].tpriv);
+    g_object_set_data(G_OBJECT(item), LIST_ACTION,
+                      GINT_TO_POINTER(actionitems[ii].act));
+    g_object_set_data(G_OBJECT(item), LIST_ACTION_FROM,
+                      GINT_TO_POINTER(FROM_BUTTON));
+    g_signal_connect(G_OBJECT(item), "clicked", G_CALLBACK(actionclick), data);
+    gtk_toolbar_insert(GTK_TOOLBAR(bar), item, -1);
+  }
+
+  return bar;
+}
+
+/* XXX check for unused data in model */
+enum {MC_NAME, MC_SIZE, MC_STAT, MC_ERR, MC_TERR, MC_PROG, MC_DRATE, MC_URATE,
+      MC_ETA, MC_PEERS, MC_UPEERS, MC_DPEERS, MC_PIECES, MC_DOWN, MC_UP,
+      MC_TORRENT, MC_ROW_COUNT};
+
+GtkWidget *
+makewind_list(struct cbdata *data) {
+  GType types[] = {
+    /* info->name, info->totalSize, status,     error,      trackerError, */
+    G_TYPE_STRING, G_TYPE_UINT64,   G_TYPE_INT, G_TYPE_INT, G_TYPE_STRING,
+    /* progress,  rateDownload, rateUpload,   eta,        peersTotal, */
+    G_TYPE_FLOAT, G_TYPE_FLOAT, G_TYPE_FLOAT, G_TYPE_INT, G_TYPE_INT,
+    /* peersUploading, peersDownloading, pieces,         downloaded, */
+    G_TYPE_INT,        G_TYPE_INT,       TR_TYPE_PIECES, G_TYPE_UINT64,
+    /* uploaded,   the handle for the torrent */
+    G_TYPE_UINT64, G_TYPE_POINTER};
+  GtkListStore *store;
+  GtkWidget *view;
+  GtkTreeViewColumn *col;
+  GtkTreeSelection *sel;
+  GtkCellRenderer *namerend, *progrend;
+  char *str;
+
+  assert(MC_ROW_COUNT == ALEN(types));
+
+  store = gtk_list_store_newv(MC_ROW_COUNT, types);
+  view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(store));
+  /* XXX do I need to worry about reference counts anywhere else? */
+  g_object_unref(G_OBJECT(store));
+  data->model = GTK_TREE_MODEL(store);
+  data->view = GTK_TREE_VIEW(view);
+
+  namerend = gtk_cell_renderer_text_new();
+  col = gtk_tree_view_column_new_with_attributes(_("Name"), namerend, NULL);
+  gtk_tree_view_column_set_cell_data_func(col, namerend, dfname, NULL, NULL);
+  gtk_tree_view_column_set_expand(col, TRUE);
+  gtk_tree_view_append_column(GTK_TREE_VIEW(view), col);
+
+  progrend = tr_cell_renderer_torrent_new();
+  /* this string is only used to determing the size of the progress bar */
+  str = g_markup_printf_escaped("<big>%s</big>", _("  fnord    fnord  "));
+  g_object_set(progrend, "label", str, NULL);
+  g_free(str);
+  col = gtk_tree_view_column_new_with_attributes(_("Progress"), progrend, NULL);
+  gtk_tree_view_column_set_cell_data_func(col, progrend, dfprog, NULL, NULL);
+  gtk_tree_view_append_column(GTK_TREE_VIEW(view), col);
+
+  /* XXX this shouldn't be necessary */
+  g_signal_connect(view, "notify", G_CALLBACK(stylekludge), progrend);
+
+  gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(view), TRUE);
+  sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(view));
+  gtk_tree_selection_set_mode(GTK_TREE_SELECTION(sel), GTK_SELECTION_MULTIPLE);
+  g_signal_connect(G_OBJECT(sel), "changed", G_CALLBACK(fixbuttons), data);
+  g_signal_connect(G_OBJECT(view), "button-press-event",
+                   G_CALLBACK(listclick), data);
+  g_signal_connect(G_OBJECT(view), "popup-menu", G_CALLBACK(listpopup), data);
+  g_signal_connect(G_OBJECT(view), "row-activated",
+                   G_CALLBACK(doubleclick), data);
+  gtk_widget_show_all(view);
+
+  return view;
+}
 
 gboolean
@@ -350 +456 @@
   struct exitdata *edata;
   tr_stat_t *st;
-  int ii;
+  GtkTreeIter iter;
+  tr_torrent_t *tor;
+  gboolean going;
 
   if(0 >= data->timer)
@@ -356 +464 @@
   data->timer = -1;
 
-  blocksigs();
-
-  for(ii = tr_torrentStat(data->tr, &st); 0 < ii; ii--) {
-    if(TR_TORRENT_NEEDS_STOP(st[ii-1].status)) {
-      /*fprintf(stderr, "quit: stopping %i %s\n", ii, st[ii-1].info.name);*/
-      tr_torrentStop(data->tr, ii - 1);
+  going = gtk_tree_model_get_iter_first(data->model, &iter);
+  while(going) {
+    gtk_tree_model_get(data->model, &iter, MC_TORRENT, &tor, -1);
+    st = tr_torrentStat(tor);
+    if(TR_STATUS_ACTIVE & st->status) {
+      tr_torrentStop(tor);
+      going = gtk_tree_model_iter_next(data->model, &iter);
     } else {
-      /*fprintf(stderr, "quit: closing %i %s\n", ii, st[ii-1].info.name);*/
-      tr_torrentClose(data->tr, ii - 1);
+      tr_torrentClose(data->tr, tor);
+      going = gtk_list_store_remove(GTK_LIST_STORE(data->model), &iter);
     }
   }
-  free(st);
-
-  unblocksigs();
 
   /* XXX should disable widgets or something */
@@ -379 +485 @@
   edata->timer = g_timeout_add(500, exitcheck, edata);
 
-  /*fprintf(stderr, "quit: starting timeout at %i\n", edata->started);*/
-
   /* returning FALSE means to destroy the window */
   return TRUE;
@@ -389 +493 @@
   struct exitdata *data = gdata;
   tr_stat_t *st;
-  int ii;
-
-  blocksigs();
-
-  for(ii = tr_torrentStat(data->cbdata->tr, &st); 0 < ii; ii--) {
-    if(TR_STATUS_PAUSE & st[ii-1].status) {
-      /*fprintf(stderr, "quit: closing %i %s\n", ii, st[ii-1].info.name);*/
-      tr_torrentClose(data->cbdata->tr, ii - 1);
+  GtkTreeIter iter;
+  tr_torrent_t *tor;
+  gboolean go;
+
+  go = gtk_tree_model_get_iter_first(data->cbdata->model, &iter);
+  while(go) {
+    gtk_tree_model_get(data->cbdata->model, &iter, MC_TORRENT, &tor, -1);
+    st = tr_torrentStat(tor);
+    if(!(TR_STATUS_PAUSE & st->status))
+      go = gtk_tree_model_iter_next(data->cbdata->model, &iter);
+    else {
+      tr_torrentClose(data->cbdata->tr, tor);
+      go = gtk_list_store_remove(GTK_LIST_STORE(data->cbdata->model), &iter);
     }
   }
-  free(st);
-
-  /*fprintf(stderr, "quit: %i torrents left at %i\n",
-    tr_torrentCount(data->cbdata->tr), time(NULL));*/
+
   /* keep going if we still have torrents and haven't hit the exit timeout */
   if(0 < tr_torrentCount(data->cbdata->tr) &&
      time(NULL) - data->started < TRACKER_EXIT_TIMEOUT) {
+    assert(gtk_tree_model_get_iter_first(data->cbdata->model, &iter));
     updatemodel(data->cbdata);
-    unblocksigs();
     return TRUE;
   }
@@ -417 +523 @@
   data->timer = -1;
 
-  /*fprintf(stderr, "quit: giving up on %i torrents\n",
-    tr_torrentCount(data->cbdata->tr));*/
   stoptransmission(data->cbdata->tr);
-  clearhandlers();
-  unblocksigs();
 
   gtk_widget_destroy(GTK_WIDGET(data->cbdata->wind));
@@ -432 +534 @@
 
 void
-stoptransmission(void *tr) {
-  while(0 < tr_torrentCount(tr))
-    tr_torrentClose(tr, 0);
+stoptransmission(tr_handle_t *tr) {
+  GList *list, *ii;
+
+  list = NULL;
+  tr_torrentIterate(tr, maketorrentlist, &list);
+  for(ii = g_list_first(list); NULL != ii; ii = ii->next)
+    tr_torrentClose(tr, ii->data);
+  g_list_free(list);
+
   tr_close(tr);
 }
@@ -501 +609 @@
               deslashed = hostless;
             /* finally, try to add it as a torrent */
-            if(addtorrent(data->tr, data->wind, deslashed, NULL, FALSE, &errs))
+            if(addtorrent(data, deslashed, NULL, FALSE, &errs))
               gotfile = TRUE;
           }
@@ -542 +650 @@
 }
 
-GtkWidget *
-makewind_toolbar(struct cbdata *data) {
-  GtkWidget *bar = gtk_toolbar_new();
-  GtkToolItem *item;
-  unsigned int ii;
-
-  gtk_toolbar_set_tooltips(GTK_TOOLBAR(bar), TRUE);
-  gtk_toolbar_set_show_arrow(GTK_TOOLBAR(bar), FALSE);
-  gtk_toolbar_set_style(GTK_TOOLBAR(bar), GTK_TOOLBAR_BOTH);
-
-  data->buttons = g_new(GtkWidget*, ALEN(actionitems));
-
-  for(ii = 0; ii < ALEN(actionitems); ii++) {
-    item = gtk_tool_button_new_from_stock(actionitems[ii].id);
-    data->buttons[ii] = GTK_WIDGET(item);
-    gtk_tool_button_set_label(GTK_TOOL_BUTTON(item), gettext(actionitems[ii].name));
-    gtk_tool_item_set_tooltip(GTK_TOOL_ITEM(item), GTK_TOOLBAR(bar)->tooltips,
-                              gettext(actionitems[ii].ttext), actionitems[ii].tpriv);
-    g_object_set_data(G_OBJECT(item), LIST_ACTION,
-                      GINT_TO_POINTER(actionitems[ii].act));
-    g_object_set_data(G_OBJECT(item), LIST_ACTION_FROM,
-                      GINT_TO_POINTER(FROM_BUTTON));
-    g_signal_connect(G_OBJECT(item), "clicked", G_CALLBACK(actionclick), data);
-    gtk_toolbar_insert(GTK_TOOLBAR(bar), item, -1);
-  }
-
-  return bar;
-}
-
-/* XXX check for unused data in model */
-enum {MC_NAME, MC_SIZE, MC_STAT, MC_ERR, MC_PROG, MC_DRATE, MC_URATE,
-      MC_ETA, MC_PEERS, MC_UPEERS, MC_DPEERS, MC_PIECES, MC_DOWN, MC_UP,
-      MC_ROW_INDEX, MC_ROW_COUNT};
-
-GtkWidget *
-makewind_list(struct cbdata *data) {
-  GType types[] = {
-    /* info->name, info->totalSize, status,     error,         progress */
-    G_TYPE_STRING, G_TYPE_UINT64,   G_TYPE_INT, G_TYPE_STRING, G_TYPE_FLOAT,
-    /* rateDownload, rateUpload,   eta,        peersTotal, peersUploading */
-    G_TYPE_FLOAT,    G_TYPE_FLOAT, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT,
-    /* peersDownloading, pieces,         downloaded,    uploaded */
-    G_TYPE_INT,          TR_TYPE_PIECES, G_TYPE_UINT64, G_TYPE_UINT64,
-    /* index into the torrent array */
-    G_TYPE_INT};
-  GtkListStore *model;
-  GtkWidget *view;
-  GtkTreeViewColumn *col;
-  GtkTreeSelection *sel;
-  GtkCellRenderer *namerend, *progrend;
-  char *str;
-
-  assert(MC_ROW_COUNT == ALEN(types));
-
-  model = gtk_list_store_newv(MC_ROW_COUNT, types);
-  view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(model));
-  /* XXX do I need to worry about reference counts anywhere else? */
-  g_object_unref(G_OBJECT(model));
-  data->model = model;
-  data->view = GTK_TREE_VIEW(view);
-
-  namerend = gtk_cell_renderer_text_new();
-  col = gtk_tree_view_column_new_with_attributes(_("Name"), namerend, NULL);
-  gtk_tree_view_column_set_cell_data_func(col, namerend, dfname, NULL, NULL);
-  gtk_tree_view_column_set_expand(col, TRUE);
-  gtk_tree_view_append_column(GTK_TREE_VIEW(view), col);
-
-  progrend = tr_cell_renderer_torrent_new();
-  /* this string is only used to determing the size of the progress bar */
-  str = g_markup_printf_escaped("<big>%s</big>", _("  fnord    fnord  "));
-  g_object_set(progrend, "label", str, NULL);
-  g_free(str);
-  col = gtk_tree_view_column_new_with_attributes(_("Progress"), progrend, NULL);
-  gtk_tree_view_column_set_cell_data_func(col, progrend, dfprog, NULL, NULL);
-  gtk_tree_view_append_column(GTK_TREE_VIEW(view), col);
-
-  /* XXX this shouldn't be necessary */
-  g_signal_connect(view, "notify", G_CALLBACK(stylekludge), progrend);
-
-  gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(view), TRUE);
-  sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(view));
-  gtk_tree_selection_set_mode(GTK_TREE_SELECTION(sel), GTK_SELECTION_MULTIPLE);
-  g_signal_connect(G_OBJECT(sel), "changed", G_CALLBACK(fixbuttons), data);
-  g_signal_connect(G_OBJECT(view), "button-press-event",
-                   G_CALLBACK(listclick), data);
-  g_signal_connect(G_OBJECT(view), "popup-menu", G_CALLBACK(listpopup), data);
-  g_signal_connect(G_OBJECT(view), "row-activated",
-                   G_CALLBACK(doubleclick), data);
-  gtk_widget_show_all(view);
-
-  return view;
-}
-
 /* kludge to have the progress bars notice theme changes */
 static void
@@ -667 +682 @@
 dfname(GtkTreeViewColumn *col SHUTUP, GtkCellRenderer *rend,
        GtkTreeModel *model, GtkTreeIter *iter, gpointer gdata SHUTUP) {
-  char *name, *mb, *err, *str, *top, *bottom;
+  char *name, *mb, *terr, *str, *top, *bottom;
   guint64 size;
   gfloat prog;
-  int status, eta, tpeers, upeers, dpeers;
-
-  /* XXX should I worry about gtk_tree_model_get failing? */
+  int status, err, eta, tpeers, upeers, dpeers;
+
   gtk_tree_model_get(model, iter, MC_NAME, &name, MC_STAT, &status,
-    MC_SIZE, &size, MC_PROG, &prog, MC_ETA, &eta, MC_PEERS, &tpeers,
-    MC_UPEERS, &upeers, MC_DPEERS, &dpeers, -1);
+    MC_ERR, &err, MC_SIZE, &size, MC_PROG, &prog, MC_ETA, &eta,
+    MC_PEERS, &tpeers, MC_UPEERS, &upeers, MC_DPEERS, &dpeers, -1);
 
   if(0 > tpeers)
@@ -708 +722 @@
   }
 
-  if(status & TR_TRACKER_ERROR) {
-    gtk_tree_model_get(model, iter, MC_ERR, &err, -1);
-    bottom = g_strconcat(_("Error: "), err, NULL);
-    g_free(err);
+  if(TR_NOERROR != err) {
+    gtk_tree_model_get(model, iter, MC_TERR, &terr, -1);
+    bottom = g_strconcat(_("Error: "), terr, NULL);
+    g_free(terr);
   }
   else if(status & TR_STATUS_DOWNLOAD)
@@ -737 +751 @@
   guint64 down, up;
 
-  /* XXX should I worry about gtk_tree_model_get failing? */
   gtk_tree_model_get(model, iter, MC_PROG, &prog, MC_DRATE, &dl, MC_URATE, &ul,
                      MC_DOWN, &down, MC_UP, &up, -1);
@@ -764 +777 @@
 updatemodel(gpointer gdata) {
   struct cbdata *data = gdata;
+  tr_torrent_t *tor;
   tr_stat_t *st;
-  int ii, max;
+  tr_info_t *in;
   GtkTreeIter iter;
   float up, down;
   char *upstr, *downstr, *str;
 
-  blocksigs();
-
-  max = tr_torrentStat(data->tr, &st);
-  for(ii = 0; ii < max; ii++) {
-    if(!(ii ? gtk_tree_model_iter_next(GTK_TREE_MODEL(data->model), &iter) :
-         gtk_tree_model_get_iter_first(GTK_TREE_MODEL(data->model), &iter)))
-      gtk_list_store_append(data->model, &iter);
-    /* XXX find out if setting the same data emits changed signal */
-    gtk_list_store_set(
-      data->model, &iter, MC_ROW_INDEX, ii,
-      MC_NAME, st[ii].info.name, MC_SIZE, st[ii].info.totalSize,
-      MC_STAT, st[ii].status, MC_ERR, st[ii].error, MC_PROG, st[ii].progress,
-      MC_DRATE, st[ii].rateDownload, MC_URATE, st[ii].rateUpload,
-      MC_ETA, st[ii].eta, MC_PEERS, st[ii].peersTotal,
-      MC_UPEERS, st[ii].peersUploading, MC_DPEERS, st[ii].peersDownloading,
-      MC_DOWN, st[ii].downloaded, MC_UP, st[ii].uploaded, -1);
-  }
-  free(st);
-
-  /* remove any excess rows */
-  if(ii ? gtk_tree_model_iter_next(GTK_TREE_MODEL(data->model), &iter) :
-     gtk_tree_model_get_iter_first(GTK_TREE_MODEL(data->model), &iter))
-    while(gtk_list_store_remove(data->model, &iter))
-      ;
+  if(0 < global_sigcount) {
+    stoptransmission(data->tr);
+    global_sigcount = SIGCOUNT_MAX;
+    raise(global_lastsig);
+  }
+
+  if(gtk_tree_model_get_iter_first(data->model, &iter)) {
+    do {
+      gtk_tree_model_get(data->model, &iter, MC_TORRENT, &tor, -1);
+      st = tr_torrentStat(tor);
+      in = tr_torrentInfo(tor);
+      /* XXX find out if setting the same data emits changed signal */
+      gtk_list_store_set(GTK_LIST_STORE(data->model), &iter, MC_NAME, in->name,
+        MC_SIZE, in->totalSize, MC_STAT, st->status, MC_ERR, st->error,
+        MC_TERR, st->trackerError, MC_PROG, st->progress,
+        MC_DRATE, st->rateDownload, MC_URATE, st->rateUpload, MC_ETA, st->eta,
+        MC_PEERS, st->peersTotal, MC_UPEERS, st->peersUploading,
+        MC_DPEERS, st->peersDownloading, MC_DOWN, st->downloaded,
+        MC_UP, st->uploaded, -1);
+    } while(gtk_tree_model_iter_next(data->model, &iter));
+  }
 
   /* update the status bar */
@@ -810 +821 @@
   fixbuttons(NULL, data);
 
-  unblocksigs();
-
   return TRUE;
 }
@@ -822 +831 @@
   GtkTreePath *path;
   GtkTreeIter iter;
-  int index, status;
+  int status;
+  gpointer tor;
   GList *ids;
 
@@ -832 +842 @@
       dopopupmenu(event, data, NULL, 0);
     else {
-      if(gtk_tree_model_get_iter(GTK_TREE_MODEL(data->model), &iter, path)) {
+      if(gtk_tree_model_get_iter(data->model, &iter, path)) {
         /* get ID and status for the right-clicked row */
-        gtk_tree_model_get(GTK_TREE_MODEL(data->model), &iter,
-                           MC_ROW_INDEX, &index, MC_STAT, &status, -1);
+        gtk_tree_model_get(data->model, &iter, MC_TORRENT, &tor,
+                           MC_STAT, &status, -1);
         /* get a list of selected IDs */
         ids = NULL;
         gtk_tree_selection_selected_foreach(sel, makeidlist, &ids);
         /* is the clicked row selected? */
-        if(NULL == g_list_find(ids, GINT_TO_POINTER(index))) {
+        if(NULL == g_list_find(ids, tor)) {
           /* no, do the popup for just the clicked row */
           g_list_free(ids);
-          dopopupmenu(event, data, g_list_append(NULL, GINT_TO_POINTER(index)),
-                      status);
+          dopopupmenu(event, data, g_list_append(NULL, tor), status);
         } else {
           /* yes, do the popup for all the selected rows */
@@ -863 +872 @@
   struct cbdata *data = gdata;
   GtkTreeSelection *sel = gtk_tree_view_get_selection(data->view);
-  GtkTreeModel *model;
   GList *ids;
   int status;
@@ -870 +878 @@
     dopopupmenu(NULL, data, NULL, 0);
   else {
-    assert(model == GTK_TREE_MODEL(data->model));
     status = 0;
     gtk_tree_selection_selected_foreach(sel, orstatus, &status);
@@ -901 +908 @@
                       GINT_TO_POINTER(FROM_POPUP));
     /* set a glist of selected torrent's IDs */
-    g_object_set_data(G_OBJECT(item), LIST_INDEX, ids);
+    g_object_set_data(G_OBJECT(item), LIST_IDS, ids);
     /* set the menu widget, so the activate handler can destroy it */
     g_object_set_data(G_OBJECT(item), LIST_MENU_WIDGET, menu);
@@ -910 +917 @@
 
   /* set up the glist to be freed when the menu is destroyed */
-  g_object_set_data_full(G_OBJECT(menu), LIST_INDEX, ids,
+  g_object_set_data_full(G_OBJECT(menu), LIST_IDS, ids,
                          (GDestroyNotify)g_list_free);
 
@@ -936 +943 @@
   enum listfrom from =
     GPOINTER_TO_INT(g_object_get_data(G_OBJECT(widget), LIST_ACTION_FROM));
-  int index, count;
   unsigned int actindex;
   tr_stat_t *sb;
   GList *ids, *ii;
+  tr_torrent_t *tor;
   gboolean updatesave;
+  GtkTreeIter iter;
 
   /* destroy the popup menu, if any */
@@ -948 +956 @@
   switch(act) {
     case ACT_OPEN:
-      makeaddwind(addtorrent, data->wind, data->tr, addedtorrents, data);
+      makeaddwind(data->wind, addtorrent, addedtorrents, data);
       return;
     case ACT_PREF:
@@ -962 +970 @@
       ids = NULL;
       gtk_tree_selection_selected_foreach(sel, makeidlist, &ids);
-      /* XXX should I assert(0 <= index) to insure a row was selected? */
       break;
     case FROM_POPUP:
-      ids = g_object_get_data(G_OBJECT(widget), LIST_INDEX);
+      ids = g_object_get_data(G_OBJECT(widget), LIST_IDS);
       break;
     default:
@@ -977 +984 @@
   assert(actindex < ALEN(actionitems));
 
-  blocksigs();
   updatesave = FALSE;
-  count = tr_torrentStat(data->tr, &sb);
 
   for(ii = g_list_sort(ids, intrevcmp); NULL != ii; ii = ii->next) {
-    index = GPOINTER_TO_INT(ii->data);
-    if(index >= count) {
-      assert(!"illegal torrent id");
-      continue;
-    }
+    tor = ii->data;
+    sb = tr_torrentStat(tor);
+
     /* check if this action is valid for this torrent */
     if(actionitems[actindex].nomenu ||
        (actionitems[actindex].avail &&
-        !(actionitems[actindex].avail & sb[index].status)))
+        !(actionitems[actindex].avail & sb->status)))
       continue;
 
     switch(act) {
       case ACT_START:
-        tr_torrentStart(data->tr, index);
+        tr_torrentStart(tor);
         updatesave = TRUE;
         break;
       case ACT_STOP:
-        tr_torrentStop(data->tr, index);
+        tr_torrentStop(tor);
         updatesave = TRUE;
         break;
       case ACT_DELETE:
-        if(TR_TORRENT_NEEDS_STOP(sb[index].status))
-          tr_torrentStop(data->tr, index);
-        tr_torrentClose(data->tr, index);
+        if(TR_STATUS_ACTIVE & sb->status)
+          tr_torrentStop(tor);
+        tr_torrentClose(data->tr, tor);
+        findtorrent(data->model, tor, &iter);
+        gtk_list_store_remove(GTK_LIST_STORE(data->model), &iter);
         updatesave = TRUE;
         /* XXX should only unselect deleted rows */
-        gtk_tree_selection_unselect_all(gtk_tree_view_get_selection(data->view));
+        gtk_tree_selection_unselect_all(
+          gtk_tree_view_get_selection(data->view));
         break;
       case ACT_INFO:
-        makeinfowind(data->wind, data->tr, index);
+        makeinfowind(data->wind, tor);
         break;
       default:
@@ -1018 +1024 @@
     }
   }
-  free(sb);
 
   if(updatesave) {
-    savetorrents(data->tr, data->wind, -1, NULL);
+    savetorrents(data->tr, data->wind);
     updatemodel(data);
   }
-
-  unblocksigs();
 
   if(FROM_BUTTON == from)
     g_list_free(ids);
+}
+
+void
+findtorrent(GtkTreeModel *model, tr_torrent_t *tor, GtkTreeIter *iter) {
+  gpointer ptr;
+
+  if(gtk_tree_model_get_iter_first(model, iter)) {
+    do {
+      gtk_tree_model_get(model, iter, MC_TORRENT, &ptr, -1);
+      if(tor == ptr)
+        return;
+    } while(gtk_tree_model_iter_next(model, iter));
+  }
+
+  assert(!"torrent not found");
 }
 
@@ -1049 +1067 @@
   struct cbdata *data = gdata;
   GtkTreeIter iter;
-  int index;
-
-  if(gtk_tree_model_get_iter(GTK_TREE_MODEL(data->model), &iter, path)) {
-    gtk_tree_model_get(GTK_TREE_MODEL(data->model), &iter,
-                       MC_ROW_INDEX, &index, -1);
-    makeinfowind(data->wind, data->tr, index);
-  }
-}
-
-gboolean
-addtorrent(tr_handle_t *tr, GtkWindow *parentwind, const char *torrent,
-           const char *dir, gboolean paused, GList **errs) {
+  tr_torrent_t *tor;
+
+  if(gtk_tree_model_get_iter(data->model, &iter, path)) {
+    gtk_tree_model_get(data->model, &iter, MC_TORRENT, &tor, -1);
+    makeinfowind(data->wind, tor);
+  }
+}
+
+gboolean
+addtorrent(void *vdata, const char *torrent, const char *dir, gboolean paused,
+           GList **errs) {
+  const struct { const int err; const char *msg; } errstrs[] = {
+    {TR_EINVALID,       N_("not a valid torrent file")},
+    {TR_EDUPLICATE,     N_("torrent is already open")},
+  };
+  struct cbdata *data = vdata;
+  tr_torrent_t *new;
   char *wd;
+  int err;
+  unsigned int ii;
+  GtkTreeIter iter;
 
   if(NULL == dir && NULL != (dir = cf_getpref(PREF_DIR))) {
     if(!mkdir_p(dir, 0777)) {
-      errmsg(parentwind, _("Failed to create the directory %s:\n%s"),
+      errmsg(data->wind, _("Failed to create the directory %s:\n%s"),
              dir, strerror(errno));
       return FALSE;
@@ -1071 +1097 @@
   }
 
-  blocksigs();
-
-  if(0 != tr_torrentInit(tr, torrent)) {
-    unblocksigs();
-    /* XXX would be nice to have errno strings, are they printed to stdout? */
-    if(NULL == errs)
-      errmsg(parentwind, _("Failed to load the torrent file %s"), torrent);
-    else
-      *errs = g_list_append(*errs, g_strdup(torrent));
+  if(NULL == (new = tr_torrentInit(data->tr, torrent, &err))) {
+    for(ii = 0; ii < ALEN(errstrs); ii++)
+      if(err == errstrs[ii].err)
+        break;
+    if(NULL == errs) {
+      if(ii == ALEN(errstrs))
+        errmsg(data->wind, _("Failed to load the torrent file %s"), torrent);
+      else
+        errmsg(data->wind, _("Failed to load the torrent file %s: %s"),
+               torrent, gettext(errstrs[ii].msg));
+    } else {
+      if(ii == ALEN(errstrs))
+        *errs = g_list_append(*errs, g_strdup(torrent));
+      else
+        *errs = g_list_append(*errs, g_strdup_printf(_("%s (%s)"),
+                              torrent, gettext(errstrs[ii].msg)));
+    }
     return FALSE;
   }
 
+  gtk_list_store_append(GTK_LIST_STORE(data->model), &iter);
+  gtk_list_store_set(GTK_LIST_STORE(data->model), &iter, MC_TORRENT, new, -1);
+
   if(NULL != dir)
-    tr_torrentSetFolder(tr, tr_torrentCount(tr) - 1, dir);
+    tr_torrentSetFolder(new, dir);
   else {
     wd = g_new(char, MAXPATHLEN + 1);
     if(NULL == getcwd(wd, MAXPATHLEN + 1))
-      tr_torrentSetFolder(tr, tr_torrentCount(tr) - 1, ".");
+      tr_torrentSetFolder(new, ".");
     else {
-      tr_torrentSetFolder(tr, tr_torrentCount(tr) - 1, wd);
+      tr_torrentSetFolder(new, wd);
       free(wd);
     }
@@ -1096 +1133 @@
 
   if(!paused)
-    tr_torrentStart(tr, tr_torrentCount(tr) - 1);
-
-  unblocksigs();
+    tr_torrentStart(new);
 
   return TRUE;
@@ -1108 +1143 @@
 
   updatemodel(data);
-  savetorrents(data->tr, data->wind, -1, NULL);
-}
-
-gboolean
-savetorrents(tr_handle_t *tr, GtkWindow *wind, int count, tr_stat_t *stat) {
+  savetorrents(data->tr, data->wind);
+}
+
+gboolean
+savetorrents(tr_handle_t *tr, GtkWindow *wind) {
+  GList *torrents;
   char *errstr;
-  tr_stat_t *st;
   gboolean ret;
 
-  assert(NULL != tr || 0 <= count);
-
-  if(0 <= count)
-    ret = cf_savestate(count, stat, &errstr);
-  else {
-    blocksigs();
-    count = tr_torrentStat(tr, &st);
-    unblocksigs();
-    ret = cf_savestate(count, st, &errstr);
-    free(st);
-  }
-
-  if(!ret) {
+  torrents = NULL;
+  tr_torrentIterate(tr, maketorrentlist, &torrents);
+
+  if(!(ret = cf_savestate(torrents, &errstr))) {
     errmsg(wind, "%s", errstr);
     g_free(errstr);
   }
+
+  g_list_free(torrents);
 
   return ret;
@@ -1152 +1180 @@
            gpointer gdata) {
   GList **ids = gdata;
-  int index;
-
-  gtk_tree_model_get(model, iter, MC_ROW_INDEX, &index, -1);
-  *ids = g_list_append(*ids, GINT_TO_POINTER(index));
-}
+  gpointer ptr;
+
+  gtk_tree_model_get(model, iter, MC_TORRENT, &ptr, -1);
+  *ids = g_list_append(*ids, ptr);
+}
+
+void
+maketorrentlist(tr_torrent_t *tor, void *data) {
+  GList **list = data;
+
+  *list = g_list_append(*list, tor);
+}
+
+void
+setupsighandlers(void) {
+  int sigs[] = {SIGHUP, SIGINT, SIGQUIT, SIGTERM, SIGUSR1, SIGUSR2};
+  struct sigaction sa;
+  unsigned int ii;
+
+  bzero(&sa, sizeof(sa));
+  sa.sa_handler = fatalsig;
+  for(ii = 0; ii < ALEN(sigs); ii++)
+    sigaction(sigs[ii], &sa, NULL);
+}
+
+void
+fatalsig(int sig) {
+  struct sigaction sa;
+
+  global_lastsig = sig;
+
+  if(SIGCOUNT_MAX <= ++global_sigcount) {
+    bzero(&sa, sizeof(sa));
+    sa.sa_handler = SIG_DFL;
+    sigaction(sig, &sa, NULL);
+    raise(sig);
+  }
+}

branches/new_api/gtk/po/transmission-gtk.pot

@@ -9 +9 @@
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-10 00:50-0500\n"
+"POT-Creation-Date: 2006-03-20 11:30-0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -44 +44 @@
 msgstr ""
 
-#: conf.c:115 dialogs.c:191 main.c:1065
+#: conf.c:115 dialogs.c:190 main.c:1093
 #, c-format
 msgid ""
@@ -70 +70 @@
 msgstr ""
 
-#: conf.c:233 conf.c:432
+#: conf.c:233 conf.c:434
 #, c-format
 msgid ""
@@ -77 +77 @@
 msgstr ""
 
-#: conf.c:253 conf.c:472
+#: conf.c:253 conf.c:476
 #, c-format
 msgid ""
@@ -84 +84 @@
 msgstr ""
 
-#: conf.c:260 conf.c:479
+#: conf.c:260 conf.c:483
 #, c-format
 msgid ""
@@ -91 +91 @@
 msgstr ""
 
-#: dialogs.c:76
+#: dialogs.c:75
 #, c-format
 msgid "%s Preferences"
 msgstr ""
 
-#: dialogs.c:84
+#: dialogs.c:83
 msgid "_Limit upload speed"
 msgstr ""
 
-#: dialogs.c:87
+#: dialogs.c:86
 msgid "Choose download directory"
 msgstr ""
 
 #. limit label and entry
-#: dialogs.c:121
+#: dialogs.c:120
 msgid "Maximum _upload speed:"
 msgstr ""
 
 #. directory label and chooser
-#: dialogs.c:135
+#: dialogs.c:134
 msgid "_Download directory:"
 msgstr ""
 
 #. port label and entry
-#: dialogs.c:144
+#: dialogs.c:143
 msgid "Listening _port:"
 msgstr ""
@@ -135 +135 @@
 msgstr ""
 
-#: dialogs.c:285
+#: dialogs.c:284
 msgid "Torrent files"
 msgstr ""
 
-#: dialogs.c:287
+#: dialogs.c:286
 msgid "All files"
 msgstr ""
@@ -192 +192 @@
 msgstr ""
 
-#: main.c:155
+#: main.c:164
 msgid "Add"
 msgstr ""
 
-#: main.c:156
+#: main.c:165
 msgid "Add a new torrent"
 msgstr ""
 
-#: main.c:157
+#: main.c:166
 msgid "Start"
 msgstr ""
 
-#: main.c:159
+#: main.c:168
 msgid "Start a torrent that is not running"
 msgstr ""
 
-#: main.c:160
+#: main.c:169
 msgid "Stop"
 msgstr ""
 
-#: main.c:162
+#: main.c:171
 msgid "Stop a torrent that is running"
 msgstr ""
 
-#: main.c:163
+#: main.c:172
 msgid "Remove"
 msgstr ""
 
-#: main.c:164
+#: main.c:173
 msgid "Remove a torrent"
 msgstr ""
 
-#: main.c:165
+#: main.c:174
 msgid "Properties"
 msgstr ""
 
-#: main.c:166
+#: main.c:175
 msgid "Show additional information about a torrent"
 msgstr ""
 
-#: main.c:167
+#: main.c:176
 msgid "Preferences"
 msgstr ""
 
-#: main.c:168
+#: main.c:177
 msgid "Customize application behavior"
 msgstr ""
 
-#: main.c:186
+#: main.c:203
 msgid "Transmission"
 msgstr ""
 
-#: main.c:316 main.c:518 main.c:1077
+#: main.c:331 main.c:626 main.c:1105
 #, c-format
 msgid "Failed to load the torrent file %s"
@@ -253 +253 @@
 msgstr[1] ""
 
-#: main.c:606
+#: main.c:422
 msgid "Name"
 msgstr ""
 
 #. this string is only used to determing the size of the progress bar
-#: main.c:613
+#: main.c:429
 msgid "  fnord    fnord  "
 msgstr ""
 
-#: main.c:616
+#: main.c:432
 msgid "Progress"
 msgstr ""
 
-#: main.c:691
+#: main.c:703
 #, c-format
 msgid "Checking existing files (%.1f%%)"
 msgstr ""
 
-#: main.c:693
+#: main.c:706
+#, c-format
+msgid "Finishing in --:--:-- (%.1f%%)"
+msgstr ""
+
+#: main.c:708
 #, c-format
 msgid "Finishing in %02i:%02i:%02i (%.1f%%)"
 msgstr ""
 
-#: main.c:696
+#: main.c:712
 #, c-format
 msgid "Seeding, uploading to %d of %d peer"
@@ -283 +288 @@
 msgstr[1] ""
 
-#: main.c:700
+#: main.c:716
 msgid "Stopping..."
 msgstr ""
 
-#: main.c:702
+#: main.c:718
 #, c-format
 msgid "Stopped (%.1f%%)"
 msgstr ""
 
-#: main.c:710
+#: main.c:726
 msgid "Error: "
 msgstr ""
 
-#: main.c:714
+#: main.c:730
 #, c-format
 msgid "Downloading from %i of %i peer"
@@ -303 +308 @@
 msgstr[1] ""
 
-#: main.c:748
+#: main.c:763
 #, c-format
 msgid ""
@@ -310 +315 @@
 msgstr ""
 
-#: main.c:751
+#: main.c:766
 #, c-format
 msgid ""
@@ -317 +322 @@
 msgstr ""
 
-#: main.c:799
+#: main.c:812
 #, c-format
 msgid "     Total DL: %s/s     Total UL: %s/s"
 msgstr ""
 
+#: main.c:1081
+msgid "not a valid torrent file"
+msgstr ""
+
+#: main.c:1082
+msgid "torrent is already open"
+msgstr ""
+
+#: main.c:1107
+#, c-format
+msgid "Failed to load the torrent file %s: %s"
+msgstr ""
+
+#: main.c:1113
+#, c-format
+msgid "%s (%s)"
+msgstr ""
+
 #: util.c:63
 msgid "B"
@@ -350 +373 @@
 msgstr ""
 
-#: util.c:87
+#: util.c:88
 msgid "N/A"
 msgstr ""
 
 #. this is a UTF-8 infinity symbol
-#: util.c:91
+#: util.c:92
 msgid "∞"
 msgstr ""

branches/new_api/gtk/util.c

@@ -40 +40 @@
 
 static void
-sigexithandler(int sig);
-static void
 errcb(GtkWidget *wind, int resp, gpointer data);
 
@@ -186 +184 @@
 }
 
-static int exit_sigs[] = {SIGHUP, SIGINT, SIGQUIT, SIGTERM, SIGUSR1, SIGUSR2};
-static callbackfunc_t exit_func = NULL;
-static void *exit_data = NULL;
-static int exit_block_level = 0;
-
-void
-setuphandlers(callbackfunc_t func, void *data) {
-  struct sigaction sa;
-  unsigned int ii;
-
-  exit_data = data;
-  exit_func = func;
-
-  bzero(&sa, sizeof(sa));
-  sa.sa_handler = sigexithandler;
-  for(ii = 0; ii < ALEN(exit_sigs); ii++)
-    sigaction(exit_sigs[ii], &sa, NULL);
-}
-
-void
-clearhandlers(void) {
-  struct sigaction sa;
-  unsigned int ii;
-
-  bzero(&sa, sizeof(sa));
-  sa.sa_handler = SIG_DFL;
-  for(ii = 0; ii < ALEN(exit_sigs); ii++)
-    sigaction(exit_sigs[ii], &sa, NULL);
-}
-
-static void
-sigexithandler(int sig) {
-  exit_func(exit_data);
-  clearhandlers();
-  raise(sig);
-}
-
-void
-blocksigs(void) {
-  sigset_t mask;
-  unsigned int ii;
-
-  if(0 < (exit_block_level++))
-    return;
-
-  sigemptyset(&mask);
-  for(ii = 0; ii < ALEN(exit_sigs); ii++)
-    sigaddset(&mask, exit_sigs[ii]);
-  sigprocmask(SIG_BLOCK, &mask, NULL);
-}
-
-void
-unblocksigs(void) {
-  sigset_t mask;
-  unsigned int ii;
-
-  if(0 < (--exit_block_level))
-    return;
-
-  sigemptyset(&mask);
-  for(ii = 0; ii < ALEN(exit_sigs); ii++)
-    sigaddset(&mask, exit_sigs[ii]);
-  sigprocmask(SIG_UNBLOCK, &mask, NULL);
-}
-
 GtkWidget *
 errmsg(GtkWindow *wind, const char *format, ...) {

branches/new_api/gtk/util.h

@@ -71 +71 @@
 urldecode(const char *str, int len);
 
-/* set up a handler for various fatal signals */
-void
-setuphandlers(callbackfunc_t func, void *data);
-
-/* clear the handlers for fatal signals */
-void
-clearhandlers(void);
-
-/* blocks and unblocks delivery of fatal signals. calls to these
-   functions can be nested as long as unblocksigs() is called exactly
-   as many times as blocksigs().  only the first blocksigs() will
-   block signals and only the last unblocksigs() will unblock them. */
-void
-blocksigs(void);
-void
-unblocksigs(void);
-
 /* if wind is NULL then you must call gtk_widget_show on the returned widget */