From fd0a1016938af71b8d0d047ede898957b185e3ee Mon Sep 17 00:00:00 2001 From: Shibby Date: Fri, 11 Jan 2013 08:22:19 +0100 Subject: [PATCH] Transmission: update to 2.76 --- release/src/router/transmission/Makefile.in | 20 +- release/src/router/transmission/NEWS | 27 +++ release/src/router/transmission/aclocal.m4 | 216 ++++++++++++++++++- release/src/router/transmission/cli/Makefile.in | 11 +- release/src/router/transmission/cli/cli.c | 10 +- release/src/router/transmission/configure | 24 +-- release/src/router/transmission/configure.ac | 6 +- release/src/router/transmission/daemon/Makefile.in | 11 +- .../transmission/daemon/transmission-remote.1 | 10 +- release/src/router/transmission/daemon/watch.c | 4 +- release/src/router/transmission/extras/Makefile.in | 11 +- release/src/router/transmission/gtk/Makefile.in | 11 +- release/src/router/transmission/gtk/actions.c | 31 +-- release/src/router/transmission/gtk/details.c | 4 +- release/src/router/transmission/gtk/hig.c | 3 +- .../src/router/transmission/gtk/icons/Makefile.in | 11 +- release/src/router/transmission/gtk/main.c | 3 +- release/src/router/transmission/gtk/tr-core.c | 4 +- .../transmission/libtransmission/Makefile.in | 11 +- .../router/transmission/libtransmission/platform.c | 4 +- .../router/transmission/libtransmission/torrent.c | 12 +- .../router/transmission/libtransmission/version.h | 20 +- release/src/router/transmission/m4/intltool.m4 | 237 --------------------- release/src/router/transmission/macosx/Makefile.in | 11 +- release/src/router/transmission/mkinstalldirs | 162 -------------- release/src/router/transmission/qt/filterbar.cc | 6 +- release/src/router/transmission/qt/mainwin.cc | 51 +++-- release/src/router/transmission/qt/mainwin.h | 5 +- release/src/router/transmission/qt/options.cc | 4 +- release/src/router/transmission/qt/prefs.cc | 6 +- release/src/router/transmission/qt/session.cc | 3 +- .../router/transmission/qt/transmission-qt.desktop | 4 +- release/src/router/transmission/qt/utils.cc | 32 +-- .../router/transmission/third-party/Makefile.in | 11 +- .../transmission/third-party/dht/Makefile.in | 11 +- .../transmission/third-party/libnatpmp/Makefile.in | 11 +- .../transmission/third-party/libutp/Makefile.in | 11 +- .../transmission/third-party/miniupnp/Makefile.in | 11 +- release/src/router/transmission/utils/Makefile.in | 11 +- release/src/router/transmission/web/Makefile.in | 11 +- .../src/router/transmission/web/images/Makefile.in | 11 +- .../router/transmission/web/javascript/Makefile.in | 11 +- .../router/transmission/web/javascript/common.js | 3 +- .../transmission/web/javascript/jquery/Makefile.in | 11 +- .../src/router/transmission/web/style/Makefile.in | 11 +- .../transmission/web/style/jqueryui/Makefile.in | 11 +- .../web/style/jqueryui/images/Makefile.in | 11 +- .../web/style/transmission/Makefile.in | 11 +- .../transmission/web/style/transmission/common.css | 19 +- .../web/style/transmission/common.scss | 20 +- .../web/style/transmission/images/Makefile.in | 11 +- .../style/transmission/images/buttons/Makefile.in | 11 +- .../transmission/web/style/transmission/mobile.css | 28 +-- .../web/style/transmission/mobile.scss | 28 +-- release/src/router/www/about.asp | 2 +- 55 files changed, 550 insertions(+), 711 deletions(-) rewrite release/src/router/transmission/libtransmission/version.h (82%) delete mode 100644 release/src/router/transmission/m4/intltool.m4 delete mode 100755 release/src/router/transmission/mkinstalldirs diff --git a/release/src/router/transmission/Makefile.in b/release/src/router/transmission/Makefile.in index 248a6dfa10..0a058e0470 100644 --- a/release/src/router/transmission/Makefile.in +++ b/release/src/router/transmission/Makefile.in @@ -55,20 +55,19 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/transmission-gtk.spec.in \ $(top_srcdir)/configure $(top_srcdir)/qt/config.pri.in AUTHORS \ COPYING ChangeLog INSTALL NEWS config.guess config.sub depcomp \ - install-sh ltmain.sh missing mkinstalldirs + install-sh ltmain.sh missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx-pthread.m4 \ $(top_srcdir)/m4/check-ssl.m4 $(top_srcdir)/m4/glib-gettext.m4 \ - $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/zlib.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/pkg.m4 \ + $(top_srcdir)/m4/zlib.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_CLEAN_FILES = transmission-gtk.spec qt/config.pri CONFIG_CLEAN_VPATH_FILES = AM_V_GEN = $(am__v_GEN_@AM_V@) @@ -134,8 +133,8 @@ am__relativize = \ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ done; \ reldir="$$dir2" +DIST_ARCHIVES = $(distdir).tar.gz GZIP_ENV = --best -DIST_ARCHIVES = $(distdir).tar.bz2 $(distdir).tar.xz distuninstallcheck_listfiles = find . -type f -print am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' @@ -615,6 +614,7 @@ distdir: $(DISTFILES) dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz $(am__remove_distdir) + dist-bzip2: distdir tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 $(am__remove_distdir) @@ -626,6 +626,7 @@ dist-lzip: distdir dist-lzma: distdir tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma $(am__remove_distdir) + dist-xz: distdir tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz $(am__remove_distdir) @@ -644,8 +645,7 @@ dist-zip: distdir $(am__remove_distdir) dist dist-all: distdir - tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 - tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz + tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz $(am__remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then diff --git a/release/src/router/transmission/NEWS b/release/src/router/transmission/NEWS index 83b455f538..42538e1647 100644 --- a/release/src/router/transmission/NEWS +++ b/release/src/router/transmission/NEWS @@ -1,3 +1,30 @@ +=== Transmission 2.76 (2013/01/08) === +[http://trac.transmissionbt.com/query?milestone=2.76&group=component&order=severity All tickets closed by this release] +==== All Platforms ==== + * Better error logging when user-provided scripts can't be executed + * The "Time Remaining" property wasn't set for torrents with webseeds but no peers + * Fix rare error that created a directory name "$HOME" +==== GTK+ Client ==== + * Fix sort-by-age regression introduced in 2.74 + * The "Edit Trackers" window didn't resize properly due to a 2.70 regression + * Raise the main window when presenting it from an App Indicator +==== Qt Client ==== + * Add magnet link support to transmission-qt.desktop + * Fix notification area bug that inhibited logouts & desktop hibernation + * Use the "video" icon when the torrent is an mkv or mp4 file + * Toggling the "Append '.part' to incomplete files' names" had no effect + * Fix display of the torrent name in the Torrent Options dialog + * Fix cursor point bug in the filterbar's entry field + * Fix crash when adding a magnet link when Transmission was only visible in the system tray + * Fix free-memory-read error on shutdown +==== Daemon ==== + * Better watchdir support + * Documentation fixes in transmission-remote's manpage +==== Web Client ==== + * Fix indentation of the torrent list and toolbar buttons on mobile devices +==== CLI ==== + * If the Download directory doesn't exist, try to create it instead of exiting + === Transmission 2.75 (2012/12/13) === [http://trac.transmissionbt.com/query?milestone=2.75&group=component&order=severity All tickets closed by this release] ==== Mac ==== diff --git a/release/src/router/transmission/aclocal.m4 b/release/src/router/transmission/aclocal.m4 index b47c7ee4d4..7e10d3efc7 100644 --- a/release/src/router/transmission/aclocal.m4 +++ b/release/src/router/transmission/aclocal.m4 @@ -20,6 +20,221 @@ You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically `autoreconf'.])]) + +dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) +# serial 42 IT_PROG_INTLTOOL +AC_DEFUN([IT_PROG_INTLTOOL], [ +AC_PREREQ([2.50])dnl +AC_REQUIRE([AM_NLS])dnl + +case "$am__api_version" in + 1.[01234]) + AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool]) + ;; + *) + ;; +esac + +INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` +INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` +INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` +if test -n "$1"; then + AC_MSG_CHECKING([for intltool >= $1]) + AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found]) + test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || + AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.]) +fi + +AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update]) +AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge]) +AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract]) +if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then + AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.]) +fi + +if test -z "$AM_DEFAULT_VERBOSITY"; then + AM_DEFAULT_VERBOSITY=1 +fi +AC_SUBST([AM_DEFAULT_VERBOSITY]) + +INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))' +INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))' +INTLTOOL__v_MERGE_0='@echo " ITMRG " [$]@;' +AC_SUBST(INTLTOOL_V_MERGE) +AC_SUBST(INTLTOOL__v_MERGE_) +AC_SUBST(INTLTOOL__v_MERGE_0) + +INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))' +intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))' +intltool__v_merge_options_0='-q' +AC_SUBST(INTLTOOL_V_MERGE_OPTIONS) +AC_SUBST(intltool__v_merge_options_) +AC_SUBST(intltool__v_merge_options_0) + + INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< [$]@' + INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then + INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< [$]@' +else + INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.[$][$]RANDOM && mkdir [$][$]_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u [$][$]_it_tmp_dir $< [$]@ && rmdir [$][$]_it_tmp_dir' +fi + INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + +_IT_SUBST(INTLTOOL_DESKTOP_RULE) +_IT_SUBST(INTLTOOL_DIRECTORY_RULE) +_IT_SUBST(INTLTOOL_KEYS_RULE) +_IT_SUBST(INTLTOOL_PROP_RULE) +_IT_SUBST(INTLTOOL_OAF_RULE) +_IT_SUBST(INTLTOOL_PONG_RULE) +_IT_SUBST(INTLTOOL_SERVER_RULE) +_IT_SUBST(INTLTOOL_SHEET_RULE) +_IT_SUBST(INTLTOOL_SOUNDLIST_RULE) +_IT_SUBST(INTLTOOL_UI_RULE) +_IT_SUBST(INTLTOOL_XAM_RULE) +_IT_SUBST(INTLTOOL_KBD_RULE) +_IT_SUBST(INTLTOOL_XML_RULE) +_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE) +_IT_SUBST(INTLTOOL_CAVES_RULE) +_IT_SUBST(INTLTOOL_SCHEMAS_RULE) +_IT_SUBST(INTLTOOL_THEME_RULE) +_IT_SUBST(INTLTOOL_SERVICE_RULE) +_IT_SUBST(INTLTOOL_POLICY_RULE) + +# Check the gettext tools to make sure they are GNU +AC_PATH_PROG(XGETTEXT, xgettext) +AC_PATH_PROG(MSGMERGE, msgmerge) +AC_PATH_PROG(MSGFMT, msgfmt) +AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) +if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then + AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) +fi +xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`" +mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`" +mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`" +if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then + AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) +fi + +AC_PATH_PROG(INTLTOOL_PERL, perl) +if test -z "$INTLTOOL_PERL"; then + AC_MSG_ERROR([perl not found]) +fi +AC_MSG_CHECKING([for perl >= 5.8.1]) +$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1 +if test $? -ne 0; then + AC_MSG_ERROR([perl 5.8.1 is required for intltool]) +else + IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"` + AC_MSG_RESULT([$IT_PERL_VERSION]) +fi +if test "x$2" != "xno-xml"; then + AC_MSG_CHECKING([for XML::Parser]) + if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then + AC_MSG_RESULT([ok]) + else + AC_MSG_ERROR([XML::Parser perl module is required for intltool]) + fi +fi + +# Substitute ALL_LINGUAS so we can use it in po/Makefile +AC_SUBST(ALL_LINGUAS) + +# Set DATADIRNAME correctly if it is not set yet +# (copied from glib-gettext.m4) +if test -z "$DATADIRNAME"; then + AC_LINK_IFELSE( + [AC_LANG_PROGRAM([[]], + [[extern int _nl_msg_cat_cntr; + return _nl_msg_cat_cntr]])], + [DATADIRNAME=share], + [case $host in + *-*-solaris*) + dnl On Solaris, if bind_textdomain_codeset is in libc, + dnl GNU format message catalog is always supported, + dnl since both are added to the libc all together. + dnl Hence, we'd like to go with DATADIRNAME=share + dnl in this case. + AC_CHECK_FUNC(bind_textdomain_codeset, + [DATADIRNAME=share], [DATADIRNAME=lib]) + ;; + *) + [DATADIRNAME=lib] + ;; + esac]) +fi +AC_SUBST(DATADIRNAME) + +IT_PO_SUBDIR([po]) + +]) + + +# IT_PO_SUBDIR(DIRNAME) +# --------------------- +# All po subdirs have to be declared with this macro; the subdir "po" is +# declared by IT_PROG_INTLTOOL. +# +AC_DEFUN([IT_PO_SUBDIR], +[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS. +dnl +dnl The following CONFIG_COMMANDS should be executed at the very end +dnl of config.status. +AC_CONFIG_COMMANDS_PRE([ + AC_CONFIG_COMMANDS([$1/stamp-it], [ + if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then + AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.]) + fi + rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp" + >"$1/stamp-it.tmp" + [sed '/^#/d + s/^[[].*] *// + /^[ ]*$/d + '"s|^| $ac_top_srcdir/|" \ + "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES" + ] + [sed '/^POTFILES =/,/[^\\]$/ { + /^POTFILES =/!d + r $1/POTFILES + } + ' "$1/Makefile.in" >"$1/Makefile"] + rm -f "$1/Makefile.tmp" + mv "$1/stamp-it.tmp" "$1/stamp-it" + ]) +])dnl +]) + +# _IT_SUBST(VARIABLE) +# ------------------- +# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST +# +AC_DEFUN([_IT_SUBST], +[ +AC_SUBST([$1]) +m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])]) +] +) + +# deprecated macros +AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL]) +# A hint is needed for aclocal from Automake <= 1.9.4: +# AC_DEFUN([AC_PROG_INTLTOOL], ...) + + # nls.m4 serial 5 (gettext-0.18) dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation, dnl Inc. @@ -1081,7 +1296,6 @@ AC_SUBST([am__untar]) m4_include([m4/acx-pthread.m4]) m4_include([m4/check-ssl.m4]) m4_include([m4/glib-gettext.m4]) -m4_include([m4/intltool.m4]) m4_include([m4/libtool.m4]) m4_include([m4/ltoptions.m4]) m4_include([m4/ltsugar.m4]) diff --git a/release/src/router/transmission/cli/Makefile.in b/release/src/router/transmission/cli/Makefile.in index 709748d533..ea3a74f6a7 100644 --- a/release/src/router/transmission/cli/Makefile.in +++ b/release/src/router/transmission/cli/Makefile.in @@ -58,14 +58,13 @@ DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.am \ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx-pthread.m4 \ $(top_srcdir)/m4/check-ssl.m4 $(top_srcdir)/m4/glib-gettext.m4 \ - $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/zlib.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/pkg.m4 \ + $(top_srcdir)/m4/zlib.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" diff --git a/release/src/router/transmission/cli/cli.c b/release/src/router/transmission/cli/cli.c index c84bb6a17f..a4ef14064d 100644 --- a/release/src/router/transmission/cli/cli.c +++ b/release/src/router/transmission/cli/cli.c @@ -1,5 +1,5 @@ /****************************************************************************** - * $Id: cli.c 13625 2012-12-05 17:29:46Z jordan $ + * $Id: cli.c 13772 2013-01-05 17:50:48Z jordan $ * * Copyright (c) Transmission authors and contributors * @@ -231,7 +231,6 @@ main (int argc, char ** argv) uint8_t * fileContents; size_t fileLength; const char * str; - char buf[TR_PATH_MAX]; tr_formatter_mem_init (MEM_K, MEM_K_STR, MEM_M_STR, MEM_G_STR, MEM_T_STR); tr_formatter_size_init (DISK_K,DISK_K_STR, DISK_M_STR, DISK_G_STR, DISK_T_STR); @@ -267,15 +266,16 @@ main (int argc, char ** argv) if (tr_bencDictFindStr (&settings, TR_PREFS_KEY_DOWNLOAD_DIR, &str)) { - str = tr_realpath (str, buf); + if (!tr_fileExists (str, NULL)) + tr_mkdirp (str, 0700); - if (str != NULL) + if (tr_fileExists (str, NULL)) { tr_bencDictAddStr (&settings, TR_PREFS_KEY_DOWNLOAD_DIR, str); } else { - fprintf (stderr, "Download directory does not exist!\n"); + fprintf (stderr, "Unable to create download directory \"%s\"!\n", str); return EXIT_FAILURE; } } diff --git a/release/src/router/transmission/configure b/release/src/router/transmission/configure index b2f3e8a1ed..e256456979 100755 --- a/release/src/router/transmission/configure +++ b/release/src/router/transmission/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for transmission 2.75. +# Generated by GNU Autoconf 2.69 for transmission 2.76. # # Report bugs to . # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='transmission' PACKAGE_TARNAME='transmission' -PACKAGE_VERSION='2.75' -PACKAGE_STRING='transmission 2.75' +PACKAGE_VERSION='2.76' +PACKAGE_STRING='transmission 2.76' PACKAGE_BUGREPORT='http://trac.transmissionbt.com/newticket' PACKAGE_URL='' @@ -1451,7 +1451,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures transmission 2.75 to adapt to many kinds of systems. +\`configure' configures transmission 2.76 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1521,7 +1521,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of transmission 2.75:";; + short | recursive ) echo "Configuration of transmission 2.76:";; esac cat <<\_ACEOF @@ -1664,7 +1664,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -transmission configure 2.75 +transmission configure 2.76 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2200,7 +2200,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by transmission $as_me 2.75, which was +It was created by transmission $as_me 2.76, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2548,9 +2548,9 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu -USERAGENT_PREFIX=2.75 +USERAGENT_PREFIX=2.76 -PEERID_PREFIX=-TR2750- +PEERID_PREFIX=-TR2760- # Check whether --enable-silent-rules was given. @@ -3063,7 +3063,7 @@ fi # Define the identity of the package. PACKAGE='transmission' - VERSION='2.75' + VERSION='2.76' cat >>confdefs.h <<_ACEOF @@ -20487,7 +20487,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by transmission $as_me 2.75, which was +This file was extended by transmission $as_me 2.76, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20544,7 +20544,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -transmission config.status 2.75 +transmission config.status 2.76 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/release/src/router/transmission/configure.ac b/release/src/router/transmission/configure.ac index 7083da670a..ed720708d4 100644 --- a/release/src/router/transmission/configure.ac +++ b/release/src/router/transmission/configure.ac @@ -3,8 +3,8 @@ dnl STATUS: "X" for prerelease beta builds, dnl "Z" for unsupported trunk builds, dnl "0" for stable, supported releases dnl these should be the only two lines you need to change -m4_define([user_agent_prefix],[2.75]) -m4_define([peer_id_prefix],[-TR2750-]) +m4_define([user_agent_prefix],[2.76]) +m4_define([peer_id_prefix],[-TR2760-]) AC_INIT([transmission],[user_agent_prefix],[http://trac.transmissionbt.com/newticket]) AC_SUBST(USERAGENT_PREFIX,[user_agent_prefix]) @@ -16,7 +16,7 @@ AC_CONFIG_MACRO_DIR([m4]) dnl AM_CONFIG_HEADER(config.h) AC_CONFIG_SRCDIR(libtransmission/transmission.h) -AM_INIT_AUTOMAKE([1.9 tar-pax no-dist-gzip dist-xz dist-bzip2]) +AM_INIT_AUTOMAKE([1.9 tar-pax]) LT_INIT if test m4_substr(peer_id_prefix,6,1) = "0"; then diff --git a/release/src/router/transmission/daemon/Makefile.in b/release/src/router/transmission/daemon/Makefile.in index 5d67745523..d78df54548 100644 --- a/release/src/router/transmission/daemon/Makefile.in +++ b/release/src/router/transmission/daemon/Makefile.in @@ -60,14 +60,13 @@ DIST_COMMON = $(dist_man_MANS) $(noinst_HEADERS) $(srcdir)/Makefile.am \ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx-pthread.m4 \ $(top_srcdir)/m4/check-ssl.m4 $(top_srcdir)/m4/glib-gettext.m4 \ - $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/zlib.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/pkg.m4 \ + $(top_srcdir)/m4/zlib.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" diff --git a/release/src/router/transmission/daemon/transmission-remote.1 b/release/src/router/transmission/daemon/transmission-remote.1 index e5224185be..566268ada9 100644 --- a/release/src/router/transmission/daemon/transmission-remote.1 +++ b/release/src/router/transmission/daemon/transmission-remote.1 @@ -162,15 +162,15 @@ All torrents, unless overridden by a per-torrent setting, should seed until a sp All torrents, unless overridden by a per-torrent setting, should seed regardless of ratio .It Fl h Fl -help Print command-line option descriptions. -.It Fl i Fl -info Ar id | torrent-hash +.It Fl i Fl -info Show details of the current torrent(s) -.It Fl if Fl -info-files Ar id | torrent-hash +.It Fl if Fl -info-files List the specified torrent's files -.It Fl ip Fl -info-peers Ar id | torrent-hash +.It Fl ip Fl -info-peers List the specified torrent's peers -.It Fl ic Fl -info-pieces Ar id | torrent-hash +.It Fl ic Fl -info-pieces List the specified torrent's pieces -.It Fl it Fl -info-trackers Ar id | torrent-hash +.It Fl it Fl -info-trackers List the specified torrent's trackers .It Fl si Fl -session-info List session information from the server diff --git a/release/src/router/transmission/daemon/watch.c b/release/src/router/transmission/daemon/watch.c index a36145e9c1..657a688b9b 100644 --- a/release/src/router/transmission/daemon/watch.c +++ b/release/src/router/transmission/daemon/watch.c @@ -7,7 +7,7 @@ * * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * - * $Id: watch.c 13625 2012-12-05 17:29:46Z jordan $ + * $Id: watch.c 13748 2013-01-03 23:54:25Z jordan $ */ #ifdef WITH_INOTIFY #include @@ -55,7 +55,7 @@ struct dtr_watchdir /* reasonable guess as to size of 50 events */ #define BUF_LEN (EVENT_BATCH_COUNT * (EVENT_SIZE + 16) + 2048) -#define DTR_INOTIFY_MASK (IN_CLOSE_WRITE|IN_MOVED_TO|IN_ONLYDIR) +#define DTR_INOTIFY_MASK (IN_CLOSE_WRITE|IN_MOVED_TO|IN_CREATE|IN_ONLYDIR) static void watchdir_new_impl (dtr_watchdir * w) diff --git a/release/src/router/transmission/extras/Makefile.in b/release/src/router/transmission/extras/Makefile.in index 6c6e96a4ad..b1bf37b7fd 100644 --- a/release/src/router/transmission/extras/Makefile.in +++ b/release/src/router/transmission/extras/Makefile.in @@ -55,14 +55,13 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx-pthread.m4 \ $(top_srcdir)/m4/check-ssl.m4 $(top_srcdir)/m4/glib-gettext.m4 \ - $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/zlib.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/pkg.m4 \ + $(top_srcdir)/m4/zlib.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = AM_V_GEN = $(am__v_GEN_@AM_V@) diff --git a/release/src/router/transmission/gtk/Makefile.in b/release/src/router/transmission/gtk/Makefile.in index 2b0118d347..5710b03f84 100644 --- a/release/src/router/transmission/gtk/Makefile.in +++ b/release/src/router/transmission/gtk/Makefile.in @@ -63,14 +63,13 @@ DIST_COMMON = $(dist_man_MANS) $(noinst_HEADERS) $(srcdir)/Makefile.am \ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx-pthread.m4 \ $(top_srcdir)/m4/check-ssl.m4 $(top_srcdir)/m4/glib-gettext.m4 \ - $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/zlib.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/pkg.m4 \ + $(top_srcdir)/m4/zlib.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \ diff --git a/release/src/router/transmission/gtk/actions.c b/release/src/router/transmission/gtk/actions.c index 9fe7353a2d..35e6be0366 100644 --- a/release/src/router/transmission/gtk/actions.c +++ b/release/src/router/transmission/gtk/actions.c @@ -7,7 +7,7 @@ * This exemption does not extend to derived works not owned by * the Transmission project. * - * $Id: actions.c 13625 2012-12-05 17:29:46Z jordan $ + * $Id: actions.c 13745 2013-01-03 23:49:45Z jordan $ */ #include @@ -167,21 +167,22 @@ register_my_icons (void) if (!gtk_icon_theme_has_icon (theme, name)) { - int width; GdkPixbuf * p; - GtkIconSet * icon_set; - - p = - gdk_pixbuf_new_from_inline (-1, my_fallback_icons[i].raw, - FALSE, - NULL); - width = gdk_pixbuf_get_width (p); - icon_set = gtk_icon_set_new_from_pixbuf (p); - gtk_icon_theme_add_builtin_icon (name, width, p); - gtk_icon_factory_add (factory, name, icon_set); - - g_object_unref (p); - gtk_icon_set_unref (icon_set); + + p = gdk_pixbuf_new_from_inline (-1, my_fallback_icons[i].raw, FALSE, NULL); + if (p != NULL) + { + int width; + GtkIconSet * icon_set; + + width = gdk_pixbuf_get_width (p); + icon_set = gtk_icon_set_new_from_pixbuf (p); + gtk_icon_theme_add_builtin_icon (name, width, p); + gtk_icon_factory_add (factory, name, icon_set); + + g_object_unref (p); + gtk_icon_set_unref (icon_set); + } } } diff --git a/release/src/router/transmission/gtk/details.c b/release/src/router/transmission/gtk/details.c index b67c7ea65e..5975112124 100644 --- a/release/src/router/transmission/gtk/details.c +++ b/release/src/router/transmission/gtk/details.c @@ -7,7 +7,7 @@ * This exemption does not extend to derived works not owned by * the Transmission project. * - * $Id: details.c 13625 2012-12-05 17:29:46Z jordan $ + * $Id: details.c 13739 2013-01-03 23:41:02Z jordan $ */ #include @@ -2209,7 +2209,6 @@ on_edit_trackers (GtkButton * button, gpointer data) hig_workarea_add_wide_control (t, &row, l); w = gtk_text_view_new (); - gtk_widget_set_size_request (w, 500u, 166u); g_string_truncate (gstr, 0); get_editable_tracker_list (gstr, tor); gtk_text_buffer_set_text (gtk_text_view_get_buffer (GTK_TEXT_VIEW (w)), gstr->str, -1); @@ -2221,6 +2220,7 @@ on_edit_trackers (GtkButton * button, gpointer data) GTK_POLICY_AUTOMATIC); gtk_container_add (GTK_CONTAINER (sw), w); gtk_container_add (GTK_CONTAINER (fr), sw); + gtk_widget_set_size_request (fr, 500u, 166u); hig_workarea_add_wide_tall_control (t, &row, fr); gtr_dialog_set_content (GTK_DIALOG (d), t); diff --git a/release/src/router/transmission/gtk/hig.c b/release/src/router/transmission/gtk/hig.c index 21c2deb625..317a19b704 100644 --- a/release/src/router/transmission/gtk/hig.c +++ b/release/src/router/transmission/gtk/hig.c @@ -7,7 +7,7 @@ * This exemption does not extend to derived works not owned by * the Transmission project. * - * $Id: hig.c 13625 2012-12-05 17:29:46Z jordan $ + * $Id: hig.c 13739 2013-01-03 23:41:02Z jordan $ */ #include @@ -68,6 +68,7 @@ void hig_workarea_add_wide_tall_control (GtkWidget * t, guint * row, GtkWidget * w) { gtk_widget_set_hexpand (w, TRUE); + gtk_widget_set_vexpand (w, TRUE); hig_workarea_add_wide_control (t, row, w); } diff --git a/release/src/router/transmission/gtk/icons/Makefile.in b/release/src/router/transmission/gtk/icons/Makefile.in index 19c962b9fb..f8a5d2225d 100644 --- a/release/src/router/transmission/gtk/icons/Makefile.in +++ b/release/src/router/transmission/gtk/icons/Makefile.in @@ -56,14 +56,13 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx-pthread.m4 \ $(top_srcdir)/m4/check-ssl.m4 $(top_srcdir)/m4/glib-gettext.m4 \ - $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/zlib.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/pkg.m4 \ + $(top_srcdir)/m4/zlib.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = AM_V_GEN = $(am__v_GEN_@AM_V@) diff --git a/release/src/router/transmission/gtk/main.c b/release/src/router/transmission/gtk/main.c index 8f09c381ab..c36288e246 100644 --- a/release/src/router/transmission/gtk/main.c +++ b/release/src/router/transmission/gtk/main.c @@ -1,5 +1,5 @@ /****************************************************************************** - * $Id: main.c 13625 2012-12-05 17:29:46Z jordan $ + * $Id: main.c 13771 2013-01-05 17:49:40Z jordan $ * * Copyright (c) Transmission authors and contributors * @@ -772,6 +772,7 @@ presentMainWindow (struct cbdata * cbdata) } gtr_window_present (window); + gdk_window_raise (gtk_widget_get_window (GTK_WIDGET(window))); } static void diff --git a/release/src/router/transmission/gtk/tr-core.c b/release/src/router/transmission/gtk/tr-core.c index bea1e27c0f..ed4db61f58 100644 --- a/release/src/router/transmission/gtk/tr-core.c +++ b/release/src/router/transmission/gtk/tr-core.c @@ -1,5 +1,5 @@ /****************************************************************************** - * $Id: tr-core.c 13625 2012-12-05 17:29:46Z jordan $ + * $Id: tr-core.c 13742 2013-01-03 23:45:38Z jordan $ * * Copyright (c) Transmission authors and contributors * @@ -404,7 +404,7 @@ compare_time (time_t a, time_t b) if (a < b) ret = -1; - if (a > b) + else if (a > b) ret = 1; else ret = 0; diff --git a/release/src/router/transmission/libtransmission/Makefile.in b/release/src/router/transmission/libtransmission/Makefile.in index 84a5ff82d0..1f74f8e534 100644 --- a/release/src/router/transmission/libtransmission/Makefile.in +++ b/release/src/router/transmission/libtransmission/Makefile.in @@ -65,14 +65,13 @@ DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx-pthread.m4 \ $(top_srcdir)/m4/check-ssl.m4 $(top_srcdir)/m4/glib-gettext.m4 \ - $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/zlib.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/pkg.m4 \ + $(top_srcdir)/m4/zlib.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = LIBRARIES = $(noinst_LIBRARIES) diff --git a/release/src/router/transmission/libtransmission/platform.c b/release/src/router/transmission/libtransmission/platform.c index b576afe526..76a238e0e2 100644 --- a/release/src/router/transmission/libtransmission/platform.c +++ b/release/src/router/transmission/libtransmission/platform.c @@ -7,7 +7,7 @@ * This exemption does not extend to derived works not owned by * the Transmission project. * - * $Id: platform.c 13631 2012-12-07 01:53:31Z jordan $ + * $Id: platform.c 13743 2013-01-03 23:46:35Z jordan $ */ #ifdef WIN32 @@ -502,6 +502,8 @@ tr_getDefaultDownloadDir (void) if (!memcmp (value, "$HOME/", 6)) user_dir = tr_buildPath (getHomeDir (), value+6, NULL); + else if (!strcmp (value, "$HOME")) + user_dir = tr_strdup (getHomeDir ()); else user_dir = tr_strdup (value); } diff --git a/release/src/router/transmission/libtransmission/torrent.c b/release/src/router/transmission/libtransmission/torrent.c index c1e38dbf62..8ecb7dbd02 100644 --- a/release/src/router/transmission/libtransmission/torrent.c +++ b/release/src/router/transmission/libtransmission/torrent.c @@ -7,7 +7,7 @@ * This exemption does not extend to derived works not owned by * the Transmission project. * - * $Id: torrent.c 13631 2012-12-07 01:53:31Z jordan $ + * $Id: torrent.c 13769 2013-01-05 17:46:12Z jordan $ */ #include /* signal () */ @@ -1258,7 +1258,7 @@ tr_torrentStat (tr_torrent * tor) tor->etaDLSpeedCalculatedAt = now; } - if (s->leftUntilDone > s->desiredAvailable) + if ((s->leftUntilDone > s->desiredAvailable) && (tor->info.webseedCount < 1)) s->eta = TR_ETA_NOT_AVAIL; else if (tor->etaDLSpeed_KBps < 1) s->eta = TR_ETA_UNKNOWN; @@ -2016,7 +2016,8 @@ torrentCallScript (const tr_torrent * tor, const char * script) tr_torinf (tor, "Calling script \"%s\"", script); #ifdef WIN32 - _spawnvpe (_P_NOWAIT, script, (const char*)cmd, env); + if (_spawnvpe (_P_NOWAIT, script, (const char*)cmd, env) == -1) + tr_torerr (tor, "error executing script \"%s\": %s", cmd[0], tr_strerror (errno)); #else signal (SIGCHLD, onSigCHLD); @@ -2024,7 +2025,10 @@ torrentCallScript (const tr_torrent * tor, const char * script) { for (i=0; env[i]; ++i) putenv (env[i]); - execvp (script, cmd); + + if (execvp (script, cmd) == -1) + tr_torerr (tor, "error executing script \"%s\": %s", cmd[0], tr_strerror (errno)); + _exit (0); } #endif diff --git a/release/src/router/transmission/libtransmission/version.h b/release/src/router/transmission/libtransmission/version.h dissimilarity index 82% index 861c04dfc0..64018ce5fa 100644 --- a/release/src/router/transmission/libtransmission/version.h +++ b/release/src/router/transmission/libtransmission/version.h @@ -1,10 +1,10 @@ -#define PEERID_PREFIX "-TR2750-" -#define USERAGENT_PREFIX "2.75" -#define SVN_REVISION "13675" -#define SVN_REVISION_NUM 13675 -#define SHORT_VERSION_STRING "2.75" -#define LONG_VERSION_STRING "2.75 (13675)" -#define VERSION_STRING_INFOPLIST 2.75 -#define MAJOR_VERSION 2 -#define MINOR_VERSION 75 -#define TR_STABLE_RELEASE 1 +#define PEERID_PREFIX "-TR2760-" +#define USERAGENT_PREFIX "2.76" +#define SVN_REVISION "13786" +#define SVN_REVISION_NUM 13786 +#define SHORT_VERSION_STRING "2.76" +#define LONG_VERSION_STRING "2.76 (13786)" +#define VERSION_STRING_INFOPLIST 2.76 +#define MAJOR_VERSION 2 +#define MINOR_VERSION 76 +#define TR_STABLE_RELEASE 1 diff --git a/release/src/router/transmission/m4/intltool.m4 b/release/src/router/transmission/m4/intltool.m4 deleted file mode 100644 index 33353eda43..0000000000 --- a/release/src/router/transmission/m4/intltool.m4 +++ /dev/null @@ -1,237 +0,0 @@ -## intltool.m4 - Configure intltool for the target system. -*-Shell-script-*- -## Copyright (C) 2001 Eazel, Inc. -## Author: Maciej Stachowiak -## Kenneth Christiansen -## -## This program is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published by -## the Free Software Foundation; either version 2 of the License, or -## (at your option) any later version. -## -## This program is distributed in the hope that it will be useful, but -## WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -## General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with this program; if not, write to the Free Software -## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -## -## As a special exception to the GNU General Public License, if you -## distribute this file as part of a program that contains a -## configuration script generated by Autoconf, you may include it under -## the same distribution terms that you use for the rest of that program. - -dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) -# serial 42 IT_PROG_INTLTOOL -AC_DEFUN([IT_PROG_INTLTOOL], [ -AC_PREREQ([2.50])dnl -AC_REQUIRE([AM_NLS])dnl - -case "$am__api_version" in - 1.[01234]) - AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool]) - ;; - *) - ;; -esac - -INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` -INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` -INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` -if test -n "$1"; then - AC_MSG_CHECKING([for intltool >= $1]) - AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found]) - test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || - AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.]) -fi - -AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update]) -AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge]) -AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract]) -if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then - AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.]) -fi - -if test -z "$AM_DEFAULT_VERBOSITY"; then - AM_DEFAULT_VERBOSITY=1 -fi -AC_SUBST([AM_DEFAULT_VERBOSITY]) - -INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))' -INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))' -INTLTOOL__v_MERGE_0='@echo " ITMRG " [$]@;' -AC_SUBST(INTLTOOL_V_MERGE) -AC_SUBST(INTLTOOL__v_MERGE_) -AC_SUBST(INTLTOOL__v_MERGE_0) - -INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))' -intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))' -intltool__v_merge_options_0='-q' -AC_SUBST(INTLTOOL_V_MERGE_OPTIONS) -AC_SUBST(intltool__v_merge_options_) -AC_SUBST(intltool__v_merge_options_0) - - INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< [$]@' - INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then - INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< [$]@' -else - INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.[$][$]RANDOM && mkdir [$][$]_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u [$][$]_it_tmp_dir $< [$]@ && rmdir [$][$]_it_tmp_dir' -fi - INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - -_IT_SUBST(INTLTOOL_DESKTOP_RULE) -_IT_SUBST(INTLTOOL_DIRECTORY_RULE) -_IT_SUBST(INTLTOOL_KEYS_RULE) -_IT_SUBST(INTLTOOL_PROP_RULE) -_IT_SUBST(INTLTOOL_OAF_RULE) -_IT_SUBST(INTLTOOL_PONG_RULE) -_IT_SUBST(INTLTOOL_SERVER_RULE) -_IT_SUBST(INTLTOOL_SHEET_RULE) -_IT_SUBST(INTLTOOL_SOUNDLIST_RULE) -_IT_SUBST(INTLTOOL_UI_RULE) -_IT_SUBST(INTLTOOL_XAM_RULE) -_IT_SUBST(INTLTOOL_KBD_RULE) -_IT_SUBST(INTLTOOL_XML_RULE) -_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE) -_IT_SUBST(INTLTOOL_CAVES_RULE) -_IT_SUBST(INTLTOOL_SCHEMAS_RULE) -_IT_SUBST(INTLTOOL_THEME_RULE) -_IT_SUBST(INTLTOOL_SERVICE_RULE) -_IT_SUBST(INTLTOOL_POLICY_RULE) - -# Check the gettext tools to make sure they are GNU -AC_PATH_PROG(XGETTEXT, xgettext) -AC_PATH_PROG(MSGMERGE, msgmerge) -AC_PATH_PROG(MSGFMT, msgfmt) -AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) -if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then - AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) -fi -xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`" -mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`" -mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`" -if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then - AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) -fi - -AC_PATH_PROG(INTLTOOL_PERL, perl) -if test -z "$INTLTOOL_PERL"; then - AC_MSG_ERROR([perl not found]) -fi -AC_MSG_CHECKING([for perl >= 5.8.1]) -$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1 -if test $? -ne 0; then - AC_MSG_ERROR([perl 5.8.1 is required for intltool]) -else - IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"` - AC_MSG_RESULT([$IT_PERL_VERSION]) -fi -if test "x$2" != "xno-xml"; then - AC_MSG_CHECKING([for XML::Parser]) - if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then - AC_MSG_RESULT([ok]) - else - AC_MSG_ERROR([XML::Parser perl module is required for intltool]) - fi -fi - -# Substitute ALL_LINGUAS so we can use it in po/Makefile -AC_SUBST(ALL_LINGUAS) - -# Set DATADIRNAME correctly if it is not set yet -# (copied from glib-gettext.m4) -if test -z "$DATADIRNAME"; then - AC_LINK_IFELSE( - [AC_LANG_PROGRAM([[]], - [[extern int _nl_msg_cat_cntr; - return _nl_msg_cat_cntr]])], - [DATADIRNAME=share], - [case $host in - *-*-solaris*) - dnl On Solaris, if bind_textdomain_codeset is in libc, - dnl GNU format message catalog is always supported, - dnl since both are added to the libc all together. - dnl Hence, we'd like to go with DATADIRNAME=share - dnl in this case. - AC_CHECK_FUNC(bind_textdomain_codeset, - [DATADIRNAME=share], [DATADIRNAME=lib]) - ;; - *) - [DATADIRNAME=lib] - ;; - esac]) -fi -AC_SUBST(DATADIRNAME) - -IT_PO_SUBDIR([po]) - -]) - - -# IT_PO_SUBDIR(DIRNAME) -# --------------------- -# All po subdirs have to be declared with this macro; the subdir "po" is -# declared by IT_PROG_INTLTOOL. -# -AC_DEFUN([IT_PO_SUBDIR], -[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS. -dnl -dnl The following CONFIG_COMMANDS should be executed at the very end -dnl of config.status. -AC_CONFIG_COMMANDS_PRE([ - AC_CONFIG_COMMANDS([$1/stamp-it], [ - if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then - AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.]) - fi - rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp" - >"$1/stamp-it.tmp" - [sed '/^#/d - s/^[[].*] *// - /^[ ]*$/d - '"s|^| $ac_top_srcdir/|" \ - "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES" - ] - [sed '/^POTFILES =/,/[^\\]$/ { - /^POTFILES =/!d - r $1/POTFILES - } - ' "$1/Makefile.in" >"$1/Makefile"] - rm -f "$1/Makefile.tmp" - mv "$1/stamp-it.tmp" "$1/stamp-it" - ]) -])dnl -]) - -# _IT_SUBST(VARIABLE) -# ------------------- -# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST -# -AC_DEFUN([_IT_SUBST], -[ -AC_SUBST([$1]) -m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])]) -] -) - -# deprecated macros -AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL]) -# A hint is needed for aclocal from Automake <= 1.9.4: -# AC_DEFUN([AC_PROG_INTLTOOL], ...) - diff --git a/release/src/router/transmission/macosx/Makefile.in b/release/src/router/transmission/macosx/Makefile.in index 53d7d37570..982835cc0c 100644 --- a/release/src/router/transmission/macosx/Makefile.in +++ b/release/src/router/transmission/macosx/Makefile.in @@ -55,14 +55,13 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx-pthread.m4 \ $(top_srcdir)/m4/check-ssl.m4 $(top_srcdir)/m4/glib-gettext.m4 \ - $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/zlib.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/pkg.m4 \ + $(top_srcdir)/m4/zlib.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = AM_V_GEN = $(am__v_GEN_@AM_V@) diff --git a/release/src/router/transmission/mkinstalldirs b/release/src/router/transmission/mkinstalldirs deleted file mode 100755 index 4191a45dbd..0000000000 --- a/release/src/router/transmission/mkinstalldirs +++ /dev/null @@ -1,162 +0,0 @@ -#! /bin/sh -# mkinstalldirs --- make directory hierarchy - -scriptversion=2009-04-28.21; # UTC - -# Original author: Noah Friedman -# Created: 1993-05-16 -# Public domain. -# -# This file is maintained in Automake, please report -# bugs to or send patches to -# . - -nl=' -' -IFS=" "" $nl" -errstatus=0 -dirmode= - -usage="\ -Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ... - -Create each directory DIR (with mode MODE, if specified), including all -leading file name components. - -Report bugs to ." - -# process command line arguments -while test $# -gt 0 ; do - case $1 in - -h | --help | --h*) # -h for help - echo "$usage" - exit $? - ;; - -m) # -m PERM arg - shift - test $# -eq 0 && { echo "$usage" 1>&2; exit 1; } - dirmode=$1 - shift - ;; - --version) - echo "$0 $scriptversion" - exit $? - ;; - --) # stop option processing - shift - break - ;; - -*) # unknown option - echo "$usage" 1>&2 - exit 1 - ;; - *) # first non-opt arg - break - ;; - esac -done - -for file -do - if test -d "$file"; then - shift - else - break - fi -done - -case $# in - 0) exit 0 ;; -esac - -# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and -# mkdir -p a/c at the same time, both will detect that a is missing, -# one will create a, then the other will try to create a and die with -# a "File exists" error. This is a problem when calling mkinstalldirs -# from a parallel make. We use --version in the probe to restrict -# ourselves to GNU mkdir, which is thread-safe. -case $dirmode in - '') - if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then - echo "mkdir -p -- $*" - exec mkdir -p -- "$@" - else - # On NextStep and OpenStep, the `mkdir' command does not - # recognize any option. It will interpret all options as - # directories to create, and then abort because `.' already - # exists. - test -d ./-p && rmdir ./-p - test -d ./--version && rmdir ./--version - fi - ;; - *) - if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 && - test ! -d ./--version; then - echo "mkdir -m $dirmode -p -- $*" - exec mkdir -m "$dirmode" -p -- "$@" - else - # Clean up after NextStep and OpenStep mkdir. - for d in ./-m ./-p ./--version "./$dirmode"; - do - test -d $d && rmdir $d - done - fi - ;; -esac - -for file -do - case $file in - /*) pathcomp=/ ;; - *) pathcomp= ;; - esac - oIFS=$IFS - IFS=/ - set fnord $file - shift - IFS=$oIFS - - for d - do - test "x$d" = x && continue - - pathcomp=$pathcomp$d - case $pathcomp in - -*) pathcomp=./$pathcomp ;; - esac - - if test ! -d "$pathcomp"; then - echo "mkdir $pathcomp" - - mkdir "$pathcomp" || lasterr=$? - - if test ! -d "$pathcomp"; then - errstatus=$lasterr - else - if test ! -z "$dirmode"; then - echo "chmod $dirmode $pathcomp" - lasterr= - chmod "$dirmode" "$pathcomp" || lasterr=$? - - if test ! -z "$lasterr"; then - errstatus=$lasterr - fi - fi - fi - fi - - pathcomp=$pathcomp/ - done -done - -exit $errstatus - -# Local Variables: -# mode: shell-script -# sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" -# End: diff --git a/release/src/router/transmission/qt/filterbar.cc b/release/src/router/transmission/qt/filterbar.cc index 668ee24e69..20f20fef71 100644 --- a/release/src/router/transmission/qt/filterbar.cc +++ b/release/src/router/transmission/qt/filterbar.cc @@ -7,7 +7,7 @@ * * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * - * $Id: filterbar.cc 12607 2011-08-01 22:24:24Z jordan $ + * $Id: filterbar.cc 13746 2013-01-03 23:50:42Z jordan $ */ #include @@ -490,10 +490,6 @@ FilterBar :: refreshPref( int key ) } break; } - - case Prefs :: FILTER_TEXT: - myLineEdit->setText( myPrefs.getString( key ) ); - break; } } diff --git a/release/src/router/transmission/qt/mainwin.cc b/release/src/router/transmission/qt/mainwin.cc index c72627428b..a17a8c55c8 100644 --- a/release/src/router/transmission/qt/mainwin.cc +++ b/release/src/router/transmission/qt/mainwin.cc @@ -7,7 +7,7 @@ * * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * - * $Id: mainwin.cc 13555 2012-10-08 04:23:39Z jordan $ + * $Id: mainwin.cc 13750 2013-01-04 00:00:55Z jordan $ */ #include @@ -250,11 +250,11 @@ TrMainWindow :: TrMainWindow( Session& session, Prefs& prefs, TorrentModel& mode myTrayIcon.setIcon( QApplication::windowIcon( ) ); connect( &myPrefs, SIGNAL(changed(int)), this, SLOT(refreshPref(int)) ); - connect( ui.action_ShowMainWindow, SIGNAL(toggled(bool)), this, SLOT(toggleWindows(bool))); + connect( ui.action_ShowMainWindow, SIGNAL(triggered(bool)), this, SLOT(toggleWindows(bool))); connect( &myTrayIcon, SIGNAL(activated(QSystemTrayIcon::ActivationReason)), this, SLOT(trayActivated(QSystemTrayIcon::ActivationReason))); - ui.action_ShowMainWindow->setChecked( !minimized ); + toggleWindows( !minimized ); ui.action_TrayIcon->setChecked( minimized || prefs.getBool( Prefs::SHOW_TRAY_ICON ) ); ui.verticalLayout->addWidget( createStatusBar( ) ); @@ -313,23 +313,6 @@ TrMainWindow :: ~TrMainWindow( ) ****/ void -TrMainWindow :: closeEvent( QCloseEvent * event ) -{ - // if they're using a tray icon, close to the tray - // instead of exiting - if( !myPrefs.getBool( Prefs :: SHOW_TRAY_ICON ) ) - event->accept( ); - else { - toggleWindows( false ); - event->ignore( ); - } -} - -/**** -***** -****/ - -void TrMainWindow :: onSessionSourceChanged( ) { myModel.clear( ); @@ -567,6 +550,31 @@ TrMainWindow :: setSortAscendingPref( bool b ) ****/ void +TrMainWindow :: showEvent( QShowEvent * event ) +{ + Q_UNUSED (event); + + ui.action_ShowMainWindow->setChecked(true); +} + +/**** +***** +****/ + +void +TrMainWindow :: hideEvent( QHideEvent * event ) +{ + Q_UNUSED (event); + + if (!isVisible()) + ui.action_ShowMainWindow->setChecked(false); +} + +/**** +***** +****/ + +void TrMainWindow :: onPrefsDestroyed( ) { myPrefsDialog = 0; @@ -993,7 +1001,7 @@ TrMainWindow :: trayActivated( QSystemTrayIcon::ActivationReason reason ) if( isMinimized ( ) ) toggleWindows( true ); else - ui.action_ShowMainWindow->toggle( ); + toggleWindows( !isVisible() ); } } @@ -1079,6 +1087,7 @@ TrMainWindow :: refreshPref( int key ) b = myPrefs.getBool( key ); ui.action_TrayIcon->setChecked( b ); myTrayIcon.setVisible( b ); + dynamic_cast(QCoreApplication::instance())->setQuitOnLastWindowClosed(!b); refreshTrayIconSoon( ); break; diff --git a/release/src/router/transmission/qt/mainwin.h b/release/src/router/transmission/qt/mainwin.h index 585cdf574f..29b9744c05 100644 --- a/release/src/router/transmission/qt/mainwin.h +++ b/release/src/router/transmission/qt/mainwin.h @@ -7,7 +7,7 @@ * * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * - * $Id: mainwin.h 13446 2012-08-19 00:01:54Z jordan $ + * $Id: mainwin.h 13750 2013-01-04 00:00:55Z jordan $ */ #ifndef MAIN_WINDOW_H @@ -52,7 +52,8 @@ class TrMainWindow: public QMainWindow Q_OBJECT private: - virtual void closeEvent( QCloseEvent * event ); + virtual void hideEvent( QHideEvent * event ); + virtual void showEvent( QShowEvent * event ); private: time_t myLastFullUpdateTime; diff --git a/release/src/router/transmission/qt/options.cc b/release/src/router/transmission/qt/options.cc index bf0030c7b9..2dde0e779b 100644 --- a/release/src/router/transmission/qt/options.cc +++ b/release/src/router/transmission/qt/options.cc @@ -7,7 +7,7 @@ * * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * - * $Id: options.cc 13555 2012-10-08 04:23:39Z jordan $ + * $Id: options.cc 13751 2013-01-04 00:06:34Z jordan $ */ #include @@ -215,7 +215,7 @@ Options :: refreshFileButton( int width ) switch( myAdd.type ) { - case AddData::FILENAME: text = QFileInfo(myAdd.filename).baseName(); break; + case AddData::FILENAME: text = QFileInfo(myAdd.filename).completeBaseName(); break; case AddData::URL: text = myAdd.url.toString(); break; case AddData::MAGNET: text = myAdd.magnet; break; default: break; diff --git a/release/src/router/transmission/qt/prefs.cc b/release/src/router/transmission/qt/prefs.cc index a0efe86f93..ddf6860a13 100644 --- a/release/src/router/transmission/qt/prefs.cc +++ b/release/src/router/transmission/qt/prefs.cc @@ -7,7 +7,7 @@ * * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * - * $Id: prefs.cc 13448 2012-08-19 16:12:20Z jordan $ + * $Id: prefs.cc 13777 2013-01-05 22:53:52Z jordan $ */ #include @@ -220,7 +220,9 @@ Prefs :: ~Prefs( ) tr_bencDictAddStr( &top, key, val.value().name().toUtf8().constData() ); break; case QVariant::String: - { const char * s = val.toByteArray().constData(); + { + const QByteArray ba (val.toByteArray()); + const char * s = ba.constData(); if ( Utils::isValidUtf8( s ) ) tr_bencDictAddStr( &top, key, s ); else diff --git a/release/src/router/transmission/qt/session.cc b/release/src/router/transmission/qt/session.cc index 8c3bd054e5..2e63629874 100644 --- a/release/src/router/transmission/qt/session.cc +++ b/release/src/router/transmission/qt/session.cc @@ -7,7 +7,7 @@ * * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * - * $Id: session.cc 13448 2012-08-19 16:12:20Z jordan $ + * $Id: session.cc 13773 2013-01-05 17:52:41Z jordan $ */ #include @@ -167,6 +167,7 @@ Session :: updatePref( int key ) case Prefs :: QUEUE_STALLED_MINUTES: case Prefs :: PEX_ENABLED: case Prefs :: PORT_FORWARDING: + case Prefs :: RENAME_PARTIAL_FILES: case Prefs :: SCRIPT_TORRENT_DONE_ENABLED: case Prefs :: SCRIPT_TORRENT_DONE_FILENAME: case Prefs :: START: diff --git a/release/src/router/transmission/qt/transmission-qt.desktop b/release/src/router/transmission/qt/transmission-qt.desktop index 2f5e1e40aa..56c58ad1a3 100644 --- a/release/src/router/transmission/qt/transmission-qt.desktop +++ b/release/src/router/transmission/qt/transmission-qt.desktop @@ -2,7 +2,7 @@ Name=Qtransmission Bittorrent Client GenericName=BitTorrent Client Comment=Download and share files over BitTorrent -Exec=transmission-qt %F +Exec=transmission-qt %U Icon=transmission-qt Terminal=false Type=Application @@ -12,7 +12,7 @@ X-AppInstall-Keywords=torrent Actions=Minimize; [Desktop Action Minimize] -_Name=Start Transmission Minimized +Name=Start Transmission Minimized Exec=transmission-qt --minimized OnlyShowIn=Unity; diff --git a/release/src/router/transmission/qt/utils.cc b/release/src/router/transmission/qt/utils.cc index bc9b790ecd..7f0da06d5f 100644 --- a/release/src/router/transmission/qt/utils.cc +++ b/release/src/router/transmission/qt/utils.cc @@ -7,7 +7,7 @@ * * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * - * $Id: utils.cc 13448 2012-08-19 16:12:20Z jordan $ + * $Id: utils.cc 13749 2013-01-03 23:57:04Z jordan $ */ #include @@ -67,46 +67,46 @@ Utils :: guessMimeIcon( const QString& filename ) { fallback = QApplication::style()->standardIcon( QStyle :: SP_FileIcon ); - suffixes[DISK] << QString::fromAscii("iso"); - fileIcons[DISK]= QIcon::fromTheme( QString::fromAscii("media-optical"), fallback ); + suffixes[DISK] << QString::fromLatin1("iso"); + fileIcons[DISK]= QIcon::fromTheme( QString::fromLatin1("media-optical"), fallback ); const char * doc_types[] = { "abw", "csv", "doc", "dvi", "htm", "html", "ini", "log", "odp", "ods", "odt", "pdf", "ppt", "ps", "rtf", "tex", "txt", "xml" }; for( int i=0, n=sizeof(doc_types)/sizeof(doc_types[0]); i div#toolbar-separator { height: 25px; margin-top: 8px; @@ -77,20 +79,19 @@ div#toolbar { border-left: 1px solid #aaa; width: 3px; } div#toolbar > div#toolbar-open { - background: url("images/toolbar-folder.png") no-repeat; - margin-left: 4px; } + background-image: url("images/toolbar-folder.png"); } div#toolbar > div#toolbar-remove { - background: url("images/toolbar-close.png") no-repeat; } + background-image: url("images/toolbar-close.png"); } div#toolbar > div#toolbar-start { - background: url("images/toolbar-start.png") no-repeat; } + background-image: url("images/toolbar-start.png"); } div#toolbar > div#toolbar-pause { - background: url("images/toolbar-pause.png") no-repeat; } + background-image: url("images/toolbar-pause.png"); } div#toolbar > div#toolbar-start-all { - background: url("images/toolbar-start-all.png") no-repeat; } + background-image: url("images/toolbar-start-all.png"); } div#toolbar > div#toolbar-pause-all { - background: url("images/toolbar-pause-all.png") no-repeat; } + background-image: url("images/toolbar-pause-all.png"); } div#toolbar > div#toolbar-inspector { - background: url("images/toolbar-info.png") no-repeat; + background-image: url("images/toolbar-info.png"); float: right; margin-right: 4px; } div#toolbar > *.disabled { diff --git a/release/src/router/transmission/web/style/transmission/common.scss b/release/src/router/transmission/web/style/transmission/common.scss index c078bf34d7..cf4f7b6b15 100644 --- a/release/src/router/transmission/web/style/transmission/common.scss +++ b/release/src/router/transmission/web/style/transmission/common.scss @@ -143,6 +143,8 @@ div#toolbar float: left; border: none; padding: 0px 3px; + background-position: center center; + background-repeat: no-repeat; } >div#toolbar-separator { @@ -154,27 +156,26 @@ div#toolbar } > div#toolbar-open { - background: url('images/toolbar-folder.png') no-repeat; - margin-left: 4px; + background-image: url('images/toolbar-folder.png'); } > div#toolbar-remove { - background: url('images/toolbar-close.png') no-repeat; + background-image: url('images/toolbar-close.png'); } > div#toolbar-start { - background: url('images/toolbar-start.png') no-repeat; + background-image: url('images/toolbar-start.png'); } > div#toolbar-pause { - background: url('images/toolbar-pause.png') no-repeat; + background-image: url('images/toolbar-pause.png'); } > div#toolbar-start-all { - background: url('images/toolbar-start-all.png') no-repeat; + background-image: url('images/toolbar-start-all.png'); } > div#toolbar-pause-all { - background: url('images/toolbar-pause-all.png') no-repeat; + background-image: url('images/toolbar-pause-all.png'); } > div#toolbar-inspector { - background: url('images/toolbar-info.png') no-repeat; + background-image: url('images/toolbar-info.png'); float: right; margin-right: 4px; } @@ -254,7 +255,6 @@ $statusbar-height: 26px; ***/ $torrent-container-top: $toolbar-height + $statusbar-height + 6px; -$torrent-list-button-width: 14px; div#torrent_container { position: fixed; @@ -279,7 +279,7 @@ ul.torrent_list li.torrent { border-bottom: 1px solid #ccc; - padding: 4px 30px 5px $torrent-list-button-width; + padding: 4px 30px 5px 14px; color: #666; background-color: white; diff --git a/release/src/router/transmission/web/style/transmission/images/Makefile.in b/release/src/router/transmission/web/style/transmission/images/Makefile.in index 49c9961208..f0b440233d 100644 --- a/release/src/router/transmission/web/style/transmission/images/Makefile.in +++ b/release/src/router/transmission/web/style/transmission/images/Makefile.in @@ -57,14 +57,13 @@ DIST_COMMON = $(dist_data_DATA) $(srcdir)/Makefile.am \ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx-pthread.m4 \ $(top_srcdir)/m4/check-ssl.m4 $(top_srcdir)/m4/glib-gettext.m4 \ - $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/zlib.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/pkg.m4 \ + $(top_srcdir)/m4/zlib.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = AM_V_GEN = $(am__v_GEN_@AM_V@) diff --git a/release/src/router/transmission/web/style/transmission/images/buttons/Makefile.in b/release/src/router/transmission/web/style/transmission/images/buttons/Makefile.in index 94d87ce717..ba98e573f0 100644 --- a/release/src/router/transmission/web/style/transmission/images/buttons/Makefile.in +++ b/release/src/router/transmission/web/style/transmission/images/buttons/Makefile.in @@ -57,14 +57,13 @@ DIST_COMMON = $(dist_data_DATA) $(srcdir)/Makefile.am \ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx-pthread.m4 \ $(top_srcdir)/m4/check-ssl.m4 $(top_srcdir)/m4/glib-gettext.m4 \ - $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/zlib.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/pkg.m4 \ + $(top_srcdir)/m4/zlib.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = AM_V_GEN = $(am__v_GEN_@AM_V@) diff --git a/release/src/router/transmission/web/style/transmission/mobile.css b/release/src/router/transmission/web/style/transmission/mobile.css index 7d0e4ee83f..0267e3cbd9 100644 --- a/release/src/router/transmission/web/style/transmission/mobile.css +++ b/release/src/router/transmission/web/style/transmission/mobile.css @@ -44,7 +44,7 @@ body.open_showing #torrent_filter_bar, body.open_showing #torrent_container { ***/ div#toolbar { width: 100%; - height: 36px; + height: 39px; margin: 0px; padding: 2px; border-bottom: 1px solid #AAA; @@ -69,27 +69,29 @@ div#toolbar { height: 34px; float: left; border: none; - padding: 0px 3px; } + padding: 0px 3px; + background-position: center center; + background-repeat: no-repeat; } div#toolbar > div#toolbar-separator { height: 25px; margin-top: 8px; - margin-bottom: 5px; + margin-bottom: 8px; border-left: 1px solid #aaa; width: 3px; } - div#toolbar div#toolbar-open { - background: url("images/toolbar-folder.png") no-repeat; } + div#toolbar > div#toolbar-open { + background-image: url("images/toolbar-folder.png"); } div#toolbar > div#toolbar-remove { - background: url("images/toolbar-close.png") no-repeat; } + background-image: url("images/toolbar-close.png"); } div#toolbar > div#toolbar-start { - background: url("images/toolbar-start.png") no-repeat; } + background-image: url("images/toolbar-start.png"); } div#toolbar > div#toolbar-pause { - background: url("images/toolbar-pause.png") no-repeat; } + background-image: url("images/toolbar-pause.png"); } div#toolbar > div#toolbar-start-all { - background: url("images/toolbar-start-all.png") no-repeat; } + background-image: url("images/toolbar-start-all.png"); } div#toolbar > div#toolbar-pause-all { - background: url("images/toolbar-pause-all.png") no-repeat; } + background-image: url("images/toolbar-pause-all.png"); } div#toolbar > div#toolbar-inspector { - background: url("images/toolbar-info.png") no-repeat; + background-image: url("images/toolbar-info.png"); float: right; } div#toolbar > *.disabled { opacity: 0.25; } @@ -100,7 +102,7 @@ div#toolbar { **** ***/ #statusbar { - height: 26px; + height: 24px; width: 100%; border-bottom: 1px solid #AAA; overflow: hidden; @@ -164,7 +166,7 @@ ul.torrent_list { */ } ul.torrent_list li.torrent { border-bottom: 1px solid #ccc; - padding: 4px 30px 5px 0px; + padding: 4px 30px 5px 14px; color: #666; background-color: white; } ul.torrent_list li.torrent.compact { diff --git a/release/src/router/transmission/web/style/transmission/mobile.scss b/release/src/router/transmission/web/style/transmission/mobile.scss index 793e2349cf..b0a51c0db1 100644 --- a/release/src/router/transmission/web/style/transmission/mobile.scss +++ b/release/src/router/transmission/web/style/transmission/mobile.scss @@ -113,7 +113,7 @@ body.open_showing #torrent_filter_bar, body.open_showing #torrent_container { $toolbar-gradient-top: #ddd; $toolbar-gradient-bottom: #bbb; -$toolbar-height: 36px; +$toolbar-height: 39px; div#toolbar { @@ -137,37 +137,39 @@ div#toolbar float: left; border: none; padding: 0px 3px; + background-position: center center; + background-repeat: no-repeat; } >div#toolbar-separator { height: 25px; margin-top: 8px; - margin-bottom: 5px; + margin-bottom: 8px; border-left: 1px solid #aaa; width: 3px; } - div#toolbar-open { - background: url('images/toolbar-folder.png') no-repeat; + > div#toolbar-open { + background-image: url('images/toolbar-folder.png'); } > div#toolbar-remove { - background: url('images/toolbar-close.png') no-repeat; + background-image: url('images/toolbar-close.png'); } > div#toolbar-start { - background: url('images/toolbar-start.png') no-repeat; + background-image: url('images/toolbar-start.png'); } > div#toolbar-pause { - background: url('images/toolbar-pause.png') no-repeat; + background-image: url('images/toolbar-pause.png'); } > div#toolbar-start-all { - background: url('images/toolbar-start-all.png') no-repeat; + background-image: url('images/toolbar-start-all.png'); } > div#toolbar-pause-all { - background: url('images/toolbar-pause-all.png') no-repeat; + background-image: url('images/toolbar-pause-all.png'); } > div#toolbar-inspector { - background: url('images/toolbar-info.png') no-repeat; + background-image: url('images/toolbar-info.png'); float: right; } @@ -184,7 +186,7 @@ div#toolbar $statusbar-gradient-top: #ddd; $statusbar-gradient-bottom: #bbb; -$statusbar-height: 26px; +$statusbar-height: 24px; #statusbar { @@ -242,8 +244,6 @@ $statusbar-height: 26px; **** ***/ -$torrent-list-button-width: 0px; - ul.torrent_list { width: 100%; @@ -255,7 +255,7 @@ ul.torrent_list li.torrent { border-bottom: 1px solid #ccc; - padding: 4px 30px 5px $torrent-list-button-width; + padding: 4px 30px 5px 14px; color: #666; background-color: white; diff --git a/release/src/router/www/about.asp b/release/src/router/www/about.asp index 5a819348e8..432084e5ed 100644 --- a/release/src/router/www/about.asp +++ b/release/src/router/www/about.asp @@ -114,7 +114,7 @@ Copyright (C) 2010 Keith Moyer,
"Shibby" features:
-- Transmission 2.75 integration
+- Transmission 2.76 integration
- GUI for Transmission
-- 2.11.4.GIT