Changeset 7

Timestamp:

Jan 12, 2006, 6:40:47 PM (15 years ago)

Author:

root

Message:

Update 2005-11-24

Location:

trunk

Files:

• AUTHORS (modified) (1 diff)
• Jamfile (modified) (3 diffs)
• Jamrules (modified) (2 diffs)
• gtk/Jamfile (modified) (1 diff)
• gtk/conf.c (modified) (7 diffs)
• gtk/conf.h (modified) (1 diff)
• gtk/main.c (modified) (28 diffs)
• gtk/prefs.c (added)
• gtk/prefs.h (added)
• gtk/util.c (modified) (7 diffs)
• gtk/util.h (modified) (5 diffs)
• libtransmission/transmission.c (modified) (1 diff)
• libtransmission/transmission.h (modified) (1 diff)
• libtransmission/upload.c (modified) (1 diff)
• libtransmission/utils.h (modified) (1 diff)
• macosx/Applescript (added)
• macosx/Applescript/Torrents_folder_action.scpt (added)
• macosx/Controller.h (modified) (2 diffs)
• macosx/Controller.m (modified) (5 diffs)
• macosx/PrefsController.m (modified) (3 diffs)
• macosx/ProgressCell.h (modified) (1 diff)
• macosx/ProgressCell.m (modified) (6 diffs)
• macosx/TorrentTableView.m (modified) (2 diffs)
• macosx/Torrents_folder_action.scpt (added)
• macosx/Transmission.xcodeproj/project.pbxproj (modified) (6 diffs)
• transmissioncli.c (modified) (4 diffs)

trunk/AUTHORS

@@ -9 +9 @@
 
 Josh Elsasser <josh@elsasser.org>
- + GTK interface
+ + GTK+ interface
 
 Michael Demars <keul@m0k.org>

trunk/Jamfile

@@ -7 +7 @@
 if $(OS) = MACOSX
 {
-    OSXLinks macosx/Frameworks/Growl.framework/Growl ;
     OSXInfoPlist macosx/Info.plist : macosx/Info.plist.in ;
     OSXBundle Transmission.app : libtransmission.a
@@ -17 +16 @@
         macosx/English.lproj/MainMenu.nib/info.nib
         macosx/English.lproj/MainMenu.nib/keyedobjects.nib
-        macosx/Frameworks/Growl.framework/Growl
         macosx/Images/Info.png
         macosx/Images/Open.png
@@ -38 +36 @@
         macosx/TorrentTableView.h
         macosx/TorrentTableView.m
+        macosx/Transmission.sdef
         macosx/Transmission.xcodeproj/project.pbxproj
         macosx/Transmission_Prefix.pch

trunk/Jamrules

@@ -9 +9 @@
 VERSION_MINOR  = 4 ;
 # VERSION_STRING = $(VERSION_MAJOR).$(VERSION_MINOR) ;
-VERSION_STRING = 0.5-cvs ;
+VERSION_STRING = CVS-20051124 ;
 
 DEFINES += VERSION_MAJOR=$(VERSION_MAJOR)
@@ -39 +39 @@
     {
         libtool -static $(>) -o $(<) ;
-    }
-
-    rule OSXLinks
-    {
-    }
-    actions OSXLinks
-    {
-        ( cd macosx/Frameworks/Growl.framework/ && \
-          ln -s Versions/Current/Growl && \
-          ln -s Versions/Current/Headers && \
-          ln -s Versions/Current/Resources && \
-          ln -s A Versions/Current )
     }
 

trunk/gtk/Jamfile

@@ -1 +1 @@
 SubDir TOP gtk ;
 
-GTK_SRC = conf.c main.c util.c ;
+GTK_SRC = conf.c main.c prefs.c util.c ;
 
 Main          transmission-gtk   : $(GTK_SRC) ;

trunk/gtk/conf.c

@@ -40 +40 @@
 #include "conf.h"
 #include "transmission.h"
+#include "util.h"
 
 #define FILE_LOCK               "gtk_lock"
@@ -160 +161 @@
     goto done;
   }
-  /*g_io_channel_set_encoding(io, NULL, NULL);*/
   g_io_channel_set_line_term(io, &term, 1);
 
@@ -210 +210 @@
   g_tree_insert(prefs, g_strdup(name), g_strdup(value));
 
-  return writeprefs(errstr);
+  if(NULL != errstr)
+    return writeprefs(errstr);
+  else
+    return TRUE;
 }
 
@@ -237 +240 @@
   }
 
+#ifdef NDEBUG
+  ftruncate(fd, 0);
+#else
+  assert(0 == ftruncate(fd, 0));
+#endif
+
   info.err = NULL;
   io = g_io_channel_unix_new(fd);
-  /*g_io_channel_set_encoding(io, NULL, NULL);*/
   g_io_channel_set_close_on_unref(io, TRUE);
 
@@ -319 +327 @@
     goto done;
   }
-  /*g_io_channel_set_encoding(io, NULL, NULL);*/
   g_io_channel_set_line_term(io, &term, 1);
 
@@ -368 +375 @@
   char *start, *end;
 
+  /* skip any leading whitespace */
   while(isspace(*line))
     line++;
 
-  if(NULL == (start = strchr(line, '=')))
+  /* walk over the key, which may be alphanumerics as well as - or _ */
+  for(start = line; isalnum(*start) || '_' == *start || '-' == *start; start++)
+    ;
+
+  /* they key must be immediately followed by an = */
+  if('=' != *start)
     return NULL;
-
-  while(isspace(*(++start)))
-    ;
-
-  if('"' != *start)
+  *(start++) = '\0';
+
+  /* then the opening quote for the value */
+  if('"' != *(start++))
     return NULL;
 
-  for(end = ++start; '\0' != *end && '"' != *end; end++)
+  /* walk over the value */
+  for(end = start; '\0' != *end && '"' != *end; end++)
+    /* skip over escaped quotes */
     if('\\' == *end && '\0' != *(end + 1))
       end++;
 
+  /* make sure we didn't hit the end of the string */
   if('"' != *end)
     return NULL;
-
-  if(0 == memcmp(line, "torrent", sizeof("torrent") - 1)) {
-    state->ts_torrent = g_new(char, end - start + 1);
-    memcpy(state->ts_torrent, start, end - start);
-    state->ts_torrent[end - start] = '\0';
-  }
-  else if(0 == memcmp(line, "dir", sizeof("dir") - 1)) {
-    state->ts_directory = g_new(char, end - start + 1);
-    memcpy(state->ts_directory, start, end - start);
-    state->ts_directory[end - start] = '\0';
-  }
-  else if(0 == memcmp(line, "paused", sizeof("paused") - 1)) {
-    state->ts_paused = (0 == memcmp("yes", start, end - start));
-  }
-
+  *end = '\0';
+
+  /* if it's a key we recognize then save the data */
+  if(0 == strcmp(line, "torrent"))
+    state->ts_torrent = g_strcompress(start);
+  else if(0 == strcmp(line, "dir"))
+    state->ts_directory = g_strcompress(start);
+  else if(0 == strcmp(line, "paused"))
+    state->ts_paused = strbool(start);
+
+  /* return a pointer to just past the end of the value */
   return end + 1;
 }
 
-/* XXX need to save download directory, also maybe running/stopped state */
 gboolean
 cf_savestate(int count, tr_stat_t *torrents, char **errstr) {
@@ -426 +436 @@
   }
 
+#ifdef NDEBUG
+  ftruncate(fd, 0);
+#else
+  assert(0 == ftruncate(fd, 0));
+#endif
+
   io = g_io_channel_unix_new(fd);
+  g_io_channel_set_close_on_unref(io, TRUE);
+
   /* XXX what the hell should I be doing about unicode? */
-  /*g_io_channel_set_encoding(io, NULL, NULL);*/
-  g_io_channel_set_close_on_unref(io, TRUE);
 
   err = NULL;

trunk/gtk/conf.h

@@ -44 +44 @@
 const char *
 cf_getpref(const char *name);
+/* if errstr is NULL then prefs will not be saved */
 gboolean
 cf_setpref(const char *name, const char *value, char **errstr);

trunk/gtk/main.c

@@ -25 +25 @@
 */
 
+#include <sys/param.h>
 #include <assert.h>
+#include <errno.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <sys/param.h>
 #include <time.h>
 #include <unistd.h>
@@ -36 +37 @@
 
 #include "conf.h"
+#include "prefs.h"
 #include "transmission.h"
 #include "util.h"
@@ -43 +45 @@
 struct cbdata {
   tr_handle_t *tr;
-  GtkWidget *wind;
+  GtkWindow *wind;
   GtkListStore *model;
   GtkTreeView *view;
@@ -60 +62 @@
 
 void
-readargs(int argc, char **argv, int *port, int *limit);
-void
 maketypes(void);
 gpointer
@@ -93 +93 @@
 makeaddwind(struct cbdata *data);
 gboolean
-addtorrent(tr_handle_t *tr, GtkWidget *parentwind, const char *torrent,
+addtorrent(tr_handle_t *tr, GtkWindow *parentwind, const char *torrent,
            const char *dir, gboolean paused);
 void
@@ -102 +102 @@
 makeinfowind(struct cbdata *data, int index);
 gboolean
-savetorrents(tr_handle_t *tr, GtkWidget *wind, int count, tr_stat_t *stat);
+savetorrents(tr_handle_t *tr, GtkWindow *wind, int count, tr_stat_t *stat);
 
 #define TR_TYPE_PIECES_NAME     "tr-type-pieces"
@@ -110 +110 @@
 
 #define LIST_ACTION           "torrent-list-action"
-enum listact { ACT_OPEN, ACT_START, ACT_STOP, ACT_DELETE, ACT_INFO };
+enum listact { ACT_OPEN, ACT_START, ACT_STOP, ACT_DELETE, ACT_INFO, ACT_PREF };
 #define LIST_ACTION_FROM      "torrent-list-action-from"
 enum listfrom { FROM_BUTTON, FROM_POPUP };
@@ -129 +129 @@
   {4,  "Properties",  GTK_STOCK_PROPERTIES,   ACT_INFO,
    "Get additional information for a torrent", "XXX"},
+  {5,  "Preferences", GTK_STOCK_PREFERENCES,  ACT_PREF,
+   "Open preferences dialog", "XXX"},
 };
 
@@ -136 +138 @@
   GtkWidget *mainwind, *preferr, *stateerr;
   char *err;
-  int port, limit;
   tr_handle_t *tr;
   GList *saved;
+  const char *pref;
+  long intval;
 
   gtk_init(&argc, &argv);
-  readargs(argc, argv, &port, &limit);
 
   tr = tr_init();
@@ -153 +155 @@
 
       if(!cf_loadprefs(&err)) {
-        preferr = errmsg(mainwind, "%s", err);
+        preferr = errmsg(GTK_WINDOW(mainwind), "%s", err);
         g_free(err);
       }
       saved = cf_loadstate(&err);
       if(NULL != err) {
-        stateerr = errmsg(mainwind, "%s", err);
+        stateerr = errmsg(GTK_WINDOW(mainwind), "%s", err);
         g_free(err);
       }
 
-      /* XXX need to remove port and limit options and make them prefs */
-      /* XXX need prefs gui */
-      /* XXX need default save dir pref */
-
-      if(0 != port)
-        tr_setBindPort(tr, port);
-      if(0 != limit)
-        tr_setUploadLimit(tr, limit);
+      /* set the upload limit */
+      setlimit(tr);
+
+      /* set the listening port */
+      if(NULL != (pref = cf_getpref(PREF_PORT)) &&
+         0 < (intval = strtol(pref, NULL, 10)) && 0xffff >= intval)
+        tr_setBindPort(tr, intval);
 
       maketypes();
@@ -179 +180 @@
         gtk_widget_show_all(stateerr);
     } else {
-      errmsg_full(NULL, (errfunc_t)gtk_main_quit, NULL, "%s", err);
+      gtk_widget_show(errmsg_full(NULL, (errfunc_t)gtk_main_quit,
+                                  NULL, "%s", err));
       g_free(err);
     }
   } else {
-    errmsg_full(NULL, (errfunc_t)gtk_main_quit, NULL, "%s", err);
+    gtk_widget_show(errmsg_full(NULL, (errfunc_t)gtk_main_quit,
+                                NULL, "%s", err));
     g_free(err);
   }
@@ -190 +193 @@
 
   return 0;
-}
-
-void
-readargs(int argc, char **argv, int *port, int *limit) {
-  char *name;
-  int opt, num;
-
-  *port = 0;
-  *limit = 0;
-
-  if(NULL == (name = strrchr(argv[0], '/')) || '\0' == *(++name))
-    name = argv[0];
-
-  for(num = 1; num < argc; num++)
-    if(0 == strcmp(argv[num], "-help") || 0 == strcmp(argv[num], "--help"))
-      goto usage;
-
-  while(0 <= (opt = getopt(argc, argv, "hp:u:"))) {
-    switch(opt) {
-      case 'p':
-        num = atoi(optarg);
-        if(0 < num && 0xffff > num)
-          *port = num;
-        break;
-      case 'u':
-        num = atoi(optarg);
-        if(0 != num)
-          *limit = num;
-        break;
-      default:
-        goto usage;
-    }
-  }
-
-  return;
-
- usage:
-  printf("usage: %s [-h] [-p port] [-u limit]\n", name);
-  exit(1);
 }
 
@@ -258 +222 @@
 
   data->tr = tr;
-  data->wind = wind;
+  data->wind = GTK_WINDOW(wind);
   data->timer = -1;
   /* filled in by makewind_list */
@@ -278 +242 @@
   for(ii = g_list_first(saved); NULL != ii; ii = ii->next) {
     ts = ii->data;
-    addtorrent(tr, wind, ts->ts_torrent, ts->ts_directory, ts->ts_paused);
+    addtorrent(tr, GTK_WINDOW(wind),
+               ts->ts_torrent, ts->ts_directory, ts->ts_paused);
     cf_freestate(ts);
   }
@@ -323 +288 @@
   fprintf(stderr, "quit: starting timeout at %i\n", edata->started);
 
-  //exitcheck(edata);
-
   /* returning FALSE means to destroy the window */
   return TRUE;
@@ -364 +327 @@
   data->timer = -1;
 
-  gtk_widget_destroy(data->cbdata->wind);
+  gtk_widget_destroy(GTK_WIDGET(data->cbdata->wind));
   tr_close(data->cbdata->tr);
   g_free(data->cbdata);
@@ -382 +345 @@
   gtk_toolbar_set_style(GTK_TOOLBAR(bar), GTK_TOOLBAR_BOTH);
 
-  for(ii = 0; ii < sizeof(actionitems) / sizeof(actionitems[0]); ii++) {
+  for(ii = 0; ii < ALEN(actionitems); ii++) {
     item = gtk_tool_button_new_from_stock(actionitems[ii].id);
     gtk_tool_button_set_label(GTK_TOOL_BUTTON(item), actionitems[ii].name);
@@ -420 +383 @@
   GtkCellRenderer *rendprog;
 
-  assert(MC_ROW_COUNT == sizeof(types) / sizeof(types[0]));
+  assert(MC_ROW_COUNT == ALEN(types));
 
   model = gtk_list_store_newv(MC_ROW_COUNT, types);
@@ -433 +396 @@
   g_object_set(rendprog, "text", "", NULL);
 
-/*
-  col = gtk_tree_view_column_new_with_attributes(
-    "Name", rend, "text", MC_NAME, NULL);
-  gtk_tree_view_column_add_attribute(col, rend, "text", MC_SIZE);
-  gtk_tree_view_append_column(GTK_TREE_VIEW(view), col);
-
-  col = gtk_tree_view_column_new_with_attributes(
-    "Status", rend, "text", MC_STAT, NULL);
-  gtk_tree_view_column_add_attribute(col, rend, "text", MC_ERR);
-  gtk_tree_view_column_add_attribute(col, rend, "text", MC_DPEERS);
-  gtk_tree_view_column_add_attribute(col, rend, "text", MC_UPEERS);
-  gtk_tree_view_append_column(GTK_TREE_VIEW(view), col);
-
-  col = gtk_tree_view_column_new_with_attributes(
-    "Progress", rendprog, "value", MC_PROG, NULL);
-  gtk_tree_view_column_pack_start(col, rend, TRUE);
-  gtk_tree_view_column_add_attribute(col, rend, "text", MC_ETA);
-  gtk_tree_view_column_add_attribute(col, rend, "text", MC_DRATE);
-  gtk_tree_view_column_add_attribute(col, rend, "text", MC_URATE);
-  gtk_tree_view_column_add_attribute(col, rend, "text", MC_DOWN);
-  gtk_tree_view_column_add_attribute(col, rend, "text", MC_UP);
-  gtk_tree_view_append_column(GTK_TREE_VIEW(view), col);
-*/
-
   gtk_tree_view_append_column(GTK_TREE_VIEW(view),
     gtk_tree_view_column_new_with_attributes("Name", rend,
@@ -490 +429 @@
     gtk_tree_view_column_new_with_attributes("Leechers", rend,
                                              "text", MC_DPEERS, NULL));
-  /*gtk_tree_view_append_column(GTK_TREE_VIEW(view),
-    gtk_tree_view_column_new_with_attributes("", rend,
-                                             "text", MC_PIECES, NULL));*/
   gtk_tree_view_append_column(GTK_TREE_VIEW(view),
     gtk_tree_view_column_new_with_attributes("Downloaded", rend,
@@ -533 +469 @@
       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_PIECES, st[ii].pieces,*/ MC_DOWN, st[ii].downloaded, MC_UP, st[ii].uploaded, -1);
+      MC_DOWN, st[ii].downloaded, MC_UP, st[ii].uploaded, -1);
   }
   free(st);
@@ -579 +515 @@
   /* XXX am I leaking references here? */
   /* XXX can I cache this in cbdata? */
-  for(ii = 0; ii < sizeof(actionitems) / sizeof(actionitems[0]); ii++) {
+  for(ii = 0; ii < ALEN(actionitems); ii++) {
     item = gtk_menu_item_new_with_label(actionitems[ii].name);
     g_object_set_data(G_OBJECT(item), LIST_ACTION,
@@ -611 +547 @@
   tr_stat_t *sb;
 
-  if(ACT_OPEN == act) {
-    makeaddwind(data);
-    return;
+  switch(act) {
+    case ACT_OPEN:
+      makeaddwind(data);
+      return;
+    case ACT_PREF:
+      makeprefwindow(data->wind, data->tr);
+      return;
+    default:
+      break;
   }
 
@@ -674 +616 @@
   g_signal_connect_swapped(GTK_FILE_SELECTION(wind)->cancel_button, "clicked",
                            G_CALLBACK(gtk_widget_destroy), wind); 
-  gtk_window_set_transient_for(GTK_WINDOW(wind), GTK_WINDOW(data->wind));
+  gtk_window_set_transient_for(GTK_WINDOW(wind), data->wind);
   gtk_window_set_destroy_with_parent(GTK_WINDOW(wind), TRUE);
   gtk_window_set_modal(GTK_WINDOW(wind), TRUE);
@@ -681 +623 @@
 
 gboolean
-addtorrent(tr_handle_t *tr, GtkWidget *parentwind, const char *torrent,
+addtorrent(tr_handle_t *tr, GtkWindow *parentwind, const char *torrent,
            const char *dir, gboolean paused) {
   char *wd;
+
+  if(NULL == dir) {
+    dir = cf_getpref(PREF_DIR);
+    if(!mkdir_p(dir, 0777)) {
+      errmsg(parentwind, "Failed to create download directory %s:\n%s",
+             dir, strerror(errno));
+      return FALSE;
+    }
+  }
 
   if(0 != tr_torrentInit(tr, torrent)) {
@@ -694 +645 @@
     tr_torrentSetFolder(tr, tr_torrentCount(tr) - 1, dir);
   else {
-    /* XXX need pref for download directory */
     wd = g_new(char, MAXPATHLEN + 1);
     if(NULL == getcwd(wd, MAXPATHLEN + 1))
@@ -748 +698 @@
     assert(!"XXX i'm tired");
   }
-  wind = gtk_dialog_new_with_buttons(sb[index].info.name, GTK_WINDOW(data->wind),
+  wind = gtk_dialog_new_with_buttons(sb[index].info.name, data->wind,
     GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL);
 
@@ -856 +806 @@
 
 gboolean
-savetorrents(tr_handle_t *tr, GtkWidget *wind, int count, tr_stat_t *stat) {
+savetorrents(tr_handle_t *tr, GtkWindow *wind, int count, tr_stat_t *stat) {
   char *errstr;
   tr_stat_t *st;

trunk/gtk/util.c

@@ -25 +25 @@
 */
 
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <errno.h>
 #include <stdarg.h>
+#include <string.h>
+
 #include <gtk/gtk.h>
 
@@ -31 +36 @@
 
 static void
-errcb(GtkWidget *widget, int resp, gpointer data);
+errcb(GtkWidget *wind, int resp, gpointer data);
 
 gboolean
@@ -51 +56 @@
 }
 
+gboolean
+mkdir_p(const char *name, mode_t mode) {
+  struct stat sb;
+  char *parent;
+  gboolean ret;
+  int oerrno;
+
+  if(0 != stat(name, &sb)) {
+    if(ENOENT != errno)
+      return FALSE;
+    parent = g_path_get_dirname(name);
+    ret = mkdir_p(parent, mode);
+    oerrno = errno;
+    g_free(parent);
+    errno = oerrno;
+    return (ret ? (0 == mkdir(name, mode)) : FALSE);
+  }
+
+  if(!S_ISDIR(sb.st_mode)) {
+    errno = ENOTDIR;
+    return FALSE;
+  }
+
+  return TRUE;
+}
+
 GtkWidget *
-errmsg(GtkWidget *wind, const char *format, ...) {
+errmsg(GtkWindow *wind, const char *format, ...) {
   GtkWidget *dialog;
   va_list ap;
@@ -64 +95 @@
 
 GtkWidget *
-errmsg_full(GtkWidget *wind, errfunc_t func, void *data,
+errmsg_full(GtkWindow *wind, errfunc_t func, void *data,
             const char *format, ...) {
   GtkWidget *dialog;
@@ -77 +108 @@
 
 GtkWidget *
-verrmsg(GtkWidget *wind, errfunc_t func, void *data,
+verrmsg(GtkWindow *wind, errfunc_t func, void *data,
         const char *format, va_list ap) {
   GtkWidget *dialog;
@@ -89 +120 @@
       NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "%s", msg);
   else
-    dialog = gtk_message_dialog_new(
-      GTK_WINDOW(wind), GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+    dialog = gtk_message_dialog_new(wind,
+      GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
       GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "%s", msg);
 
@@ -99 +130 @@
   g_signal_connect(dialog, "response", G_CALLBACK(errcb), funcdata);
   if(NULL != wind)
-    gtk_widget_show_all(dialog);
+    gtk_widget_show(dialog);
   g_free(msg);
 

trunk/gtk/util.h

@@ -28 +28 @@
 #define TG_UTIL_H
 
+#include <sys/types.h>
 #include <stdarg.h>
 
@@ -37 +38 @@
 #endif
 
+/* return number of items in array */
+#define ALEN(a)                 (sizeof(a) / sizeof((a)[0]))
+
 gboolean
 strbool(const char *str);
+
+gboolean
+mkdir_p(const char *name, mode_t mode);
 
 typedef void (*errfunc_t)(void*);
@@ -45 +52 @@
 
 GtkWidget *
-errmsg(GtkWidget *wind, const char *format, ...)
+errmsg(GtkWindow *wind, const char *format, ...)
 #ifdef __GNUC__
   __attribute__ ((format (printf, 2, 3)))
@@ -52 +59 @@
 
 GtkWidget *
-errmsg_full(GtkWidget *wind, errfunc_t func, void *data,
+errmsg_full(GtkWindow *wind, errfunc_t func, void *data,
             const char *format, ...)
 #ifdef __GNUC__
@@ -60 +67 @@
 
 GtkWidget *
-verrmsg(GtkWidget *wind, errfunc_t func, void *data,
+verrmsg(GtkWindow *wind, errfunc_t func, void *data,
         const char *format, va_list ap);
 

trunk/libtransmission/transmission.c

@@ -66 +66 @@
     h->fdlimit = tr_fdInit();
 
-    h->bindPort = 9090;
+    h->bindPort = TR_DEFAULT_PORT;
 
     snprintf( h->prefsDirectory, sizeof( h->prefsDirectory ),

trunk/libtransmission/transmission.h

@@ -30 +30 @@
 #define TR_MAX_TORRENT_COUNT 50
 
+#define TR_DEFAULT_PORT      9090
+
 /***********************************************************************
  * tr_init

trunk/libtransmission/upload.c

@@ -102 +102 @@
         now  = tr_date();
 
-        /* Check the last four times we sent something and decide if
+        /* Check the last FOO times we sent something and decide if
            we must wait */
         for( i = 0; i < FOO; i++ )
         {
             size += u->sizes[i];
-            if( (uint64_t) size < 1024ULL *
-                    u->limit * ( now - u->dates[i] ) / 1000 )
+            if( (uint64_t) size * 1000 <
+                    ( now - u->dates[i] ) * u->limit * 1024 )
             {
                 ret = 1;

trunk/libtransmission/utils.h

@@ -43 +43 @@
     struct timeval tv;
     gettimeofday( &tv, NULL );
-    return( (uint64_t) tv.tv_sec * 1000 + (uint64_t) tv.tv_usec / 1000 );
+    return (uint64_t) tv.tv_sec * 1000 + ( tv.tv_usec / 1000 );
 }
 

trunk/macosx/Controller.h

@@ -27 +27 @@
 #include <transmission.h>
 #include "PrefsController.h"
-#include <Growl/Growl.h>
 
 @class TorrentTableView;
 
-@interface Controller : NSObject <GrowlApplicationBridgeDelegate>
+@interface Controller : NSObject
 {
     tr_handle_t                  * fHandle;
@@ -99 +98 @@
 - (void) linkHomepage:    (id) sender;
 - (void) linkForums:      (id) sender;
-- (void) notifyGrowl:     (NSString *) file folder: (NSString *) folder;
-- (void) revealInFinder:  (NSString *) path;
+- (void) notifyGrowl:     (NSString *) file;
+- (void) finderReveal:    (NSString *) path;
+- (void) finderTrash:     (NSString *) path;
+- (void) growlRegister:   (id) sender;
 
 @end

trunk/macosx/Controller.m

@@ -192 +192 @@
     
     /*  Register with the growl system */
-    [GrowlApplicationBridge setGrowlDelegate:self];
+    [self growlRegister: self];
     
     /* Update the interface every 500 ms */
@@ -468 +468 @@
                      deleteData: (BOOL) deleteData
 {
-    BOOL torrentWarning = ![[NSUserDefaults standardUserDefaults]
-                            boolForKey:@"SkipTorrentDeletionWarning"];
-    BOOL dataWarning = ![[NSUserDefaults standardUserDefaults]
-                            boolForKey:@"SkipDataDeletionWarning"];
-    
-    if ( ( torrentWarning && deleteTorrent ) || (dataWarning && deleteData ) )
-    {
-        NSAlert *alert = [[[NSAlert alloc] init] autorelease];
-        
-        [alert addButtonWithTitle:@"Delete"];
-        [alert addButtonWithTitle:@"Cancel"];
-        [alert setAlertStyle:NSWarningAlertStyle];
-        [alert setMessageText:@"Do you want to remove this torrent from Transmission?"];
-        
-        if ( (deleteTorrent && torrentWarning) &&
-             !( dataWarning && deleteData ) )
-        {
-            /* delete torrent warning YES, delete data warning NO */
-            [alert setInformativeText:@"This will delete the .torrent file only. "
-                "This can not be undone!"];
-        }
-        else if( (deleteData && dataWarning) &&
-                 !( torrentWarning && deleteTorrent ) )
-        {
-            /* delete torrent warning NO, delete data warning YES */
-            [alert setInformativeText:@"This will delete the downloaded data. "
-                "This can not be undone!"];
-        }
-        else
-        {
-            /* delete torrent warning YES, delete data warning YES */
-            [alert setInformativeText:@"This will delete the downloaded data and "
-                ".torrent file. This can not be undone!"];
-        }
-        
-        if ( [alert runModal] == NSAlertSecondButtonReturn )
-            return;
-    }
-    
-    if ( deleteData )
-    {
-        tr_file_t * files = fStat[idx].info.files;
-        int i;
-        
-        for ( i = 0; i < fStat[idx].info.fileCount; i++ )
-        {
-            if ( -1 == remove([[NSString stringWithFormat:@"%s/%s", 
-                                        fStat[idx].folder,
-                                        files[i].name] 
-                                cString]) )
-            {
-                NSLog(@"remove(%s) failed, errno = %i",
-                      files[i].name,
-                      errno);
-            }
-        }
-        
-        /* in some cases, we should remove fStat[idx].folder also. When? */
-    }
-    
-    if ( deleteTorrent )
-    {
-        if ( -1 == remove( fStat[idx].info.torrent ) )
-        {
-            NSLog(@"remove(%s) failed, errno = %i",
-                  fStat[idx].info.torrent,
-                  errno);
-        }
+    if( deleteData )
+    {
+        [self finderTrash: [NSString stringWithFormat: @"%@/%@",
+            [NSString stringWithUTF8String: fStat[idx].folder],
+            [NSString stringWithUTF8String: fStat[idx].info.name]]];
+    }
+    if( deleteTorrent )
+    {
+        [self finderTrash: [NSString stringWithUTF8String:
+            fStat[idx].info.torrent]];
     }
     
@@ -612 +554 @@
         }
         [self notifyGrowl: [NSString stringWithUTF8String: 
-            fStat[i].info.name] folder: [NSString stringWithUTF8String:
-            fStat[i].folder]];
+            fStat[i].info.name]];
         tr_setFinished( fHandle, i, 0 );
     }
@@ -910 +851 @@
 }
 
-- (void) notifyGrowl: (NSString * ) file folder: (NSString *) folder
-{
-    [GrowlApplicationBridge
-        notifyWithTitle: @"Download complete."
-        description: [NSString stringWithFormat: @"Seeding: %@", file]
-        notificationName: @"Download complete."
-        iconData: nil
-        priority: 0
-        isSticky: FALSE
-        clickContext: [NSString stringWithFormat: @"%@/%@", folder, file]];
-}
-
-- (NSDictionary *)registrationDictionaryForGrowl 
+- (void) notifyGrowl: (NSString * ) file
+{
+    NSString * growlScript;
+    NSAppleScript * appleScript;
+    NSDictionary * error;
+    
+    growlScript = [NSString stringWithFormat:
+        @"tell application \"System Events\"\n"
+         "  if exists application process \"GrowlHelperApp\" then\n"
+         "    tell application \"GrowlHelperApp\"\n "
+         "      notify with name \"Download Complete\""
+         "        title \"Download Complete\""
+         "        description \"%@\""
+         "        application name \"Transmission\"\n"
+         "    end tell\n"
+         "  end if\n"
+         "end tell", file];
+    appleScript = [[NSAppleScript alloc] initWithSource: growlScript];
+    if( ![appleScript executeAndReturnError: &error] )
+    {
+        printf( "Growl notify failed\n" );
+    }
+    [appleScript release];
+}
+
+- (void) growlRegister: (id) sender
 {   
-    NSString *title        = [NSString stringWithUTF8String: "Download complete."];
-    NSMutableArray *defNotesArray = [NSMutableArray array];
-    NSMutableArray *allNotesArray = [NSMutableArray array];
-
-    [allNotesArray addObject:title];
-    [defNotesArray addObject:[NSNumber numberWithUnsignedInt:0]];   
-
-    NSDictionary *regDict = [NSDictionary dictionaryWithObjectsAndKeys:
-        @"Transmission", GROWL_APP_NAME,
-        allNotesArray, GROWL_NOTIFICATIONS_ALL, 
-        defNotesArray, GROWL_NOTIFICATIONS_DEFAULT,
-        nil];
-    
-    return regDict;
-}
-
-- (NSString *) applicationNameForGrowl
-{
-    return [NSString stringWithUTF8String: "Transmission"];
-}
-
-- (void) growlNotificationWasClicked: (id) clickContext
-{
-    [self revealInFinder: (NSString *) clickContext];
-}
+    NSString * growlScript;
+    NSAppleScript * appleScript;
+    NSDictionary * error;
+    
+    growlScript = [NSString stringWithFormat:
+        @"tell application \"System Events\"\n"
+         "  if exists application process \"GrowlHelperApp\" then\n"
+         "    tell application \"GrowlHelperApp\"\n"
+         "      register as application \"Transmission\" "
+         "        all notifications {\"Download Complete\"}"
+         "        default notifications {\"Download Complete\"}"
+         "        icon of application \"Transmission\"\n"
+         "    end tell\n"
+         "  end if\n"
+         "end tell"];
+    appleScript = [[NSAppleScript alloc] initWithSource: growlScript];
+    if( ![appleScript executeAndReturnError: &error] )
+    {
+        printf( "Growl registration failed\n" );
+    }
+    [appleScript release];
+}
+
 
 - (void) revealFromMenu: (id) sender
 {
-    [fTableView revealInFinder: [fTableView selectedRow]];
-}
-
-- (void) revealInFinder: (NSString *) path
+    int row;
+
+    row = [fTableView selectedRow];
+    if( row < 0 )
+    {
+        return;
+    }
+    [self finderReveal: [NSString stringWithFormat: @"%@/%@",
+        [NSString stringWithUTF8String: fStat[row].folder],
+        [NSString stringWithUTF8String: fStat[row].info.name]]];
+}
+
+- (void) finderReveal: (NSString *) path
 {
     NSString * string;
@@ -961 +922 @@
     NSDictionary * error;
     
-    string = [NSString stringWithFormat: @"tell application "
-        "\"Finder\"\nactivate\nreveal (POSIX file \"%@\")\nend tell",
-        path];
+    string = [NSString stringWithFormat:
+        @"tell application \"Finder\"\n"
+         "  activate\n"
+         "  reveal (POSIX file \"%@\")\n"
+         "end tell", path];
+
     appleScript = [[NSAppleScript alloc] initWithSource: string];
     if( ![appleScript executeAndReturnError: &error] )
     {
-        printf( "Reveal in Finder: AppleScript failed\n" );
+        printf( "finderReveal failed\n" );
     }
     [appleScript release];
 }
 
+- (void) finderTrash: (NSString *) path
+{
+    NSString * string;
+    NSAppleScript * appleScript;
+    NSDictionary * error;
+
+    string = [NSString stringWithFormat:
+        @"tell application \"Finder\"\n"
+         "  move (POSIX file \"%@\") to trash\n"
+         "end tell", path];
+
+    appleScript = [[NSAppleScript alloc] initWithSource: string];
+    if( ![appleScript executeAndReturnError: &error] )
+    {
+        printf( "finderTrash failed\n" );
+    }
+    [appleScript release];
+}
 
 @end

trunk/macosx/PrefsController.m

@@ -45 +45 @@
     NSUserDefaults * defaults;
     NSDictionary   * appDefaults;
+    NSString       * desktop, * port;
 
     fHandle = handle;
@@ -51 +52 @@
         - Simple bar
         - Always download to Desktop
-        - Port 9090
+        - Port TR_DEFAULT_PORT
         - 20 KB/s upload limit */
-    NSString * desktopPath
-        = [NSString stringWithFormat: @"%@/Desktop",
-                            NSHomeDirectory()];
+    desktop = [NSHomeDirectory() stringByAppendingString: @"/Desktop"];
+    port    = [NSString stringWithFormat: @"%d", TR_DEFAULT_PORT];
 
     defaults    = [NSUserDefaults standardUserDefaults];
@@ -61 +61 @@
                     @"NO",       @"UseAdvancedBar",
                     @"Constant", @"DownloadChoice",
-                    desktopPath, @"DownloadFolder",
-                    @"9090",     @"BindPort",
+                    desktop,     @"DownloadFolder",
+                    port,        @"BindPort",
                     @"20",       @"UploadLimit",
                     NULL];

trunk/macosx/ProgressCell.h

@@ -31 +31 @@
     tr_stat_t * fStat;
 
-    NSString  * fProgressString;
     NSString  * fDlString;
     NSString  * fUlString;
 
-    NSBitmapImageRep * fBgBmp;
-    NSBitmapImageRep * fBmp;
+    NSBitmapImageRep * fBackgroundBmp;
+    NSBitmapImageRep * fProgressBmp;
 }
 - (id)   init;

trunk/macosx/ProgressCell.m

@@ -23 +23 @@
 #include "ProgressCell.h"
 
+@implementation ProgressCell
+
+/***********************************************************************
+ * Static tables
+ ***********************************************************************
+ * We use these tables to optimize the drawing. They contain packed
+ * RGBA pixels for every color we might need.
+ **********************************************************************/
 #if 0
 /* Coefficients for the "3D effect" */
@@ -72 +80 @@
       0x00ED00FF, 0x00F200FF, 0x00F400FF, 0x00B500FF };
 
-@implementation ProgressCell
-
+/***********************************************************************
+ * init
+ ***********************************************************************
+ * Prepares the NSBitmapImageReps we are going to need in order to
+ * draw.
+ **********************************************************************/
 - (id) init
 {
-    NSImage * bgImg;
-    NSSize    size;
-
     self = [super init];
 
-    /* Have a NSBitmapImageRep ready to draw the progression bar */
-    bgImg  = [NSImage imageNamed: @"Progress.png"];
-    fBgBmp = [[bgImg representations] objectAtIndex: 0];
-    size   = [bgImg size];
-    fBmp   = [[NSBitmapImageRep alloc]
-        initWithBitmapDataPlanes: NULL pixelsWide: size.width
-        pixelsHigh: size.height bitsPerSample: 8 samplesPerPixel: 4
-        hasAlpha: YES isPlanar: NO
+    /* Load the background image for the progress bar and get it as a
+       32-bit bitmap */
+    fBackgroundBmp = [[[NSImage imageNamed: @"Progress.png"]
+                        representations] objectAtIndex: 0];
+
+    /* Allocate another bitmap of the same size. We will draw the
+       progress bar in it */
+    fProgressBmp = [[NSBitmapImageRep alloc]
+        initWithBitmapDataPlanes: NULL pixelsWide:
+        [fBackgroundBmp size].width pixelsHigh:
+        [fBackgroundBmp size].height bitsPerSample: 8
+        samplesPerPixel: 4 hasAlpha: YES isPlanar: NO
         colorSpaceName: NSCalibratedRGBColorSpace
         bytesPerRow: 0 bitsPerPixel: 0];
@@ -95 +108 @@
 }
 
+/***********************************************************************
+ * setStat
+ ***********************************************************************
+ * Readies ourselves to draw updated info.
+ **********************************************************************/
 - (void) setStat: (tr_stat_t *) stat
 {
     int i;
+    uint8_t * in, * out;
 
     fStat = stat;
 
-    fProgressString = [NSString stringWithFormat:
-        @"%.2f %%", 100.0 * fStat->progress];
+    /* Update the strings to be displayed */
     fDlString = [NSString stringWithFormat:
         @"DL: %.2f KB/s", fStat->rateDownload];
@@ -108 +126 @@
         @"UL: %.2f KB/s", fStat->rateUpload];
 
-    for( i = 0; i < [fBmp size].height; i++ )
-    {
-        memcpy( [fBmp bitmapData] + i * [fBmp bytesPerRow],
-                [fBgBmp bitmapData] + i * [fBgBmp bytesPerRow],
-                [fBmp size].width * 4 );
-    }
-
+    /* Reset our bitmap to the background image... */
+    in  = [fBackgroundBmp bitmapData];
+    out = [fProgressBmp bitmapData];
+    for( i = 0; i < [fProgressBmp size].height; i++ )
+    {
+        memcpy( out, in, [fProgressBmp size].width * 4 );
+        in  += [fBackgroundBmp bytesPerRow];
+        out += [fProgressBmp bytesPerRow];
+    }
+
+    /* ...and redraw the progress bar on the top of it */
     if( [[NSUserDefaults standardUserDefaults]
             boolForKey:@"UseAdvancedBar"])
@@ -126 +148 @@
 }
 
+/***********************************************************************
+ * buildSimpleBar
+ **********************************************************************/
 - (void) buildSimpleBar
 {
-    int        h, w;
+    int        h, w, end, pixelsPerRow;
     uint32_t * p;
+    uint32_t * colors;
+
+    pixelsPerRow = [fProgressBmp bytesPerRow] / 4;
+
+    /* The background image is 124*18 pixels, but the actual
+       progress bar is 120*14 : the first two columns, the last
+       two columns and the last four lines contain the shadow. */
+
+    p      = (uint32_t *) [fProgressBmp bitmapData];
+    p     += 2;
+    end    = lrintf( floor( fStat->progress * 120 ) );
+    colors = ( fStat->status & TR_STATUS_SEED ) ? kGreen : kBlue2;
 
     for( h = 0; h < 14; h++ )
     {
-        p = (uint32_t *) ( [fBmp bitmapData] +
-                h * [fBmp bytesPerRow] ) + 2;
-
-        for( w = 0; w < 120; w++ )
-        {
-            if( w >= (int) ( fStat->progress * 120 ) )
-            {
-                break;
-            }
-
-            if( fStat->status & TR_STATUS_SEED )
-            {
-                *p = kGreen[h];
-            }
-            else
-            {
-                *p = kBlue2[h];
-            }
-            p++;
-        }
-    }
-}
-
+        for( w = 0; w < end; w++ )
+        {
+            p[w] = colors[h];
+        }
+        p += pixelsPerRow;
+    }
+}
+
+/***********************************************************************
+ * buildAdvancedBar
+ **********************************************************************/
 - (void) buildAdvancedBar
 {
-    int        h, w;
+    int        h, w, end, pixelsPerRow;
     uint32_t * p;
-
-    for( h = 0; h < 14; h++ )
-    {
-        p = (uint32_t *) ( [fBmp bitmapData] +
-                h * [fBmp bytesPerRow] ) + 2;
-
-        for( w = 0; w < 120; w++ )
-        {
-            if( fStat->status & TR_STATUS_SEED )
-            {
-                *p = kGreen[h];
-            }
-            else
-            {
-                /* Download is not finished yet */
-                if( h < 2 )
-                {
-                    /* First two lines: dark blue to show progression */
-                    if( w >= (int) ( fStat->progress * 120 ) )
-                    {
-                        break;
-                    }
-                    *p = kBlue4[h];
-                }
-                else
-                {
-                    /* Lines 2 to X: blue or grey depending on whether
-                       we have the piece or not */
-                    if( fStat->pieces[w] < 0 )
-                    {
-                        *p = kGray[h];
-                    }
-                    else if( fStat->pieces[w] < 1 )
-                    {
-                        *p = kRed[h];
-                    }
-                    else if( fStat->pieces[w] < 2 )
-                    {
-                        *p = kBlue1[h];
-                    }
-                    else if( fStat->pieces[w] < 3 )
-                    {
-                        *p = kBlue2[h];
-                    }
-                    else
-                    {
-                        *p = kBlue3[h];
-                    }
-                }
-            }
-
-            p++;
-        }
-    }
-}
-
+    uint32_t * colors;
+
+    if( fStat->status & TR_STATUS_SEED )
+    {
+        /* All green, same as the simple bar */
+        [self buildSimpleBar];
+        return;
+    }
+
+    pixelsPerRow = [fProgressBmp bytesPerRow] / 4;
+
+    /* First two lines: dark blue to show progression */
+    p    = (uint32_t *) [fProgressBmp bitmapData];
+    p   += 2;
+    end  = lrintf( floor( fStat->progress * 120 ) );
+    for( h = 0; h < 2; h++ )
+    {
+        for( w = 0; w < end; w++ )
+        {
+            p[w] = kBlue4[h];
+        }
+        p += pixelsPerRow;
+    }
+
+    /* Lines 2 to 14: blue or grey depending on whether
+       we have the piece or not */
+    for( w = 0; w < 120; w++ )
+    {
+        /* Point to pixel ( 2 + w, 2 ). We will then draw
+           "vertically" */
+        p  = (uint32_t *) ( [fProgressBmp bitmapData] +
+                2 * [fProgressBmp bytesPerRow] );
+        p += 2 + w;
+
+        if( fStat->pieces[w] < 0 )
+        {
+            colors = kGray;
+        }
+        else if( fStat->pieces[w] < 1 )
+        {
+            colors = kRed;
+        }
+        else if( fStat->pieces[w] < 2 )
+        {
+            colors = kBlue1;
+        }
+        else if( fStat->pieces[w] < 3 )
+        {
+            colors = kBlue2;
+        }
+        else
+        {
+            colors = kBlue3;
+        }
+
+        for( h = 2; h < 14; h++ )
+        {
+            p[0]  = colors[h];
+            p    += pixelsPerRow;
+        }
+    }
+}
+
+/***********************************************************************
+ * drawWithFrame
+ ***********************************************************************
+ * We have the strings, we have the bitmap. Let's just draw them where
+ * they belong.
+ **********************************************************************/
 - (void) drawWithFrame: (NSRect) cellFrame inView: (NSView *) view
 {
     NSImage * img;
+    NSMutableDictionary * attributes;
+    NSPoint pen;
 
     if( ![view lockFocusIfCanDraw] )
@@ -225 +265 @@
     }
 
-    NSMutableDictionary * attributes;
-    NSPoint pen = cellFrame.origin;
-
-    attributes = [NSMutableDictionary dictionaryWithCapacity: 1];
-    [attributes setObject: [NSFont messageFontOfSize:12.0]
-        forKey: NSFontAttributeName];
-
+    pen = cellFrame.origin;
+
+    /* Init an NSImage with our bitmap in order to draw it. We need to
+       do this every time, or for some reason it won't draw if the
+       display is set to thousands of colors when Transmission was
+       started */
+    img = [[NSImage alloc] initWithSize: [fProgressBmp size]];
+    [img addRepresentation: fProgressBmp];
+    [img setFlipped: YES];
+
+    /* Actually draw the bar */
     pen.x += 5; pen.y += 5;
-
-    img = [[NSImage alloc] initWithSize: [fBmp size]];
-    [img addRepresentation: fBmp];
-    [img setFlipped: YES];
-    [img drawAtPoint: pen fromRect:
-        NSMakeRect( 0, 0, [fBmp size].width, [fBmp size].height )
+    [img drawAtPoint: pen fromRect: NSMakeRect( 0, 0,
+            [fProgressBmp size].width, [fProgressBmp size].height )
         operation: NSCompositeSourceOver fraction: 1.0];
+
     [img release];
 
-    [attributes setObject: [NSFont messageFontOfSize:10.0]
-        forKey: NSFontAttributeName];
-
+    /* Draw the strings with font 10 */
+    attributes = [NSDictionary dictionaryWithObject:
+        [NSFont messageFontOfSize: 10.0] forKey: NSFontAttributeName];
     pen.x += 5; pen.y += 20;
     [fDlString drawAtPoint: pen withAttributes: attributes];
-
     pen.x += 0; pen.y += 15;
     [fUlString drawAtPoint: pen withAttributes: attributes];

trunk/macosx/TorrentTableView.m

@@ -8 +8 @@
     fStat = stat;
     [self reloadData];
-}
-
-- (void) revealInFinder: (int) row
-{
-    NSString * string;
-    NSAppleScript * appleScript;
-    NSDictionary * error;
-
-    string = [NSString stringWithFormat: @"tell application "
-        "\"Finder\"\nactivate\nreveal (POSIX file \"%@/%@\")\nend tell",
-        [NSString stringWithUTF8String: fStat[row].folder],
-        [NSString stringWithUTF8String: fStat[row].info.name]];
-    appleScript = [[NSAppleScript alloc] initWithSource: string];
-    if( ![appleScript executeAndReturnError: &error] )
-    {
-        printf( "Reveal in Finder: AppleScript failed\n" );
-    }
-    [appleScript release];
 }
 
@@ -107 +89 @@
     else if( [self pointInRevealRect: point] )
     {
-        [fController revealInFinder: [NSString stringWithFormat:
+        [fController finderReveal: [NSString stringWithFormat:
             @"%@/%@", [NSString stringWithUTF8String: fStat[row].folder],
             [NSString stringWithUTF8String: fStat[row].info.name]]];

trunk/macosx/Transmission.xcodeproj/project.pbxproj

@@ -19 +19 @@
                 4D752E930913C949008EAAD4 /* Preferences.png in Resources */ = {isa = PBXBuildFile; fileRef = 4D752E920913C949008EAAD4 /* Preferences.png */; };
                 4D813EB508AA43AC00191DB4 /* Progress.png in Resources */ = {isa = PBXBuildFile; fileRef = 4D813EB408AA43AC00191DB4 /* Progress.png */; };
-                4D81E2E4092EF0CB00F24127 /* Growl.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D81E2E3092EF0CB00F24127 /* Growl.framework */; };
-                4D81E309092EF26F00F24127 /* Growl.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4D81E2E3092EF0CB00F24127 /* Growl.framework */; };
                 4DA6FDBA0911233800450CB1 /* PauseOn.png in Resources */ = {isa = PBXBuildFile; fileRef = 4DA6FDB80911233800450CB1 /* PauseOn.png */; };
                 4DA6FDBB0911233800450CB1 /* PauseOff.png in Resources */ = {isa = PBXBuildFile; fileRef = 4DA6FDB90911233800450CB1 /* PauseOff.png */; };
@@ -62 +60 @@
                 };
 /* End PBXBuildStyle section */
-
-/* Begin PBXCopyFilesBuildPhase section */
-                4D81E301092EF24500F24127 /* CopyFiles */ = {
-                        isa = PBXCopyFilesBuildPhase;
-                        buildActionMask = 2147483647;
-                        dstPath = "";
-                        dstSubfolderSpec = 10;
-                        files = (
-                                4D81E309092EF26F00F24127 /* Growl.framework in CopyFiles */,
-                        );
-                        runOnlyForDeploymentPostprocessing = 0;
-                };
-/* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
@@ -100 +85 @@
                 4D752E920913C949008EAAD4 /* Preferences.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Preferences.png; path = Images/Preferences.png; sourceTree = "<group>"; };
                 4D813EB408AA43AC00191DB4 /* Progress.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Progress.png; path = Images/Progress.png; sourceTree = "<group>"; };
-                4D81E2E3092EF0CB00F24127 /* Growl.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Growl.framework; path = Frameworks/Growl.framework; sourceTree = "<group>"; };
                 4DA6FDB80911233800450CB1 /* PauseOn.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = PauseOn.png; path = Images/PauseOn.png; sourceTree = "<group>"; };
                 4DA6FDB90911233800450CB1 /* PauseOff.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = PauseOff.png; path = Images/PauseOff.png; sourceTree = "<group>"; };
@@ -123 +107 @@
                                 4DF0C5AE08991C1600DD8943 /* libtransmission.a in Frameworks */,
                                 4D3EA0AA08AE13C600EA10C2 /* IOKit.framework in Frameworks */,
-                                4D81E2E4092EF0CB00F24127 /* Growl.framework in Frameworks */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
@@ -151 +134 @@
                         children = (
                                 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */,
-                                4D81E2E3092EF0CB00F24127 /* Growl.framework */,
                         );
                         name = "Linked Frameworks";
@@ -239 +221 @@
                                 8D11072C0486CEB800E47090 /* Sources */,
                                 8D11072E0486CEB800E47090 /* Frameworks */,
-                                4D81E301092EF24500F24127 /* CopyFiles */,
                         );
                         buildRules = (

trunk/transmissioncli.c

@@ -40 +40 @@
 "  -s, --scrape         Print counts of seeders/leechers and exit\n" \
 "  -v, --verbose <int>  Verbose level (0 to 2, default = 0)\n" \
-"  -p, --port <int>     Port we should listen on (default = 9090)\n" \
+"  -p, --port <int>     Port we should listen on (default = %d)\n" \
 "  -u, --upload <int>   Maximum upload rate (-1 = no limit, default = 20)\n"
 
@@ -47 +47 @@
 static int             showScrape   = 0;
 static int             verboseLevel = 0;
-static int             bindPort     = 9090;
+static int             bindPort     = TR_DEFAULT_PORT;
 static int             uploadLimit  = 20;
 static char          * torrentPath  = NULL;
@@ -67 +67 @@
     if( parseCommandLine( argc, argv ) )
     {
-        printf( USAGE, argv[0] );
+        printf( USAGE, argv[0], TR_DEFAULT_PORT );
         return 1;
     }
@@ -73 +73 @@
     if( showHelp )
     {
-        printf( USAGE, argv[0] );
+        printf( USAGE, argv[0], TR_DEFAULT_PORT );
         return 0;
     }