Changeset 1504

Timestamp:

Feb 19, 2007, 10:09:05 PM (16 years ago)

Author:

joshe

Message:

Merge gtkmisc branch.

Location:

trunk

Files:

• gtk/conf.c (modified) (2 diffs)
• gtk/conf.h (modified) (1 diff)
• gtk/dialogs.c (modified) (10 diffs)
• gtk/dialogs.h (modified) (1 diff)
• gtk/ipc.c (modified) (17 diffs)
• gtk/ipc.h (modified) (2 diffs)
• gtk/main.c (modified) (21 diffs)
• gtk/msgwin.c (modified) (6 diffs)
• gtk/tr_backend.c (modified) (4 diffs)
• gtk/tr_backend.h (modified) (3 diffs)
• gtk/tr_icon.c (copied) (copied from branches/gtkmisc/gtk/tr_icon.c)
• gtk/tr_icon.h (copied) (copied from branches/gtkmisc/gtk/tr_icon.h)
• gtk/tr_prefs.c (copied) (copied from branches/gtkmisc/gtk/tr_prefs.c)
• gtk/tr_prefs.h (copied) (copied from branches/gtkmisc/gtk/tr_prefs.h)
• gtk/tr_torrent.c (modified) (3 diffs)
• gtk/tr_torrent.h (modified) (3 diffs)
• gtk/tr_window.h (modified) (1 diff)
• gtk/transmission-gtk.desktop (modified) (1 diff)
• gtk/util.c (modified) (5 diffs)
• gtk/util.h (modified) (2 diffs)
• mk/gtk.mk (modified) (1 diff)

trunk/gtk/conf.c

@@ -2 +2 @@
  * $Id$
  *
- * Copyright (c) 2005-2006 Transmission authors and contributors
+ * Copyright (c) 2005-2007 Transmission authors and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -501 +501 @@
 
 void
-cf_freestate(benc_val_t *state) {
-  tr_bencFree(state);
-  g_free(state);
-}
+cf_freestate( benc_val_t * state )
+{
+    if( NULL != state )
+    {
+        tr_bencFree( state );
+        g_free( state );
+    }
+}

trunk/gtk/conf.h

@@ -50 +50 @@
 cf_freestate(benc_val_t *state);
 
-/* macros for names of prefs we use */
-#define PREF_PORT               "listening-port"
-#define PREF_USEDOWNLIMIT       "use-download-limit"
-#define PREF_DOWNLIMIT          "download-limit"
-#define PREF_USEUPLIMIT         "use-upload-limit"
-#define PREF_UPLIMIT            "upload-limit"
-#define PREF_DIR                "download-directory"
-#define PREF_ASKDIR             "ask-download-directory"
-#define PREF_ADDSTD             "add-behavior-standard"
-#define PREF_ADDIPC             "add-behavior-ipc"
-#define PREF_MSGLEVEL           "message-level"
-#define PREF_NAT                "use-nat-traversal"
-
 #endif /* TG_CONF_H */

trunk/gtk/dialogs.c

@@ -2 +2 @@
  * $Id$
  *
- * Copyright (c) 2005-2006 Transmission authors and contributors
+ * Copyright (c) 2005-2007 Transmission authors and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -32 +32 @@
 #include "conf.h"
 #include "dialogs.h"
+#include "tr_icon.h"
+#include "tr_prefs.h"
+#include "util.h"
+
 #include "transmission.h"
-#include "util.h"
 
 #define PREFNAME                "transmission-dialog-pref-name"
-
-/* default values for a couple prefs */
-#define DEF_DOWNLIMIT           100
-#define DEF_USEDOWNLIMIT        FALSE
-#define DEF_UPLIMIT             20
-#define DEF_USEUPLIMIT          TRUE
-#define DEF_ASKDIR              FALSE
-#define DEF_NAT                 TRUE
-
-struct prefdata {
-  GList *prefwidgets;
-  GtkWindow *parent;
-  TrBackend *back;
-  GtkTooltips * tips;
-};
 
 struct addcb {
@@ -69 +57 @@
 };
 
-static void
-clicklimitbox(GtkWidget *widget, gpointer gdata);
-static void
-freedata(gpointer gdata, GClosure *closure);
-static void
-clickdialog(GtkWidget *widget, int resp, gpointer gdata);
+struct quitdata
+{
+    callbackfunc_t func;
+    void         * cbdata;
+};
+
 static void
 autoclick(GtkWidget *widget, gpointer gdata);
@@ -83 +71 @@
 static void
 promptresp( GtkWidget * widget, gint resp, gpointer data );
-
-static void
-setupprefwidget(GtkWidget *widget, const char *prefname, ...) {
-  const char *pref = cf_getpref(prefname);
-  GtkTreeModel *model;
-  GtkTreeIter iter;
-  guint prefsflag, modelflag;
-  va_list ap;
-
-  g_object_set_data_full(G_OBJECT(widget), PREFNAME,
-                         g_strdup(prefname), (GDestroyNotify)g_free);
-
-  va_start(ap, prefname);
-
-  if(ISA(widget, GTK_TYPE_FILE_CHOOSER)) {
-    if(NULL != pref)
-      gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(widget), pref);
-  }
-  else if(ISA(widget, GTK_TYPE_SPIN_BUTTON))
-    gtk_spin_button_set_value(GTK_SPIN_BUTTON(widget),
-      (NULL == pref ? va_arg(ap, long) : strtol(pref, NULL, 10)));
-  else if(ISA(widget, GTK_TYPE_TOGGLE_BUTTON))
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget),
-      (NULL == pref ? va_arg(ap, gboolean) : strbool(pref)));
-  else if(ISA(widget, GTK_TYPE_COMBO_BOX)) {
-    model = gtk_combo_box_get_model(GTK_COMBO_BOX(widget));
-    prefsflag = addactionflag(pref);
-    if(gtk_tree_model_get_iter_first(model, &iter))
-      do {
-        gtk_tree_model_get(model, &iter, 1, &modelflag, -1);
-        if(modelflag == prefsflag) {
-          gtk_combo_box_set_active_iter(GTK_COMBO_BOX(widget), &iter);
-          break;
-        }
-      } while(gtk_tree_model_iter_next(model, &iter));
-  }
-  else {
-    g_assert_not_reached();
-  }
-
-  va_end(ap);
-}
-
-static void
-saveprefwidget(GtkWindow *parent, GtkWidget *widget) {
-  char *prefname;
-  const char *strval;
-  char *freeablestr;
-  GtkTreeModel *model;
-  GtkTreeIter iter;
-  guint uintval;
-
-  strval = NULL;
-  freeablestr = NULL;
-  if(ISA(widget, GTK_TYPE_FILE_CHOOSER)) {
-    strval = gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER(widget));
-    if(NULL != strval) {
-      if(!mkdir_p(strval, 0777)) {
-        errmsg(parent, _("Failed to create the directory %s:\n%s"),
-               strval, strerror(errno));
-        return;
-      }
-    }
-  }
-  else if(ISA(widget, GTK_TYPE_SPIN_BUTTON))
-    freeablestr = g_strdup_printf("%i",
-      gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widget)));
-  else if(ISA(widget, GTK_TYPE_TOGGLE_BUTTON))
-    strval = (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)) ?
-              "yes" : "no");
-  else if(ISA(widget, GTK_TYPE_COMBO_BOX)) {
-    if(gtk_combo_box_get_active_iter(GTK_COMBO_BOX(widget), &iter)) {
-      model = gtk_combo_box_get_model(GTK_COMBO_BOX(widget));
-      gtk_tree_model_get(model, &iter, 1, &uintval, -1);
-      strval = addactionname(uintval);
-    }
-  }
-  else {
-    g_assert_not_reached();
-    return;
-  }
-
-  prefname = g_object_get_data(G_OBJECT(widget), PREFNAME);
-  g_assert(NULL != prefname);
-
-  if(NULL != strval)
-    cf_setpref(prefname, strval);
-  else if(NULL != freeablestr) {
-    cf_setpref(prefname, freeablestr);
-    g_free(freeablestr);
-  }
-}
-
-/* wrap a widget in an event box with a tooltip */
-static GtkWidget *
-tipbox( GtkWidget * widget, GtkTooltips * tips, const char * tip )
-{
-    GtkWidget * box;
-
-    box = gtk_event_box_new();
-    gtk_container_add( GTK_CONTAINER( box ), widget );
-    gtk_tooltips_set_tip( tips, box, tip, "" );
-
-    return box;
-}
-
-GtkWidget *
-makeprefwindow(GtkWindow *parent, TrBackend *back) {
-  char *title = g_strdup_printf(_("%s Preferences"), g_get_application_name());
-  GtkWidget *wind = gtk_dialog_new_with_buttons(title, parent,
-   GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR,
-   GTK_STOCK_APPLY, GTK_RESPONSE_APPLY, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-   GTK_STOCK_OK, GTK_RESPONSE_OK, NULL);
-  const unsigned int rowcount = 10;
-  GtkWidget *table = gtk_table_new(rowcount, 2, FALSE);
-  GtkWidget *portnum = gtk_spin_button_new_with_range(1, 0xffff, 1);
-  GtkWidget *natcheck = gtk_check_button_new_with_mnemonic(
-    _("Au_tomatic port mapping via NAT-PMP or UPnP"));
-  GtkWidget *askdir = gtk_check_button_new_with_mnemonic(
-    _("Al_ways prompt for download directory"));
-  GtkWidget *dirstr = gtk_file_chooser_button_new(
-    _("Choose a download directory"),
-    GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
-  GtkWidget *addstd = gtk_combo_box_new();
-  GtkWidget *addipc = gtk_combo_box_new();
-  GtkWidget *label;
-  GtkWidget **array;
-  struct prefdata *data = g_new0(struct prefdata, 1);
-  struct { GtkWidget *on; GtkWidget *num; GtkWidget *label; gboolean defuse;
-    const char *usepref; const char *numpref; long def;
-      const char *ontip; const char *numtip; } lim[] = {
-    { gtk_check_button_new_with_mnemonic(_("_Limit download speed")),
-      gtk_spin_button_new_with_range(0, G_MAXLONG, 1),
-      gtk_label_new_with_mnemonic(_("Maximum _download speed:")),
-      DEF_USEDOWNLIMIT, PREF_USEDOWNLIMIT, PREF_DOWNLIMIT, DEF_DOWNLIMIT,
-      N_("Restrict the download rate"),
-      N_("Speed in KiB/sec for restricted download rate")},
-    { gtk_check_button_new_with_mnemonic(_("Li_mit upload speed")),
-      gtk_spin_button_new_with_range(0, G_MAXLONG, 1),
-      gtk_label_new_with_mnemonic(_("Maximum _upload speed:")),
-      DEF_USEUPLIMIT, PREF_USEUPLIMIT, PREF_UPLIMIT, DEF_UPLIMIT,
-      N_("Restrict the upload rate"),
-      N_("Speed in KiB/sec for restricted upload rate")},
-  };
-  unsigned int ii;
-  GtkTreeModel *model;
-  GtkTreeIter iter;
-  GtkCellRenderer *rend;
-  gboolean boolval;
-  int intval;
-  GtkTooltips * tips;
-  GtkWidget   * event;
-
-  g_free(title);
-  gtk_widget_set_name(wind, "TransmissionDialog");
-  gtk_table_set_col_spacings(GTK_TABLE(table), 8);
-  gtk_table_set_row_spacings(GTK_TABLE(table), 8);
-  gtk_dialog_set_default_response(GTK_DIALOG(wind), GTK_RESPONSE_OK);
-  gtk_container_set_border_width(GTK_CONTAINER(table), 6);
-  gtk_window_set_resizable(GTK_WINDOW(wind), FALSE);
-
-  tips = gtk_tooltips_new();
-  g_object_ref( tips );
-  gtk_object_sink( GTK_OBJECT( tips ) );
-  gtk_tooltips_enable( tips );
-
-  data->prefwidgets = makeglist(portnum, lim[0].on, lim[0].num, lim[1].on,
-    lim[1].num, askdir, dirstr, addstd, addipc, natcheck, NULL);
-  data->parent = parent;
-  data->back = back;
-  data->tips = tips;
-  g_object_ref(G_OBJECT(back));
-
-#define RN(n) (n), (n) + 1
-
-  for(ii = 0; ii < ALEN(lim); ii++) {
-    /* limit checkbox */
-    setupprefwidget(lim[ii].on, lim[ii].usepref, (gboolean)lim[ii].defuse);
-    array = g_new(GtkWidget*, 3);
-    g_signal_connect_data(lim[ii].on, "clicked", G_CALLBACK(clicklimitbox),
-                          array, (GClosureNotify)g_free, 0);
-    gtk_table_attach_defaults(GTK_TABLE(table), lim[ii].on,    0, 2, RN(ii*2));
-    gtk_tooltips_set_tip( tips, lim[ii].on, gettext( lim[ii].ontip ), "" );
-
-    /* limit label and entry */
-    gtk_label_set_mnemonic_widget(GTK_LABEL(lim[ii].label), lim[ii].num);
-    gtk_misc_set_alignment(GTK_MISC(lim[ii].label), 0, .5);
-    gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(lim[ii].num), TRUE);
-    setupprefwidget(lim[ii].num, lim[ii].numpref, (long)lim[ii].def);
-    event = tipbox( lim[ii].label, tips, gettext( lim[ii].numtip ) );
-    gtk_table_attach_defaults(GTK_TABLE(table), event,         0,1,RN(ii*2+1));
-    gtk_table_attach_defaults(GTK_TABLE(table), lim[ii].num,   1,2,RN(ii*2+1));
-    array[0] = lim[ii].label;
-    array[1] = lim[ii].num;
-    array[2] = GINT_TO_POINTER( TRUE );
-    clicklimitbox(lim[ii].on, array);
-    gtk_tooltips_set_tip( tips, lim[ii].num, gettext( lim[ii].numtip ), "" );
-  }
-  ii *= 2;
-
-  /* always ask for download dir */
-  setupprefwidget( askdir, PREF_ASKDIR, ( gboolean )DEF_ASKDIR );
-  array = g_new( GtkWidget *, 3 );
-  g_signal_connect_data( askdir, "clicked", G_CALLBACK( clicklimitbox ),
-                         array, ( GClosureNotify )g_free, 0 );
-  gtk_table_attach_defaults(GTK_TABLE(table), askdir,        0, 2, RN(ii));
-  gtk_tooltips_set_tip( tips, askdir,
-      _("When adding a torrent, always prompt for a directory to download data files into"), "" );
-  ii++;
-
-  /* directory label and chooser */
-  label = gtk_label_new_with_mnemonic(_("Download di_rectory:"));
-  gtk_label_set_mnemonic_widget(GTK_LABEL(label), dirstr);
-  gtk_misc_set_alignment(GTK_MISC(label), 0, .5);
-  setupprefwidget(dirstr, PREF_DIR);
-  event = tipbox( label, tips,
-                  _("Destination directory for downloaded data files") );
-  gtk_table_attach_defaults(GTK_TABLE(table), event,           0, 1, RN(ii));
-  event = tipbox( dirstr, tips,
-                  _("Destination directory for downloaded data files") );
-  gtk_table_attach_defaults(GTK_TABLE(table), event,           1, 2, RN(ii));
-  array[0] = label;
-  array[1] = dirstr;
-  array[2] = GINT_TO_POINTER( FALSE );
-  clicklimitbox( askdir, array );
-  ii++;
-
-  /* port label and entry */
-  label = gtk_label_new_with_mnemonic(_("Listening _port:"));
-  gtk_label_set_mnemonic_widget(GTK_LABEL(label), portnum);
-  gtk_misc_set_alignment(GTK_MISC(label), 0, .5);
-  gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(portnum), TRUE);
-  setupprefwidget(portnum, PREF_PORT, (long)TR_DEFAULT_PORT);
-  event = tipbox( label, tips,
-      _("TCP port number to listen for peer connections") );
-  gtk_table_attach_defaults(GTK_TABLE(table), event,           0, 1, RN(ii));
-  gtk_table_attach_defaults(GTK_TABLE(table), portnum,         1, 2, RN(ii));
-  gtk_tooltips_set_tip( tips, portnum,
-      _("TCP port number to listen for peer connections"), "" );
-  ii++;
-
-  /* NAT traversal checkbox */
-  intval = tr_handleStatus(tr_backend_handle(back))->natTraversalStatus;
-  boolval = !TR_NAT_TRAVERSAL_IS_DISABLED( intval );
-  setupprefwidget(natcheck, PREF_NAT, boolval);
-  gtk_table_attach_defaults(GTK_TABLE(table), natcheck,        0, 2, RN(ii));
-  gtk_tooltips_set_tip( tips, natcheck,
-      _("Attempt to bypass NAT or firewall to allow incoming peer connections"), "" );
-  ii++;
-
-  /* create the model used by the two popup menus */
-  model = GTK_TREE_MODEL(gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_INT));
-  gtk_list_store_append(GTK_LIST_STORE(model), &iter);
-  gtk_list_store_set(GTK_LIST_STORE(model), &iter, 1, 0, 0,
-    _("Use the torrent file where it is"), -1);
-  gtk_list_store_append(GTK_LIST_STORE(model), &iter);
-  gtk_list_store_set(GTK_LIST_STORE(model), &iter, 1, TR_TORNEW_SAVE_COPY, 0,
-    _("Keep a copy of the torrent file"), -1);
-  gtk_list_store_append(GTK_LIST_STORE(model), &iter);
-  gtk_list_store_set(GTK_LIST_STORE(model), &iter, 1, TR_TORNEW_SAVE_MOVE, 0,
-    _("Keep a copy and remove the original"), -1);
-
-  /* std */
-  label = gtk_label_new_with_mnemonic(_("For torrents added _normally:"));
-  gtk_label_set_mnemonic_widget(GTK_LABEL(label), addstd);
-  gtk_misc_set_alignment(GTK_MISC(label), 0, .5);
-  gtk_combo_box_set_model(GTK_COMBO_BOX(addstd), model);
-  rend = gtk_cell_renderer_text_new();
-  gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(addstd), rend, TRUE);
-  gtk_cell_layout_add_attribute(GTK_CELL_LAYOUT(addstd), rend, "text", 0);
-  setupprefwidget(addstd, PREF_ADDSTD);
-  event = tipbox( label, tips,
-      _("Torrent files added via the toolbar, popup menu, and drag-and-drop") );
-  gtk_table_attach_defaults(GTK_TABLE(table), event,           0, 1, RN(ii));
-  event = tipbox( addstd, tips,
-      _("Torrent files added via the toolbar, popup menu, and drag-and-drop") );
-  gtk_table_attach_defaults(GTK_TABLE(table), event,           1, 2, RN(ii));
-  ii++;
-
-  /* ipc */
-  label = gtk_label_new_with_mnemonic(
-    _("For torrents added e_xternally\n(via the command-line):"));
-  gtk_label_set_mnemonic_widget(GTK_LABEL(label), addipc);
-  gtk_misc_set_alignment(GTK_MISC(label), 0, .5);
-  gtk_combo_box_set_model(GTK_COMBO_BOX(addipc), model);
-  rend = gtk_cell_renderer_text_new();
-  gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(addipc), rend, TRUE);
-  gtk_cell_layout_add_attribute(GTK_CELL_LAYOUT(addipc), rend, "text", 0);
-  setupprefwidget(addipc, PREF_ADDIPC);
-  event = tipbox( label, tips,
-      _("For torrents added via the command-line only") );
-  gtk_table_attach_defaults(GTK_TABLE(table), event,           0, 1, RN(ii));
-  event = tipbox( addipc, tips,
-      _("For torrents added via the command-line only") );
-  gtk_table_attach_defaults(GTK_TABLE(table), event,           1, 2, RN(ii));
-  ii++;
-
-#undef RN
-  g_assert(rowcount == ii);
-
-  gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(wind)->vbox), table);
-  g_signal_connect_data(wind, "response", G_CALLBACK(clickdialog),
-                        data, freedata, 0);
-  gtk_widget_show_all(wind);
-
-  return wind;
-}
-
-static void
-clicklimitbox( GtkWidget * widget, gpointer gdata )
-{
-    GtkWidget ** widgets;
-    gboolean     with, active;
-    int          ii;
-
-    widgets = gdata;
-    with = ( gboolean )GPOINTER_TO_INT( widgets[2] );
-
-    for(ii = 0; 2 > ii; ii++)
-    {
-        active = gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( widget ) );
-        gtk_widget_set_sensitive( widgets[ii], ( with ? active : !active ) );
-    }
-}
-
-static void
-freedata(gpointer gdata, GClosure *closure SHUTUP) {
-  struct prefdata *data = gdata;
-
-  g_list_free(data->prefwidgets);
-  g_object_unref(G_OBJECT(data->back));
-  g_object_unref( data->tips );
-  g_free(data);
-}
-
-static void
-clickdialog(GtkWidget *widget, int resp, gpointer gdata) {
-  struct prefdata *data = gdata;
-  char *errstr;
-  GList *ii;
-
-  if(GTK_RESPONSE_APPLY == resp || GTK_RESPONSE_OK == resp) {
-    /* save all the prefs */
-    for(ii = g_list_first(data->prefwidgets); NULL != ii; ii = ii->next)
-      saveprefwidget(data->parent, ii->data);
-
-    /* write prefs to disk */
-    cf_saveprefs(&errstr);
-    if(NULL != errstr) {
-      errmsg(data->parent, "%s", errstr);
-      g_free(errstr);
-    }
-
-    applyprefs(data->back);
-    /* XXX would be nice to have errno strings, are they printed to stdout? */
-  }
-
-  if(GTK_RESPONSE_APPLY != resp)
-    gtk_widget_destroy(widget);
-}
-
-void
-applyprefs(TrBackend *back) {
-  struct { void (*func)(tr_handle_t*, int);
-    const char *use; const char *num; gboolean defuse; long def; } lim[] = {
-    {tr_setGlobalDownloadLimit, PREF_USEDOWNLIMIT, PREF_DOWNLIMIT,
-                                DEF_USEDOWNLIMIT,  DEF_DOWNLIMIT},
-    {tr_setGlobalUploadLimit,   PREF_USEUPLIMIT,   PREF_UPLIMIT,
-                                DEF_USEUPLIMIT,    DEF_UPLIMIT},
-  };
-  const char *pref;
-  int ii;
-  tr_handle_t *tr = tr_backend_handle(back);
-  gboolean boolval;
-
-  /* set upload and download limits */
-  for(ii = 0; ii < (int)ALEN(lim); ii++) {
-    pref = cf_getpref(lim[ii].use);
-    if(!(NULL == pref ? lim[ii].defuse : strbool(pref)))
-      lim[ii].func(tr, -1);
-    else {
-      pref = cf_getpref(lim[ii].num);
-      lim[ii].func(tr, (NULL == pref ? lim[ii].def : strtol(pref, NULL, 10)));
-    }
-  }
-
-  /* set the listening port */
-  if(NULL != (pref = cf_getpref(PREF_PORT)) &&
-     0 < (ii = strtol(pref, NULL, 10)) && 0xffff >= ii)
-    tr_setBindPort(tr, ii);
-
-  /* enable/disable NAT traversal */
-  boolval = (NULL == (pref = cf_getpref(PREF_NAT)) ? DEF_NAT : strbool(pref));
-  tr_natTraversalEnable(tr, boolval);
-}
+static void
+quitresp( GtkWidget * widget, gint resp, gpointer data );
 
 void
@@ -495 +90 @@
   GtkWidget *getdir = gtk_file_chooser_button_new(
     _("Choose a download directory"), GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
-  const char *pref;
 
   data->addfunc = addfunc;
@@ -512 +106 @@
 
   gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(autocheck), TRUE);
-  if(NULL != (pref = cf_getpref(PREF_DIR)))
-    gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(getdir), pref);
+  gtk_file_chooser_set_current_folder( GTK_FILE_CHOOSER( getdir ),
+                                       getdownloaddir() );
 
   gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(dircheck), FALSE);
@@ -567 +161 @@
       stupidgtk = g_list_append(stupidgtk, ii->data);
     flags = ( data->autostart ? TR_TORNEW_RUNNING : TR_TORNEW_PAUSED );
-    flags |= addactionflag( cf_getpref( PREF_ADDSTD ) );
+    flags |= addactionflag( tr_prefs_get( PREF_ID_ADDSTD ) );
     data->addfunc( data->data, NULL, stupidgtk, dir, flags );
     if(NULL != dir)
@@ -694 +288 @@
 void
 promptfordir( GtkWindow * parent, add_torrents_func_t addfunc, void *cbdata,
-              GList * files, guint flags, const char * defaultdir )
+              GList * files, guint flags )
 {
     struct dirdata * stuff;
@@ -712 +306 @@
     gtk_file_chooser_set_local_only( GTK_FILE_CHOOSER( wind ), TRUE );
     gtk_file_chooser_set_select_multiple( GTK_FILE_CHOOSER( wind ), FALSE );
-    gtk_file_chooser_set_filename( GTK_FILE_CHOOSER( wind ), defaultdir );
+    gtk_file_chooser_set_filename( GTK_FILE_CHOOSER( wind ),
+                                   getdownloaddir() );
 
     g_signal_connect( G_OBJECT( wind ), "response",
@@ -741 +336 @@
     gtk_widget_destroy( widget );
 }
+
+void
+askquit( GtkWindow * parent, callbackfunc_t func, void * cbdata )
+{
+    struct quitdata * stuff;
+    GtkWidget * wind;
+
+    stuff          = g_new( struct quitdata, 1 );
+    stuff->func    = func;
+    stuff->cbdata  = cbdata;
+
+    wind = gtk_message_dialog_new( parent, GTK_DIALOG_DESTROY_WITH_PARENT,
+                                   GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO,
+                                   _("Are you sure you want to quit %s?"),
+                                   g_get_application_name() );
+    gtk_dialog_set_default_response( GTK_DIALOG( wind ), GTK_RESPONSE_YES );
+    g_signal_connect( G_OBJECT( wind ), "response",
+                      G_CALLBACK( quitresp ), stuff );
+
+    gtk_widget_show_all( wind );
+}
+
+static void
+quitresp( GtkWidget * widget, gint resp, gpointer data )
+{
+    struct quitdata * stuff;
+
+    stuff = data;
+
+    if( GTK_RESPONSE_YES == resp )
+    {
+        stuff->func( stuff->cbdata );
+    }
+
+    g_free( stuff );
+    gtk_widget_destroy( widget );
+}

trunk/gtk/dialogs.h

@@ -48 +48 @@
 void
 promptfordir( GtkWindow * parent, add_torrents_func_t addfunc, void *cbdata,
-              GList * files, guint flags, const char * defaultdir );
+              GList * files, guint flags );
+
+/* prompt if the user wants to quit, calls func with cbdata if they do */
+void
+askquit( GtkWindow * parent, callbackfunc_t func, void * cbdata );
 
 #endif /* TG_PREFS_H */

trunk/gtk/ipc.c

@@ -2 +2 @@
  * $Id$
  *
- * Copyright (c) 2006 Transmission authors and contributors
+ * Copyright (c) 2006-2007 Transmission authors and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -41 +41 @@
 #include "io.h"
 #include "ipc.h"
+#include "tr_prefs.h"
 #include "util.h"
 
@@ -49 +50 @@
 /* list of strings, full paths to torrent files to load */
 #define MSG_ADDFILES            ("addfiles")
-
-enum contype { CON_SERV, CON_ADDFILE };
+/* request that the server quit */
+#define MSG_QUIT                ("quit")
+
+enum contype { CON_SERV, CON_CLIENT };
 
 struct constate_serv {
   void *wind;
   add_torrents_func_t addfunc;
+  callbackfunc_t quitfunc;
   void *cbdata;
 };
 
-struct constate_addfile {
+enum client_cmd { CCMD_ADD, CCMD_QUIT };
+
+struct constate_client {
   GMainLoop *loop;
+  enum client_cmd cmd;
   GList *files;
   gboolean *succeeded;
-  unsigned int addid;
+  unsigned int msgid;
 };
 
@@ -76 +83 @@
   union {
     struct constate_serv serv;
-    struct constate_addfile addfile;
+    struct constate_client client;
   } u;
 };
 
-void
-ipc_socket_setup(void *parent, add_torrents_func_t addfunc, void *cbdata);
-gboolean
-ipc_sendfiles_blocking(GList *files);
 static void
 serv_bind(struct constate *con);
@@ -106 +109 @@
 srv_addfile(struct constate *con, const char *name, benc_val_t *val);
 static void
+srv_quit( struct constate * con, const char * name, benc_val_t * val );
+static void
 afc_version(struct constate *con, const char *name, benc_val_t *val);
 static void
@@ -112 +117 @@
 static const struct handlerdef gl_funcs_serv[] = {
   {MSG_ADDFILES, srv_addfile},
+  {MSG_QUIT,     srv_quit},
   {NULL, NULL}
 };
 
-static const struct handlerdef gl_funcs_addfile[] = {
+static const struct handlerdef gl_funcs_client[] = {
   {MSG_VERSION, afc_version},
   {NULL, NULL}
@@ -124 +130 @@
 
 void
-ipc_socket_setup(void *parent, add_torrents_func_t addfunc, void *cbdata) {
+ipc_socket_setup( void * parent, add_torrents_func_t addfunc,
+                  callbackfunc_t quitfunc, void * cbdata )
+{
   struct constate *con;
 
@@ -134 +142 @@
   con->u.serv.wind = parent;
   con->u.serv.addfunc = addfunc;
+  con->u.serv.quitfunc = quitfunc;
   con->u.serv.cbdata = cbdata;
   
@@ -139 +148 @@
 }
 
-gboolean
-ipc_sendfiles_blocking(GList *files) {
+static gboolean
+blocking_client( enum client_cmd cmd, GList * files )
+{
+
   struct constate *con;
   char *path;
@@ -148 +159 @@
   con->source = NULL;
   con->fd = -1;
-  con->funcs = gl_funcs_addfile;
-  con->type = CON_ADDFILE;
-  con->u.addfile.loop = g_main_loop_new(NULL, TRUE);
-  con->u.addfile.files = files;
-  con->u.addfile.succeeded = &ret;
-  con->u.addfile.addid = 0;
+  con->funcs = gl_funcs_client;
+  con->type = CON_CLIENT;
+  con->u.client.loop = g_main_loop_new(NULL, TRUE);
+  con->u.client.cmd = cmd;
+  con->u.client.files = files;
+  con->u.client.succeeded = &ret;
+  con->u.client.msgid = 0;
 
   path = cf_sockname();
@@ -162 +174 @@
   }
 
-  g_main_loop_run(con->u.addfile.loop);
+  g_main_loop_run(con->u.client.loop);
 
   return ret;
+}
+
+gboolean
+ipc_sendfiles_blocking( GList * files )
+{
+    return blocking_client( CCMD_ADD, files );
+}
+
+gboolean
+ipc_sendquit_blocking( void )
+{
+    return blocking_client( CCMD_QUIT, NULL );
 }
 
@@ -357 +381 @@
     case CON_SERV:
       break;
-    case CON_ADDFILE:
-      freestrlist(con->u.addfile.files);
-      g_main_loop_quit(con->u.addfile.loop);
+    case CON_CLIENT:
+      freestrlist(con->u.client.files);
+      g_main_loop_quit(con->u.client.loop);
       break;
   }
@@ -376 +400 @@
   GList *files;
   int ii;
+  guint flags;
 
   if(TYPE_LIST == val->type) {
@@ -384 +409 @@
          g_utf8_validate(val->val.l.vals[ii].val.s.s, -1, NULL))
         files = g_list_append(files, val->val.l.vals[ii].val.s.s);
-    srv->addfunc(srv->cbdata, NULL, files, NULL,
-                 addactionflag(cf_getpref(PREF_ADDIPC)));
+    flags = addactionflag( tr_prefs_get( PREF_ID_ADDIPC ) );
+    srv->addfunc( srv->cbdata, NULL, files, NULL, flags );
     g_list_free(files);
   }
@@ -391 +416 @@
 
 static void
+srv_quit( struct constate * con, const char * name SHUTUP,
+          benc_val_t * val SHUTUP )
+{
+    struct constate_serv * srv;
+
+    srv = &con->u.serv;
+    srv->quitfunc( srv->cbdata );
+}
+
+static void
 afc_version(struct constate *con, const char *name SHUTUP, benc_val_t *val) {
-  struct constate_addfile *afc = &con->u.addfile;
+  struct constate_client *afc = &con->u.client;
   GList *file;
   benc_val_t list, *str;
@@ -399 +434 @@
     fprintf(stderr, _("bad IPC protocol version\n"));
     destroycon(con);
-  } else {
-    /* XXX handle getting a non-version tag, invalid data,
-           or nothing (read timeout) */
-    bzero(&list, sizeof(list));
-    list.type = TYPE_LIST;
-    list.val.l.alloc = g_list_length(afc->files);
-    list.val.l.vals = g_new0(benc_val_t, list.val.l.alloc);
-    for(file = afc->files; NULL != file; file = file->next) {
-      str = list.val.l.vals + list.val.l.count;
-      str->type = TYPE_STR;
-      str->val.s.i = strlen(file->data);
-      str->val.s.s = file->data;
-      list.val.l.count++;
-    }
-    g_list_free(afc->files);
-    afc->files = NULL;
-    afc->addid = send_msg(con, MSG_ADDFILES, &list);
-    tr_bencFree(&list);
+    return;
+  }
+
+  /* XXX handle getting a non-version tag, invalid data,
+     or nothing (read timeout) */
+  switch( afc->cmd )
+  {
+      case CCMD_ADD:
+          list.type = TYPE_LIST;
+          list.val.l.alloc = g_list_length(afc->files);
+          list.val.l.count = 0;
+          list.val.l.vals = g_new0(benc_val_t, list.val.l.alloc);
+          for(file = afc->files; NULL != file; file = file->next) {
+              str = list.val.l.vals + list.val.l.count;
+              str->type = TYPE_STR;
+              str->val.s.i = strlen(file->data);
+              str->val.s.s = file->data;
+              list.val.l.count++;
+          }
+          g_list_free(afc->files);
+          afc->files = NULL;
+          afc->msgid = send_msg(con, MSG_ADDFILES, &list);
+          tr_bencFree(&list);
+          break;
+      case CCMD_QUIT:
+          bzero( &list, sizeof( list ) );
+          list.type  = TYPE_STR;
+          afc->msgid = send_msg( con, MSG_QUIT, &list );
+          break;
   }
 }
@@ -422 +468 @@
 static void
 afc_io_sent(GSource *source SHUTUP, unsigned int id, void *vdata) {
-  struct constate_addfile *afc = &((struct constate*)vdata)->u.addfile;
-
-  if(0 < id && afc->addid == id) {
+  struct constate_client *afc = &((struct constate*)vdata)->u.client;
+
+  if(0 < id && afc->msgid == id) {
     *(afc->succeeded) = TRUE;
     destroycon(vdata);

trunk/gtk/ipc.h

@@ -2 +2 @@
  * $Id$
  *
- * Copyright (c) 2006 Transmission authors and contributors
+ * Copyright (c) 2006-2007 Transmission authors and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -29 +29 @@
 
 void
-ipc_socket_setup(void *wind, add_torrents_func_t addfunc, void *cbdata);
+ipc_socket_setup( void * wind, add_torrents_func_t addfunc,
+                  callbackfunc_t quitfunc, void * cbdata );
 
 gboolean
-ipc_sendfiles_blocking(GList *files);
+ipc_sendfiles_blocking( GList * files );
+
+gboolean
+ipc_sendquit_blocking( void );
 
 #endif /* TG_IPC_H */

trunk/gtk/main.c

@@ -25 +25 @@
 #include <sys/param.h>
 #include <errno.h>
+#include <getopt.h>
 #include <signal.h>
 #include <string.h>
@@ -41 +42 @@
 #include "msgwin.h"
 #include "tr_backend.h"
+#include "tr_cell_renderer_progress.h"
+#include "tr_icon.h"
+#include "tr_prefs.h"
 #include "tr_torrent.h"
-#include "tr_cell_renderer_progress.h"
 #include "tr_window.h"
+#include "util.h"
+
 #include "transmission.h"
-#include "util.h"
 
 #include "img_icon_full.h"
@@ -58 +62 @@
 #define EXIT_CHECK_INTERVAL     500
 
+/* number of fatal signals required to cause an immediate exit */
+#define SIGCOUNT_MAX            3
+
 struct cbdata {
-  TrBackend *back;
-  GtkWindow *wind;
-  GtkTreeModel *model;
-  guint timer;
-  gboolean prefsopen;
-  gboolean msgwinopen;
-  gboolean closing;
+    TrBackend    * back;
+    GtkWindow    * wind;
+    GtkTreeModel * model;
+    TrIcon       * icon;
+    TrPrefs      * prefs;
+    guint          timer;
+    gboolean       msgwinopen;
+    gboolean       closing;
 };
 
 struct exitdata {
-  struct cbdata *cbdata;
-  time_t started;
-  guint timer;
+    struct cbdata * cbdata;
+    time_t          started;
+    guint           timer;
 };
 
@@ -83 +91 @@
     ACT_PREF,
     ACT_DEBUG,
+    ACT_ICON,
     ACTION_COUNT,
 };
@@ -109 +118 @@
     { N_("Open debug window"), NULL,            ACTF_MENU     | ACTF_ALWAYS,
       NULL },
+    /* this isn't a terminator for the list, it's ACT_ICON */
+    { NULL,              NULL,                  0, NULL },
 };
 
 #define CBDATA_PTR              "callback-data-pointer"
 
-#define SIGCOUNT_MAX            3
-
 static sig_atomic_t global_sigcount = 0;
 
 static GList *
-readargs(int argc, char **argv);
-
-static void
-makewind(TrWindow *wind, TrBackend *back, benc_val_t *state, GList *args);
-static void
-quittransmission(struct cbdata *data);
+readargs( int argc, char ** argv, gboolean * sendquit, gboolean * paused );
 static gboolean
-winclose(GtkWidget *widget, GdkEvent *event, gpointer gdata);
+sendremote( GList * files, gboolean sendquit );
+static void
+gtksetup( int * argc, char *** argv );
+static void
+appsetup( TrWindow * wind, benc_val_t * state, GList * args, gboolean paused );
+static void
+winsetup( struct cbdata * cbdata, TrWindow * wind );
+static void
+remakewind( struct cbdata * cbdata );
+static void
+makeicon( struct cbdata * cbdata );
+static gboolean
+winclose( GtkWidget * widget, GdkEvent * event, gpointer gdata );
+static void
+wannaquit( void * vdata );
 static gboolean
 exitcheck(gpointer gdata);
@@ -134 +152 @@
         GtkSelectionData *sel, guint info, guint time, gpointer gdata);
 
+static void
+readinitialprefs( struct cbdata * cbdata );
+static void
+prefschanged( GtkWidget * widget, int id, gpointer data );
 static gboolean
 updatemodel(gpointer gdata);
 static void
-boolwindclosed(GtkWidget *widget SHUTUP, gpointer gdata);
+boolwindclosed(GtkWidget *widget, gpointer gdata);
 static void
 windact(GtkWidget *widget, int action, gpointer gdata);
+static GList *
+getselection( struct cbdata * cbdata );
 static void
 handleaction(struct cbdata *data, enum action action);
@@ -156 +180 @@
 
 int
-main(int argc, char **argv) {
-  GtkWidget *mainwind, *preferr, *stateerr;
-  char *err;
-  TrBackend *back;
-  benc_val_t *state;
-  GList *argfiles;
-  gboolean didinit, didlock;
-  GdkPixbuf * icon;
-
-  safepipe();
-
-  argfiles = readargs(argc, argv);
-
-  didinit = cf_init(tr_getPrefsDirectory(), NULL);
-  didlock = FALSE;
-  if(NULL != argfiles && didinit && !(didlock = cf_lock(NULL)))
-    return !ipc_sendfiles_blocking(argfiles);
-
-  setupsighandlers();
-
-  gtk_init(&argc, &argv);
-
-  bindtextdomain("transmission-gtk", LOCALEDIR);
-  bind_textdomain_codeset("transmission-gtk", "UTF-8");
-  textdomain("transmission-gtk");
-
-  g_set_application_name(_("Transmission"));
-#if 0
-  /* this isn't used in transmission-gtk itself, it's for the .desktop file */
-  N_("BitTorrent Client");
-  /* this too */
-  N_("A free, lightweight client with a simple, intuitive interface");
-#endif
-
-  gtk_rc_parse_string(
-    "style \"transmission-standard\" {\n"
-    " GtkDialog::action-area-border = 6\n"
-    " GtkDialog::button-spacing = 12\n"
-    " GtkDialog::content-area-border = 6\n"
-    "}\n"
-    "widget \"TransmissionDialog\" style \"transmission-standard\"\n");
-
-  icon = gdk_pixbuf_new_from_inline( -1, tr_icon_full, FALSE, NULL );
-  gtk_window_set_default_icon( icon );
-  g_object_unref( icon );
-
-  if(didinit || cf_init(tr_getPrefsDirectory(), &err)) {
-    if(didlock || cf_lock(&err)) {
-
-      /* create main window now so any error dialogs can be it's children */
-      mainwind = tr_window_new();
-      preferr = NULL;
-      stateerr = NULL;
-
-      cf_loadprefs(&err);
-      if(NULL != err) {
-        preferr = errmsg(GTK_WINDOW(mainwind), "%s", err);
-        g_free(err);
-      }
-      state = cf_loadstate(&err);
-      if(NULL != err) {
-        stateerr = errmsg(GTK_WINDOW(mainwind), "%s", err);
-        g_free(err);
-      }
-
-      /* set libT message level */
-      msgwin_loadpref();
-
-      back = tr_backend_new();
-
-      /* apply a few prefs */
-      applyprefs(back);
-
-      makewind( TR_WINDOW( mainwind ), back, state, argfiles );
-
-      if(NULL != state)
-        cf_freestate(state);
-      g_object_unref(back);
-
-      if(NULL != preferr)
-        gtk_widget_show_all(preferr);
-      if(NULL != stateerr)
-        gtk_widget_show_all(stateerr);
-    } else {
-      gtk_widget_show(errmsg_full(NULL, (callbackfunc_t)gtk_main_quit,
-                                  NULL, "%s", err));
-      g_free(err);
-    }
-  } else {
-    gtk_widget_show(errmsg_full(NULL, (callbackfunc_t)gtk_main_quit,
-                                NULL, "%s", err));
-    g_free(err);
-  }
-
-  if(NULL != argfiles)
+main( int argc, char ** argv )
+{
+    GtkWindow  * mainwind;
+    char       * err;
+    benc_val_t * state;
+    GList      * argfiles;
+    gboolean     didinit, didlock, sendquit, startpaused;
+
+    safepipe();                 /* ignore SIGPIPE */
+    argfiles = readargs( argc, argv, &sendquit, &startpaused );
+    didinit = cf_init( tr_getPrefsDirectory(), NULL );
+    didlock = FALSE;
+    if( didinit )
+    {
+        /* maybe send remote commands, also try cf_lock() */
+        didlock = sendremote( argfiles, sendquit );
+    }
+    setupsighandlers();         /* set up handlers for fatal signals */
+    gtksetup( &argc, &argv );   /* set up gtk and gettext */
+
+    if( ( didinit || cf_init( tr_getPrefsDirectory(), &err ) ) &&
+        ( didlock || cf_lock( &err ) ) )
+    {
+        /* create main window now to be a parent to any error dialogs */
+        mainwind = GTK_WINDOW( tr_window_new() );
+
+        /* try to load prefs and saved state */
+        cf_loadprefs( &err );
+        if( NULL != err )
+        {
+            errmsg( mainwind, "%s", err );
+            g_free( err );
+        }
+        state = cf_loadstate( &err );
+        if( NULL != err )
+        {
+            errmsg( mainwind, "%s", err );
+            g_free( err );
+        }
+
+        msgwin_loadpref();      /* set message level here before tr_init() */
+        appsetup( TR_WINDOW( mainwind ), state, argfiles, startpaused );
+        cf_freestate( state );
+    }
+    else
+    {
+        gtk_widget_show( errmsg_full( NULL, (callbackfunc_t)gtk_main_quit,
+                                      NULL, "%s", err ) );
+        g_free( err );
+    }
+
     freestrlist(argfiles);
 
-  gtk_main();
-
-  return 0;
+    gtk_main();
+
+    return 0;
 }
 
 GList *
-readargs(int argc, char **argv) {
-  char *name;
-
-  if(NULL == (name = strrchr(argv[0], '/')) || '\0' == *(++name))
-    name = argv[0];
-
-  while(0 < --argc) {
-    argv++;
-    if(0 == strcmp("--", *argv))
-      return checkfilenames(argc - 1, argv + 1);
-    else if('-' != argv[0][0])
-      return checkfilenames(argc, argv);
-    else if(0 == strcmp("-v", *argv) || 0 == strcmp("--version", *argv)) {
-      printf("%s %s (%d) http://transmission.m0k.org/\n",
-             name, VERSION_STRING, VERSION_REVISION);
-      exit(0);
-    }
-    else if(0 == strcmp("-h", *argv) || 0 == strcmp("--help", *argv)) {
-      printf("usage: %1$s [-hv] [files...]\n\n"
-"If %1$s is already running then a second copy will not be\n"
-"started, any torrents on the command-line will be opened in the first.\n",
-             name);
-      exit(0);
-    }
-  }
-
-  return NULL;
-}
-
-static void
-makewind( TrWindow * wind, TrBackend * back, benc_val_t * state, GList * args)
-{
-  GType types[] = {
-    /* info->name, info->totalSize, status,     error,      errorString, */
-    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, downloaded,    uploaded */
-    G_TYPE_INT,        G_TYPE_INT,       G_TYPE_UINT64, G_TYPE_UINT64,
-    /* the torrent object */
-    TR_TORRENT_TYPE};
-  struct cbdata *data = g_new0(struct cbdata, 1);
-  GtkListStore *store;
-  unsigned int ii;
-  GtkWidget *drag;
-
-  g_assert(MC_ROW_COUNT == ALEN(types));
-  store = gtk_list_store_newv(MC_ROW_COUNT, types);
-
-  g_object_ref(G_OBJECT(back));
-  data->back = back;
-  data->wind = GTK_WINDOW(wind);
-  data->timer = 0;
-  data->model = GTK_TREE_MODEL(store);
-  data->prefsopen = FALSE;
-  data->msgwinopen = FALSE;
-  data->closing = FALSE;
-
-  g_assert( ACTION_COUNT == ALEN( actions ) );
-  for( ii = 0; ii < ALEN( actions ); ii++ )
-  {
-      tr_window_action_add( wind, ii, actions[ii].flags,
-                            gettext( actions[ii].label ),
-                            actions[ii].icon,
-                            gettext( actions[ii].tooltip ) );
-  }
-  g_object_set( wind, "model", data->model,
-                      "double-click-action", ACT_INFO, NULL);
-
-  g_signal_connect( wind, "action",       G_CALLBACK( windact  ), data );
-  g_signal_connect( wind, "delete_event", G_CALLBACK( winclose ), data );
-
-  g_object_get( wind, "drag-widget", &drag, NULL );
-  setupdrag( drag, data );
-
-  addtorrents(data, state, args, NULL, addactionflag(cf_getpref(PREF_ADDIPC)));
-
-  data->timer = g_timeout_add(UPDATE_INTERVAL, updatemodel, data);
-  updatemodel(data);
-
-  /* this shows the window */
-  tr_window_size_hack( wind );
-
-  /* set up the ipc socket now that we're ready to get torrents from it */
-  ipc_socket_setup(GTK_WINDOW(wind), addtorrents, data);
-}
-
-static void
-quittransmission( struct cbdata * data )
-{
-    g_object_unref( G_OBJECT( data->back ) );
-    if( NULL != data->wind )
-    {
-        gtk_widget_destroy( GTK_WIDGET( data->wind ) );
-    }
-    g_object_unref( data->model );
-    if( 0 < data->timer )
-    {
-        g_source_remove( data->timer );
-    }
-    g_free( data );
-    gtk_main_quit();
-}
-
-gboolean
-winclose(GtkWidget *widget SHUTUP, GdkEvent *event SHUTUP, gpointer gdata) {
-  struct cbdata *data = gdata;
+readargs( int argc, char ** argv, gboolean * sendquit, gboolean * startpaused )
+{
+    struct option opts[] =
+    {
+        { "help",    no_argument, NULL, 'h' },
+        { "paused",  no_argument, NULL, 'p' },
+        { "quit",    no_argument, NULL, 'q' },
+        { "version", no_argument, NULL, 'v' },
+        { NULL, 0, NULL, 0 }
+    };
+    int opt;
+
+    *sendquit    = FALSE;
+    *startpaused = FALSE;
+
+    gtk_parse_args( &argc, &argv );
+
+    while( 0 <= ( opt = getopt_long( argc, argv, "hpqv", opts, NULL ) ) )
+    {
+        switch( opt )
+        {
+            case 'p':
+                *startpaused = TRUE;
+                break;
+            case 'q':
+                *sendquit = TRUE;
+                break;
+            case 'v':
+            case 'h':
+                printf(
+_("usage: %1$s [-hpq] [files...]\n"
+  "\n"
+  "Transmission %2$s (r%3$d) http://transmission.m0k.org/\n"
+  "A free, lightweight BitTorrent client with a simple, intuitive interface\n"
+  "\n"
+  "  -h --help    display this message and exit\n"
+  "  -p --paused  start with all torrents paused\n"
+  "  -q --quit    request that the running %1$s instance quit\n"
+  "\n"
+  "Only one instance of %1$s may run at one time. Multiple\n"
+  "torrent files may be loaded at startup by adding them to the command\n"
+  "line. If %1$s is already running, those torrents will be\n"
+  "opened in the running instance.\n"),
+                        g_get_prgname(), VERSION_STRING, VERSION_REVISION );
+                exit(0);
+                break;
+        }
+    }
+
+    argc -= optind;
+    argv += optind;
+
+    return checkfilenames( argc, argv );
+}
+
+static gboolean
+sendremote( GList * files, gboolean sendquit )
+{
+    gboolean didlock;
+
+    didlock = cf_lock( NULL );
+
+    if( NULL != files )
+    {
+        /* send files if there's another instance, otherwise start normally */
+        if( !didlock )
+        {
+            exit( ipc_sendfiles_blocking( files ) ? 0 : 1 );
+        }
+    }
+
+    if( sendquit )
+    {
+        /* either send a quit message or exit if no other instance */
+        if( !didlock )
+        {
+            exit( ipc_sendquit_blocking() ? 0 : 1 );
+        }
+        exit( 0 );
+    }
+
+    return didlock;
+}
+
+static void
+gtksetup( int * argc, char *** argv )
+{
+    GdkPixbuf * icon;
+
+    gtk_init( argc, argv );
+
+    bindtextdomain( "transmission-gtk", LOCALEDIR );
+    bind_textdomain_codeset( "transmission-gtk", "UTF-8" );
+    textdomain( "transmission-gtk" );
+
+    g_set_application_name( _("Transmission") );
+
+    /* tweak some style properties in dialogs to get closer to the GNOME HiG */
+    gtk_rc_parse_string(
+        "style \"transmission-standard\"\n"
+        "{\n"
+        "    GtkDialog::action-area-border  = 6\n"
+        "    GtkDialog::button-spacing      = 12\n"
+        "    GtkDialog::content-area-border = 6\n"
+        "}\n"
+        "widget \"TransmissionDialog\" style \"transmission-standard\"\n" );
+
+    icon = gdk_pixbuf_new_from_inline( -1, tr_icon_full, FALSE, NULL );
+    gtk_window_set_default_icon( icon );
+    g_object_unref( icon );
+}
+
+static void
+appsetup( TrWindow * wind, benc_val_t * state, GList * args, gboolean paused )
+{
+    GType types[] =
+    {
+        /* info->name, info->totalSize, status,     error,      errorString, */
+        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, downloaded,    uploaded */
+        G_TYPE_INT,        G_TYPE_INT,       G_TYPE_UINT64, G_TYPE_UINT64,
+        /* the TrTorrent object */
+        TR_TORRENT_TYPE,
+    };
+    struct cbdata * cbdata;
+    GtkListStore  * store;
+    guint           flags;
+
+    /* create the model used to store torrent data */
+    g_assert( ALEN( types ) == MC_ROW_COUNT );
+    store = gtk_list_store_newv( MC_ROW_COUNT, types );
+
+    /* fill out cbdata */
+    cbdata = g_new0( struct cbdata, 1 );
+    cbdata->back       = tr_backend_new();
+    cbdata->wind       = NULL;
+    cbdata->model      = GTK_TREE_MODEL(store);
+    cbdata->icon       = NULL;
+    cbdata->prefs      = NULL;
+    cbdata->timer      = 0;
+    cbdata->msgwinopen = FALSE;
+    cbdata->closing    = FALSE;
+
+    /* apply a few prefs */
+    readinitialprefs( cbdata );
+
+    /* set up main window */
+    winsetup( cbdata, wind );
+
+    /* add torrents from command-line and saved state */
+    flags = addactionflag( tr_prefs_get( PREF_ID_ADDIPC ) );
+    g_assert( !( flags & ( TR_TORNEW_PAUSED | TR_TORNEW_RUNNING ) ) );
+    if( paused )
+    {
+        flags |= TR_TORNEW_PAUSED;
+    }
+    addtorrents( cbdata, state, args, NULL, flags );
+
+    /* start model update timer */
+    cbdata->timer = g_timeout_add( UPDATE_INTERVAL, updatemodel, cbdata );
+    updatemodel( cbdata );
+
+    /* this shows the window */
+    tr_window_size_hack( wind );
+
+    /* set up the ipc socket now that we're ready to get torrents from it */
+    ipc_socket_setup( GTK_WINDOW( wind ), addtorrents, wannaquit, cbdata );
+}
+
+static void
+winsetup( struct cbdata * cbdata, TrWindow * wind )
+{
+    int ii;
+    GtkWidget  * drag;
+
+    g_assert( ACTION_COUNT == ALEN( actions ) );
+    g_assert( NULL == cbdata->wind );
+    cbdata->wind = GTK_WINDOW( wind );
+    for( ii = 0; ii < ALEN( actions ); ii++ )
+    {
+        tr_window_action_add( wind, ii, actions[ii].flags,
+                              gettext( actions[ii].label ), actions[ii].icon,
+                              gettext( actions[ii].tooltip ) );
+    }
+    g_object_set( wind, "model", cbdata->model,
+                        "double-click-action", ACT_INFO, NULL);
+
+    g_signal_connect( wind, "action",       G_CALLBACK( windact  ), cbdata );
+    g_signal_connect( wind, "delete-event", G_CALLBACK( winclose ), cbdata );
+    
+    g_object_get( wind, "drag-widget", &drag, NULL );
+    setupdrag( drag, cbdata );
+}
+
+static void
+remakewind( struct cbdata * cbdata )
+{
+    GtkWidget * win;
+
+    if( NULL != cbdata->wind )
+    {
+        return;
+    }
+
+    /* create window */
+    win = tr_window_new();
+    winsetup( cbdata, TR_WINDOW( win ) );
+
+    /* this shows the window */
+    tr_window_size_hack( TR_WINDOW( win ) );
+}
+
+static void
+makeicon( struct cbdata * cbdata )
+{
+    TrIcon * icon;
+
+    if( NULL != cbdata->icon )
+    {
+        return;
+    }
+
+    icon = tr_icon_new();
+    g_object_set( icon, "activate-action", ACT_ICON, NULL);
+    g_signal_connect( icon, "action", G_CALLBACK( windact  ), cbdata );
+
+    cbdata->icon = icon;
+}
+
+static gboolean
+winclose( GtkWidget * widget SHUTUP, GdkEvent * event SHUTUP, gpointer gdata )
+{
+    struct cbdata * cbdata;
+
+    cbdata = gdata;
+
+    if( NULL != cbdata->icon && tr_icon_docked( cbdata->icon ) )
+    {
+        gtk_widget_destroy( GTK_WIDGET( cbdata->wind ) );
+        cbdata->wind = NULL;
+    }
+    else
+    {
+        askquit( cbdata->wind, wannaquit, cbdata );
+    }
+
+    /* don't propagate event further */
+    return TRUE;
+}
+
+static void
+wannaquit( void * vdata )
+{
+  struct cbdata * data;
   struct exitdata *edata;
   GtkTreeIter iter;
   TrTorrent *tor;
 
+  data = vdata;
+  if( data->closing )
+  {
+      return;
+  }
   data->closing = TRUE;
 
@@ -403 +537 @@
     /* yes, start the exit timer and disable widgets */
     edata->timer = g_timeout_add(EXIT_CHECK_INTERVAL, exitcheck, edata);
-    gtk_widget_set_sensitive( GTK_WIDGET( data->wind ), FALSE );
-  }
-
-  /* returning FALSE means to destroy the window */
-  return TRUE;
-}
-
-gboolean
-exitcheck(gpointer gdata) {
-  struct exitdata *data = gdata;
-  tr_handle_status_t * hstat;
-
-  hstat = tr_handleStatus( tr_backend_handle( data->cbdata->back ) );
-
-  /* keep going if we haven't hit the exit timeout and
-     we either have torrents left or nat traversal is stopping */
-  if( time( NULL ) - data->started < TRACKER_EXIT_TIMEOUT &&
-      ( !tr_backend_torrents_stopped( data->cbdata->back ) ||
-        TR_NAT_TRAVERSAL_DISABLED != hstat->natTraversalStatus ) ) {
-    updatemodel(data->cbdata);
-    return TRUE;
-  }
-
-  /* exit otherwise */
-  if(0 < data->timer)
-    g_source_remove(data->timer);
-  quittransmission(data->cbdata);
-  g_free(data);
-
-  return FALSE;
+    if( NULL != data->wind )
+    {
+        gtk_widget_set_sensitive( GTK_WIDGET( data->wind ), FALSE );
+    }
+  }
+}
+
+static gboolean
+exitcheck( gpointer gdata )
+{
+    struct exitdata    * edata;
+    struct cbdata      * cbdata;
+    tr_handle_status_t * hstat;
+
+    edata  = gdata;
+    cbdata = edata->cbdata;
+    hstat  = tr_handleStatus( tr_backend_handle( cbdata->back ) );
+
+    /* keep going if we haven't hit the exit timeout and
+       we either have torrents left or nat traversal is active */
+    if( time( NULL ) - edata->started < TRACKER_EXIT_TIMEOUT )
+    {
+        if( !tr_backend_torrents_stopped( cbdata->back, FALSE ) ||
+            TR_NAT_TRAVERSAL_DISABLED != hstat->natTraversalStatus )
+        {
+            updatemodel( cbdata );
+            return TRUE;
+        }
+    }
+    else
+    {
+        /* time the remaining torrents out so they signal politely-stopped */
+        tr_backend_torrents_stopped( cbdata->back, TRUE );
+    }
+
+    /* exit otherwise */
+    if( 0 < edata->timer )
+    {
+        g_source_remove( edata->timer );
+    }
+    g_free( edata );
+    /* The prefs window need to be destroyed first as destroying it may
+       trigger callbacks that use cbdata->back. Ick. */
+    if( NULL != cbdata->prefs )
+    {
+        gtk_widget_destroy( GTK_WIDGET( cbdata->prefs ) );
+    }
+    g_object_unref( G_OBJECT( cbdata->back ) );
+    if( NULL != cbdata->wind )
+    {
+        gtk_widget_destroy( GTK_WIDGET( cbdata->wind ) );
+    }
+    g_object_unref( cbdata->model );
+    if( NULL != cbdata->icon )
+    {
+        g_object_unref( cbdata->icon );
+    }
+    g_assert( 0 == cbdata->timer );
+    g_free( cbdata );
+    gtk_main_quit();
+
+    return FALSE;
 }
 
@@ -507 +673 @@
 
     /* try to add any torrents we found */
-    if(NULL != paths)
-      addtorrents(data, NULL, paths, NULL,
-                  addactionflag(cf_getpref(PREF_ADDSTD)));
+    if( NULL != paths )
+    {
+        addtorrents( data, NULL, paths, NULL,
+                     addactionflag( tr_prefs_get( PREF_ID_ADDSTD ) ) );
+    }
     freestrlist(freeables);
     g_free(files);
@@ -529 +697 @@
   gtk_drag_dest_set(widget, GTK_DEST_DEFAULT_ALL, targets,
                     ALEN(targets), GDK_ACTION_COPY | GDK_ACTION_MOVE);
+}
+
+static void
+readinitialprefs( struct cbdata * cbdata )
+{
+    int prefs[] =
+    {
+        PREF_ID_PORT,
+        PREF_ID_USEDOWNLIMIT,
+        PREF_ID_USEUPLIMIT,
+        PREF_ID_NAT,
+        PREF_ID_ICON,
+    };
+    int ii;
+
+    for( ii = 0; ALEN( prefs ) > ii; ii++ )
+    {
+        prefschanged( NULL, prefs[ii], cbdata );
+    }
+}
+
+static void
+prefschanged( GtkWidget * widget SHUTUP, int id, gpointer data )
+{
+    struct cbdata * cbdata;
+    tr_handle_t   * tr;
+    int             num;
+
+    cbdata = data;
+    tr     = tr_backend_handle( cbdata->back );
+
+    switch( id )
+    {
+        case PREF_ID_PORT:
+            tr_setBindPort( tr, tr_prefs_get_int_with_default( id ) );
+            break;
+
+        case PREF_ID_USEDOWNLIMIT:
+        case PREF_ID_DOWNLIMIT:
+            num = -1;
+            if( tr_prefs_get_bool_with_default( PREF_ID_USEDOWNLIMIT ) )
+            {
+                num = tr_prefs_get_int_with_default( PREF_ID_DOWNLIMIT );
+            }
+            tr_setGlobalDownloadLimit( tr, num );
+            break;
+
+        case PREF_ID_USEUPLIMIT:
+        case PREF_ID_UPLIMIT:
+            num = -1;
+            if( tr_prefs_get_bool_with_default( PREF_ID_USEUPLIMIT ) )
+            {
+                num = tr_prefs_get_int_with_default( PREF_ID_UPLIMIT );
+            }
+            tr_setGlobalUploadLimit( tr, num );
+            break;
+
+        case PREF_ID_NAT:
+            tr_natTraversalEnable( tr, tr_prefs_get_bool_with_default( id ) );
+            break;
+
+        case PREF_ID_ICON:
+            if( tr_prefs_get_bool_with_default( id ) )
+            {
+                makeicon( cbdata );
+            }
+            else if( NULL != cbdata->icon )
+            {
+                g_object_unref( cbdata->icon );
+                cbdata->icon = NULL;
+            }
+            break;
+
+        case PREF_ID_DIR:
+        case PREF_ID_ASKDIR:
+        case PREF_ID_ADDSTD:
+        case PREF_ID_ADDIPC:
+        case PREF_ID_MSGLEVEL:
+        case PREF_MAX_ID:
+            break;
+    }
 }
 
@@ -540 +789 @@
   float up, down;
 
-  if(0 < global_sigcount) {
-    quittransmission(data);
-    return FALSE;
+  if( !data->closing && 0 < global_sigcount )
+  {
+      wannaquit( data );
+      return FALSE;
   }
 
@@ -563 +813 @@
 
   /* update the main window's statusbar and toolbar buttons */
-  tr_torrentRates( tr_backend_handle( data->back ), &down, &up );
-  tr_window_update( TR_WINDOW(data->wind), down, up );
+  if( NULL != data->wind )
+  {
+      tr_torrentRates( tr_backend_handle( data->back ), &down, &up );
+      tr_window_update( TR_WINDOW( data->wind ), down, up );
+  }
 
   /* check for politely stopped torrents unless we're exiting */
-  if(!data->closing)
-    tr_backend_torrents_stopped(data->back);
+  if( !data->closing )
+  {
+      tr_backend_torrents_stopped( data->back, FALSE );
+  }
 
   /* update the message window */
@@ -590 +845 @@
 }
 
+/* returns a GList containing a GtkTreeRowReference to each selected row */
+static GList *
+getselection( struct cbdata * cbdata )
+{
+    GtkTreeSelection    * sel;
+    GList               * rows, * ii;
+    GtkTreeRowReference * ref;
+
+    if( NULL == cbdata->wind )
+    {
+        return NULL;
+    }
+    g_object_get( cbdata->wind, "selection", &sel, NULL );
+    rows = gtk_tree_selection_get_selected_rows( sel, NULL );
+    for( ii = rows; NULL != ii; ii = ii->next )
+    {
+        ref = gtk_tree_row_reference_new( cbdata->model, ii->data );
+        gtk_tree_path_free( ii->data );
+        ii->data = ref;
+    }
+
+    return rows;
+}
+
 static void
 handleaction( struct cbdata * data, enum action act )
 {
-  GtkTreeSelection *sel;
   GList *rows, *ii;
-  GtkTreeRowReference *ref;
   GtkTreePath *path;
   GtkTreeIter iter;
@@ -611 +888 @@
           return;
       case ACT_PREF:
-          if( !data->prefsopen )
+          if( NULL != data->prefs )
           {
-              data->prefsopen = TRUE;
-              win = makeprefwindow( data->wind, data->back );
-              g_signal_connect( win, "destroy", G_CALLBACK( boolwindclosed ),
-                                &data->prefsopen );
+              return;
           }
+          data->prefs = tr_prefs_new_with_parent( data->wind );
+          g_signal_connect( data->prefs, "prefs-changed",
+                            G_CALLBACK( prefschanged ), data );
+          g_signal_connect( data->prefs, "destroy",
+                            G_CALLBACK( gtk_widget_destroyed ), &data->prefs );
+          gtk_widget_show( GTK_WIDGET( data->prefs ) );
           return;
       case ACT_DEBUG:
@@ -628 +908 @@
           }
           return;
+      case ACT_ICON:
+          remakewind( data );
+          return;
       case ACT_START:
       case ACT_STOP:
@@ -637 +920 @@
 
   /* get a list of references to selected rows */
-  g_object_get( data->wind, "selection", &sel, NULL );
-  rows = gtk_tree_selection_get_selected_rows( sel, NULL );
-  for(ii = rows; NULL != ii; ii = ii->next) {
-    ref = gtk_tree_row_reference_new(data->model, ii->data);
-    gtk_tree_path_free(ii->data);
-    ii->data = ref;
-  }
+  rows = getselection( data );
 
   changed = FALSE;
@@ -682 +959 @@
               case ACT_PREF:
               case ACT_DEBUG:
+              case ACT_ICON:
               case ACTION_COUNT:
                   break;
@@ -698 +976 @@
     updatemodel(data);
   }
-}
-
-static const char *
-defaultdir( void )
-{
-    static char * wd = NULL;
-    const char  * dir;
-
-    dir = cf_getpref( PREF_DIR );
-    if( NULL == dir )
-    {
-        if( NULL == wd )
-        {
-            wd = g_new( char, MAX_PATH_LENGTH + 1 );
-            if( NULL == getcwd( wd, MAX_PATH_LENGTH + 1 ) )
-            {
-                strcpy( wd, "." );
-            }
-        }
-        dir = wd;
-    }
-
-    return dir;
 }
 
@@ -736 +991 @@
   torlist = NULL;
 
-  if(NULL != state)
-    torlist = tr_backend_load_state(data->back, state, &errlist);
+  if( NULL != state )
+  {
+      torlist = tr_backend_load_state( data->back, state, flags, &errlist );
+  }
 
   if(NULL != files) {
     if( NULL == dir )
     {
-        pref = cf_getpref( PREF_ASKDIR );
+        pref = tr_prefs_get( PREF_ID_ASKDIR );
         if( NULL != pref && strbool( pref ) )
         {
-            promptfordir( data->wind, addtorrents, data,
-                          files, flags, defaultdir() );
+            promptfordir( data->wind, addtorrents, data, files, flags );
             files = NULL;
         }
-        dir = defaultdir();
+        dir = getdownloaddir();
     }
     for(ii = g_list_first(files); NULL != ii; ii = ii->next) {
@@ -774 +1030 @@
   if(NULL != errlist) {
     errstr = joinstrlist(errlist, "\n");
-    errmsg(data->wind, ngettext("Failed to load torrent file:\n%s",
-                                "Failed to load torrent files:\n%s",
-                                g_list_length(errlist)), errstr);
+    errmsg( data->wind, ngettext( "Failed to load torrent file:\n%s",
+                                  "Failed to load torrent files:\n%s",
+                                  g_list_length( errlist ) ), errstr );
     g_list_foreach(errlist, (GFunc)g_free, NULL);
     g_list_free(errlist);
@@ -812 +1068 @@
 static void
 setupsighandlers(void) {
-  int sigs[] = {SIGHUP, SIGINT, SIGQUIT, SIGTERM, SIGUSR1, SIGUSR2};
+  int sigs[] = {SIGHUP, SIGINT, SIGQUIT, SIGTERM};
   struct sigaction sa;
-  unsigned int ii;
+  int ii;
 
   bzero(&sa, sizeof(sa));

trunk/gtk/msgwin.c

@@ -2 +2 @@
  * $Id$
  *
- * Copyright (c) 2006 Transmission authors and contributors
+ * Copyright (c) 2006-2007 Transmission authors and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -31 +31 @@
 #include "conf.h"
 #include "msgwin.h"
+#include "tr_prefs.h"
 #include "transmission.h"
 #include "util.h"
@@ -61 +62 @@
   GtkWidget * frame, * bbox, * save, * clear, * menu;
   PangoFontDescription * desc;
-  unsigned int ii;
-  int curlevel;
+  int ii, curlevel;
 
   if( NULL == textbuf )
@@ -127 +127 @@
       tr_getMessageLevel() != levels[index].id ) {
     tr_setMessageLevel( levels[index].id );
-    cf_setpref( PREF_MSGLEVEL, levels[index].pref );
+    cf_setpref( tr_prefs_name( PREF_ID_MSGLEVEL ), levels[index].pref );
     cf_saveprefs( &ignored );
     g_free( ignored );
@@ -197 +197 @@
 msgwin_loadpref( void ) {
   const char * pref;
-  unsigned int ii;
+  int ii;
 
   tr_setMessageQueuing( 1 );
-  pref = cf_getpref( PREF_MSGLEVEL );
+  pref = tr_prefs_get( PREF_ID_MSGLEVEL );
   if( NULL == pref )
     return;
@@ -217 +217 @@
   GtkTextIter     iter, front;
   char          * label, * line;
-  int             count;
+  int             count, jj;
   struct tm     * tm;
-  unsigned int    jj;
 
   if( NULL == textbuf )

trunk/gtk/tr_backend.c

@@ -2 +2 @@
  * $Id$
  *
- * Copyright (c) 2006 Transmission authors and contributors
+ * Copyright (c) 2006-2007 Transmission authors and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -221 +221 @@
 
 GList *
-tr_backend_load_state(TrBackend *back, benc_val_t *state, GList **errors) {
+tr_backend_load_state( TrBackend * back, benc_val_t * state,
+                       guint flags, GList ** errors )
+{
   GList *ret = NULL;
   int ii;
@@ -234 +236 @@
   for(ii = 0; ii < state->val.l.count; ii++) {
     errstr = NULL;
-    tor = tr_torrent_new_with_state(G_OBJECT(back), state->val.l.vals + ii,
-                                    &errstr);
+    tor = tr_torrent_new_with_state( G_OBJECT( back ), state->val.l.vals + ii,
+                                     flags, &errstr );
     if(NULL != errstr)
       *errors = g_list_append(*errors, errstr);
@@ -274 +276 @@
 
 gboolean
-tr_backend_torrents_stopped(TrBackend *back) {
-  GList *ii, *list;
-  tr_stat_t *st;
-  gboolean ret = TRUE;
-
-  TR_IS_BACKEND(back);
-
-  list = g_list_copy(back->torrents);
-  for(ii = list; NULL != ii; ii = ii->next) {
-    st = tr_torrent_stat_polite(ii->data);
-    if(NULL == st || !(TR_STATUS_PAUSE & st->status))
-      ret = FALSE;
-  }
-  g_list_free(list);
-
-  return ret;
-}
+tr_backend_torrents_stopped( TrBackend * back, gboolean timeout )
+{
+    GList     * ii, * list;
+    tr_stat_t * st;
+    gboolean  ret;
+
+    TR_IS_BACKEND( back );
+
+    ret  = TRUE;
+    list = g_list_copy( back->torrents );
+    for( ii = list; NULL != ii; ii = ii->next )
+    {
+        st = tr_torrent_stat_polite( ii->data, timeout );
+        if( NULL == st || !( TR_STATUS_PAUSE & st->status ) )
+        {
+            ret = FALSE;
+        }
+    }
+    g_list_free( list );
+
+    return ret;
+}

trunk/gtk/tr_backend.h

@@ -2 +2 @@
  * $Id$
  *
- * Copyright (c) 2006 Transmission authors and contributors
+ * Copyright (c) 2006-2007 Transmission authors and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -71 +71 @@
 
 GList *
-tr_backend_load_state(TrBackend *back, benc_val_t *state, GList **errors);
+tr_backend_load_state( TrBackend * back, benc_val_t * state,
+                       guint flags, GList ** errors );
 
 void
@@ -77 +78 @@
 
 gboolean
-tr_backend_torrents_stopped(TrBackend *back);
+tr_backend_torrents_stopped( TrBackend * back, gboolean timeout );
 
 #ifdef TR_WANT_BACKEND_PRIVATE

trunk/gtk/tr_torrent.c

@@ -309 +309 @@
 
 TrTorrent *
-tr_torrent_new_with_state(GObject *backend, benc_val_t *state, char **err) {
+tr_torrent_new_with_state( GObject * backend, benc_val_t * state,
+                           guint forcedflags, char ** err)
+{
   int ii;
   benc_val_t *name, *data;
@@ -354 +356 @@
     torrent = hash;
   }
+  forcedflags &= TR_TORNEW_PAUSED | TR_TORNEW_RUNNING;
+  if( forcedflags )
+  {
+      flags &= ~( TR_TORNEW_PAUSED | TR_TORNEW_RUNNING );
+      flags |= forcedflags;
+  }
 
   return tr_torrent_new(backend, torrent, dir, flags, err);
@@ -449 +457 @@
 
 tr_stat_t *
-tr_torrent_stat_polite(TrTorrent *tor) {
-  TrTorrentClass *klass;
-  tr_stat_t *st;
-
-  if(tor->disposed)
-    return NULL;
-
-  st = tr_torrentStat(tor->handle);
-  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 tr_torrent_stat_polite(tor);
-  }
-
-  return st;
-}
+tr_torrent_stat_polite( TrTorrent * tor, gboolean timeout )
+{
+    TrTorrentClass * klass;
+    tr_stat_t      * st;
+
+    TR_IS_TORRENT( tor );
+
+    if( tor->disposed )
+    {
+        return NULL;
+    }
+
+    st = tr_torrentStat( tor->handle );
+    if( tor->closing && ( TR_STATUS_PAUSE & st->status || timeout ) )
+    {
+        tor->closing = FALSE;
+        klass = g_type_class_peek( TR_TORRENT_TYPE );
+        g_signal_emit( tor, klass->paused_signal_id, 0, NULL );
+        return tr_torrent_stat_polite( tor, FALSE );
+    }
+
+    return st;
+}

trunk/gtk/tr_torrent.h

@@ -2 +2 @@
  * $Id$
  *
- * Copyright (c) 2006 Transmission authors and contributors
+ * Copyright (c) 2006-2007 Transmission authors and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -89 +89 @@
 
 TrTorrent *
-tr_torrent_new_with_state(GObject *backend, benc_val_t *state, char **err);
+tr_torrent_new_with_state( GObject * backend, benc_val_t * state,
+                           guint flags, char ** err );
 
 void
@@ -95 +96 @@
 
 tr_stat_t *
-tr_torrent_stat_polite(TrTorrent *tor);
+tr_torrent_stat_polite( TrTorrent * tor, gboolean timeout );
 
 #ifdef TR_WANT_TORRENT_PRIVATE

trunk/gtk/tr_window.h

@@ -91 +91 @@
 
 /* some evil magic to show the window with a nice initial window size */
+/* note that the gtk main loop runs in this function */
 void
 tr_window_size_hack( TrWindow * wind );
 
-/* XXX these should be somewhere else */
-#define ACTF_TOOL       ( 1 << 0 ) /* appear in the toolbar */
-#define ACTF_MENU       ( 1 << 1 ) /* appear in the popup menu */
-#define ACTF_ALWAYS     ( 1 << 2 ) /* available regardless of selection */
-#define ACTF_ACTIVE     ( 1 << 3 ) /* available for active torrent */
-#define ACTF_INACTIVE   ( 1 << 4 ) /* available for inactive torrent */
-/* appear in the toolbar and the popup menu */
-#define ACTF_WHEREVER   ( ACTF_TOOL | ACTF_MENU )
-/* available if there is something selected */
-#define ACTF_WHATEVER   ( ACTF_ACTIVE | ACTF_INACTIVE )
-
-/* XXX this too*/
-#define ACT_ISAVAIL( flags, status ) \
-    ( ( ACTF_ACTIVE   & (flags) && TR_STATUS_ACTIVE   & (status) ) || \
-      ( ACTF_INACTIVE & (flags) && TR_STATUS_INACTIVE & (status) ) || \
-        ACTF_ALWAYS   & (flags) )
-
-/* XXX and this */
-/* model column names */
-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_DOWN, MC_UP,
-  MC_TORRENT, MC_ROW_COUNT,
-};
-
 #endif

trunk/gtk/transmission-gtk.desktop

@@ -4 +4 @@
 Name=Transmission
 Name[ru]=ПереЎача
-GenericName=BitTorrent Client
 Type=Application
-Comment=A free, lightweight client with a simple, intuitive interface
+Comment=A free, lightweight BitTorrent client with a simple, intuitive interface
 Exec=transmission-gtk %F
 TryExec=transmission-gtk

trunk/gtk/util.c

@@ -2 +2 @@
  * $Id$
  *
- * Copyright (c) 2005-2006 Transmission authors and contributors
+ * Copyright (c) 2005-2007 Transmission authors and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -34 +34 @@
 #include <glib/gi18n.h>
 
+#include "tr_prefs.h"
 #include "tr_torrent.h"
 #include "util.h"
@@ -66 +67 @@
 char *
 readablesize(guint64 size) {
-  unsigned int ii;
+  int ii;
   double small = size;
 
@@ -309 +310 @@
 }
 
+const char *
+getdownloaddir( void )
+{
+    static char * wd = NULL;
+    const char  * dir;
+
+    dir = tr_prefs_get( PREF_ID_DIR );
+    if( NULL == dir )
+    {
+        if( NULL == wd )
+        {
+            wd = g_new( char, MAX_PATH_LENGTH + 1 );
+            if( NULL == getcwd( wd, MAX_PATH_LENGTH + 1 ) )
+            {
+                strcpy( wd, "." );
+            }
+        }
+        dir = wd;
+    }
+
+    return dir;
+}
+
+void
+errmsg( GtkWindow * wind, const char * format, ... )
+{
+    GtkWidget * dialog;
+    va_list     ap;
+
+    va_start( ap, format );
+    dialog = verrmsg_full( wind, NULL, NULL, format, ap );
+    va_end( ap );
+
+    if( NULL != wind && !GTK_WIDGET_MAPPED( GTK_WIDGET( wind ) ) )
+    {
+        g_signal_connect_swapped( wind, "map",
+                                  G_CALLBACK( gtk_widget_show ), dialog );
+    }
+    else
+    {
+        gtk_widget_show( dialog );
+    }
+}
+
 GtkWidget *
-errmsg(GtkWindow *wind, const char *format, ...) {
-  GtkWidget *dialog;
-  va_list ap;
-
-  va_start(ap, format);
-  dialog = verrmsg(wind, NULL, NULL, format, ap);
-  va_end(ap);
-
-  return dialog;
+errmsg_full( GtkWindow * wind, callbackfunc_t func, void * data,
+             const char * format, ... )
+{
+    GtkWidget * dialog;
+    va_list     ap;
+
+    va_start( ap, format );
+    dialog = verrmsg_full( wind, func, data, format, ap );
+    va_end( ap );
+
+    return dialog;
 }
 
 GtkWidget *
-errmsg_full(GtkWindow *wind, callbackfunc_t func, void *data,
-            const char *format, ...) {
-  GtkWidget *dialog;
-  va_list ap;
-
-  va_start(ap, format);
-  dialog = verrmsg(wind, func, data, format, ap);
-  va_end(ap);
-
-  return dialog;
-}
-
-GtkWidget *
-verrmsg(GtkWindow *wind, callbackfunc_t func, void *data,
-        const char *format, va_list ap) {
+verrmsg_full( GtkWindow * wind, callbackfunc_t func, void * data,
+              const char * format, va_list ap )
+{
   GtkWidget *dialog;
   char *msg;
@@ -356 +391 @@
     funcdata = g_list_append(g_list_append(NULL, func), data);
   g_signal_connect(dialog, "response", G_CALLBACK(errcb), funcdata);
-  if(NULL != wind)
-    gtk_widget_show(dialog);
   g_free(msg);
 

trunk/gtk/util.h

@@ -39 +39 @@
 
 /* return number of items in array */
-#define ALEN(a)                 (sizeof(a) / sizeof((a)[0]))
-
-#define ISA(o, t)               (g_type_is_a(G_OBJECT_TYPE(G_OBJECT(o)), (t)))
+#define ALEN( a )               ( ( signed )( sizeof(a) / sizeof( (a)[0] ) ) )
 
 /* used for a callback function with a data parameter */
 typedef void (*callbackfunc_t)(void*);
+
+/* flags indicating where and when an action is valid */
+#define ACTF_TOOL       ( 1 << 0 ) /* appear in the toolbar */
+#define ACTF_MENU       ( 1 << 1 ) /* appear in the popup menu */
+#define ACTF_ALWAYS     ( 1 << 2 ) /* available regardless of selection */
+#define ACTF_ACTIVE     ( 1 << 3 ) /* available for active torrent */
+#define ACTF_INACTIVE   ( 1 << 4 ) /* available for inactive torrent */
+/* appear in the toolbar and the popup menu */
+#define ACTF_WHEREVER   ( ACTF_TOOL | ACTF_MENU )
+/* available if there is something selected */
+#define ACTF_WHATEVER   ( ACTF_ACTIVE | ACTF_INACTIVE )
+
+/* checking action flags against torrent status */
+#define ACT_ISAVAIL( flags, status ) \
+    ( ( ACTF_ACTIVE   & (flags) && TR_STATUS_ACTIVE   & (status) ) || \
+      ( ACTF_INACTIVE & (flags) && TR_STATUS_INACTIVE & (status) ) || \
+        ACTF_ALWAYS   & (flags) )
+
+/* column names for the model used to store torrent information */
+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_DOWN, MC_UP,
+  MC_TORRENT, MC_ROW_COUNT,
+};
 
 /* try to interpret a string as a textual representation of a boolean */
@@ -102 +125 @@
 makeglist(void *ptr, ...);
 
+/* retrieve the global download directory */
+const char *
+getdownloaddir( void );
+
 #ifdef GTK_MAJOR_VERSION
 
-/* if wind is NULL then you must call gtk_widget_show on the returned widget */
+/* create an error dialog, if wind is NULL or mapped then show dialog now,
+   otherwise show it when wind becomes mapped */
+void
+errmsg( GtkWindow * wind, const char * format, ... )
+#ifdef __GNUC__
+    __attribute__ (( format ( printf, 2, 3 ) ))
+#endif
+    ;
 
+/* create an error dialog but do not gtk_widget_show() it,
+   calls func( data ) when the dialog is closed */
 GtkWidget *
-errmsg(GtkWindow *wind, const char *format, ...)
+errmsg_full( GtkWindow * wind, callbackfunc_t func, void * data,
+             const char * format, ... )
 #ifdef __GNUC__
-  __attribute__ ((format (printf, 2, 3)))
+    __attribute__ (( format ( printf, 4, 5 ) ))
 #endif
-  ;
+    ;
 
+/* varargs version of errmsg_full() */
 GtkWidget *
-errmsg_full(GtkWindow *wind, callbackfunc_t func, void *data,
-            const char *format, ...)
-#ifdef __GNUC__
-  __attribute__ ((format (printf, 4, 5)))
-#endif
-  ;
-
-GtkWidget *
-verrmsg(GtkWindow *wind, callbackfunc_t func, void *data,
-        const char *format, va_list ap);
+verrmsg_full( GtkWindow * wind, callbackfunc_t func, void * data,
+              const char * format, va_list ap );
 
 #endif /* GTK_MAJOR_VERSION */

trunk/mk/gtk.mk

@@ -4 +4 @@
 include ../mk/common.mk
 
-SRCS = conf.c dialogs.c io.c ipc.c main.c msgwin.c tr_backend.c tr_torrent.c \
-        tr_cell_renderer_progress.c tr_window.c util.c
+SRCS = conf.c dialogs.c io.c ipc.c main.c msgwin.c tr_backend.c \
+        tr_cell_renderer_progress.c tr_icon.c tr_prefs.c tr_torrent.c \
+        tr_window.c util.c
 OBJS = $(SRCS:%.c=%.o)