diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 11df0ce208a..4b0e10991b7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -250,9 +250,11 @@ jobs: # broken --disable-mac ) - QMAKE_ARGS+=( - QMAKE_LIBDIR+="/usr/local/opt/miniupnpc/lib" - ) + if [[ "${{ matrix.libs }}" == "system" ]]; then + QMAKE_ARGS+=( + QMAKE_LIBDIR+="/usr/local/opt/miniupnpc/lib" + ) + fi elif [[ "${{ runner.os }}" == "Linux" ]]; then if [[ "${{ matrix.libs }}" == "system" ]]; then CONFIGURE_ARGS+=( diff --git a/.gitignore b/.gitignore index 00c8439780f..c8aeb341fb7 100644 --- a/.gitignore +++ b/.gitignore @@ -23,12 +23,14 @@ *.i*86 *.x86_64 *.hex -transmission-create -transmission-edit -transmission-remote -transmission-show -transmission-cli -transmission-qt +transmission-og-create +transmission-og-edit +transmission-og-remote +transmission-og-show +transmission-og-cli +transmission-og-qt +daemon/transmission-og-daemon +gtk/transmission-og-gtk bitfield-test blocklist-test clients-test @@ -83,7 +85,7 @@ po/stamp-it *.spec config.pri *.appdata.xml -*.desktop +gtk/*.desktop *.res gtk/transmission-resources.c gtk/transmission-resources.h @@ -107,11 +109,7 @@ Transmission.xcodeproj/xcuserdata /beta /build cli/transmissioncli -daemon/transmission-daemon -daemon/transmission-proxy -daemon/transmission-remote gtk/defines.h -gtk/transmission-gtk macosx/Info.plist macosx/Transmission.app macosx/en.lproj/*~.nib diff --git a/AUTHORS b/AUTHORS index b86fe799fea..e6ab4fb3647 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,5 +1,5 @@ -The Transmission Project -https://transmissionbt.com/ +The Transmission OG Project +https://github.com/stefantalpalaru/transmission-og Lead Developers Charles Kerr, Mnemosyne LLC (Daemon, Backend, GTK+, QT clients) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7707176036c..abfce60d3c3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) -project(transmission) +project(transmission-og) list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake) diff --git a/COPYING b/COPYING index 90f03ca42bf..e6269eaa352 100644 --- a/COPYING +++ b/COPYING @@ -1,6 +1,6 @@ -Copyright 2005-2020. All code is copyrighted by the respective authors. +Copyright 2005-2023. All code is copyrighted by the respective authors. -Transmission can be redistributed and/or modified under the terms of +Transmission OG can be redistributed and/or modified under the terms of the GNU GPLv2 (http://www.gnu.org/licenses/license-list.html#GPLv2), the GNU GPLv3 (http://www.gnu.org/licenses/license-list.html#GNUGPLv3), or any future license endorsed by Mnemosyne LLC. @@ -11,5 +11,5 @@ 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. -Some of Transmission's source files have more permissive licenses. +Some of Transmission OG's source files have more permissive licenses. Those files may, of course, be used on their own under their own terms. diff --git a/NEWS.md b/NEWS.md index 03ffdd2fc38..f013c28f889 100644 --- a/NEWS.md +++ b/NEWS.md @@ -4,9 +4,10 @@ - Default trackers for public torrents (not on the Mac client) ([#229](https://github.com/transmission/transmission/pull/229)) - OpenSSL-3: load "legacy" provider for RC4 ([#4716](https://github.com/transmission/transmission/issues/4716)) - Autotools improvements +- Rename project from "Transmission" to "Transmission OG" ### Qt Client -- fix download percentage bar glitch ([#3150](https://github.com/transmission/transmission/issues/3150)) +- Fix download percentage bar glitch ([#3150](https://github.com/transmission/transmission/issues/3150)) ## [Transmission 3.00](https://github.com/transmission/transmission/releases/tag/3.00) (2020-05-03) diff --git a/README.md b/README.md index 02c1bc5f053..fba93dcc916 100644 --- a/README.md +++ b/README.md @@ -1,66 +1,62 @@ ## About -Transmission is a fast, easy, and free BitTorrent client. It comes in several flavors: - * A native Mac OS X GUI application - * GTK+ and Qt GUI applications for Linux, BSD, etc. +Transmission OG (Old Generation) is a fork of [Transmission][https://github.com/transmission/transmission/] 3.00 (fast, easy, and free BitTorrent client). It comes in several flavors: + * GTK+ and Qt GUI applications for Linux, BSD, macOS, Windows, etc. * A headless daemon for servers and routers + * A native macOS GUI application (a bit lagging on features, help welcome) * A web UI for remote controlling any of the above -Visit https://transmissionbt.com/ for more information. +This fork is focused on stability, by rewinding the project's history back before the big C++ rewrite. ## Command line interface notes -Transmission is fully supported in transmission-remote, the preferred cli client. +Transmission OG is fully supported in transmission-og-remote, the preferred CLI client. -Three standalone tools to examine, create, and edit .torrent files exist: transmission-show, transmission-create, and transmission-edit, respectively. +Three standalone tools to examine, create, and edit .torrent files exist: transmission-og-show, transmission-og-create, and transmission-og-edit, respectively. -Prior to development of transmission-remote, the standalone client transmission-cli was created. Limited to a single torrent at a time, transmission-cli is deprecated and exists primarily to support older hardware dependent upon it. In almost all instances, transmission-remote should be used instead. +Prior to development of transmission-og-remote, the standalone client transmission-og-cli was created. Limited to a single torrent at a time, transmission-og-cli is deprecated and exists primarily to support older hardware dependent upon it. In almost all instances, transmission-og-remote should be used instead. Different distributions may choose to package any or all of these tools in one or more separate packages. ## Building -Transmission has an Xcode project file (Transmission.xcodeproj) for building in Xcode. +### Building a Transmission OG release from the command line -For a more detailed description, and dependencies, visit: https://github.com/transmission/transmission/wiki - -### Building a Transmission release from the command line - - $ tar xf transmission-2.92.tar.xz - $ cd transmission-2.92 + $ tar -xf transmission-og-3.01.tar.xz + $ cd transmission-og-3.01 $ mkdir build $ cd build $ cmake .. - $ make + $ make -j4 # if you have 4 CPU cores $ sudo make install -### Building Transmission from the nightly builds - -Download a tarball from https://build.transmissionbt.com/job/trunk-linux/ and follow the steps from the previous section. - -If you're new to building programs from source code, this is typically easier than building from Git. - -### Building Transmission from Git (first time) +### Building Transmission OG from Git (first time) - $ git clone https://github.com/transmission/transmission Transmission - $ cd Transmission + $ git clone https://github.com/stefantalpalaru/transmission-og + $ cd transmission-og $ git submodule update --init $ mkdir build $ cd build $ cmake .. - $ make + $ make -j4 # if you have 4 CPU cores $ sudo make install -### Building Transmission from Git (updating) +### Building Transmission OG from Git (updating) - $ cd Transmission/build + $ cd transmission-og/build $ make clean - $ git pull --rebase --prune - $ git submodule update + $ git pull + $ git submodule update --init $ cmake .. - $ make + $ make -j4 # if you have 4 CPU cores $ sudo make install +### macOS native + +Transmission OG has an Xcode project file (Transmission.xcodeproj) for building in Xcode. + +For a more detailed description, and dependencies, visit the original wiki: https://github.com/transmission/transmission/wiki + ## Contributing ### Code Style diff --git a/autogen.sh b/autogen.sh index 82db0bd8c02..91c3ad76af4 100755 --- a/autogen.sh +++ b/autogen.sh @@ -4,7 +4,6 @@ test -z "$srcdir" && srcdir=. ORIGDIR=$(pwd) cd "$srcdir" || exit 1 -PROJECT=Transmission GETTEXTIZE="glib-gettextize" $GETTEXTIZE --version < /dev/null > /dev/null 2>&1 diff --git a/cli/CMakeLists.txt b/cli/CMakeLists.txt index a2c97f6b22a..ca371ce4d90 100644 --- a/cli/CMakeLists.txt +++ b/cli/CMakeLists.txt @@ -3,7 +3,7 @@ project(trcli) include_directories(${CMAKE_SOURCE_DIR}) tr_win32_app_info(${PROJECT_NAME}_WIN32_RC_FILE - "Transmission Utility ('cli', obsolete)" + "Transmission OG Utility ('cli', obsolete)" "${TR_NAME}-cli" "${TR_NAME}-cli.exe") diff --git a/cli/Makefile.am b/cli/Makefile.am index 212617975c3..0ea1ba95ac8 100644 --- a/cli/Makefile.am +++ b/cli/Makefile.am @@ -6,14 +6,14 @@ AM_CFLAGS = \ @ZLIB_CFLAGS@ \ @PTHREAD_CFLAGS@ -bin_PROGRAMS = transmission-cli +bin_PROGRAMS = transmission-og-cli -dist_man_MANS = transmission-cli.1 +dist_man_MANS = transmission-og-cli.1 -transmission_cli_SOURCES = cli.c -nodist_EXTRA_transmission_cli_SOURCES = dummy.cxx # force C++ linking +transmission_og_cli_SOURCES = cli.c +nodist_EXTRA_transmission_og_cli_SOURCES = dummy.cxx # force C++ linking -transmission_cli_LDADD = \ +transmission_og_cli_LDADD = \ $(top_builddir)/libtransmission/libtransmission.a \ @LIBNATPMP_LIBS@ \ @LIBUPNP_LIBS@ \ diff --git a/cli/Makefile.in b/cli/Makefile.in index cb30e9528aa..082cd76743f 100644 --- a/cli/Makefile.in +++ b/cli/Makefile.in @@ -88,7 +88,7 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -bin_PROGRAMS = transmission-cli$(EXEEXT) +bin_PROGRAMS = transmission-og-cli$(EXEEXT) subdir = cli ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx-pthread.m4 \ @@ -105,10 +105,10 @@ CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" PROGRAMS = $(bin_PROGRAMS) -am_transmission_cli_OBJECTS = cli.$(OBJEXT) -transmission_cli_OBJECTS = $(am_transmission_cli_OBJECTS) +am_transmission_og_cli_OBJECTS = cli.$(OBJEXT) +transmission_og_cli_OBJECTS = $(am_transmission_og_cli_OBJECTS) am__DEPENDENCIES_1 = -transmission_cli_DEPENDENCIES = \ +transmission_og_cli_DEPENDENCIES = \ $(top_builddir)/libtransmission/libtransmission.a \ $(am__DEPENDENCIES_1) AM_V_lt = $(am__v_lt_@AM_V@) @@ -168,9 +168,9 @@ AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) am__v_CXXLD_0 = @echo " CXXLD " $@; am__v_CXXLD_1 = -SOURCES = $(transmission_cli_SOURCES) \ - $(nodist_EXTRA_transmission_cli_SOURCES) -DIST_SOURCES = $(transmission_cli_SOURCES) +SOURCES = $(transmission_og_cli_SOURCES) \ + $(nodist_EXTRA_transmission_og_cli_SOURCES) +DIST_SOURCES = $(transmission_og_cli_SOURCES) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -452,10 +452,10 @@ AM_CFLAGS = \ @ZLIB_CFLAGS@ \ @PTHREAD_CFLAGS@ -dist_man_MANS = transmission-cli.1 -transmission_cli_SOURCES = cli.c -nodist_EXTRA_transmission_cli_SOURCES = dummy.cxx # force C++ linking -transmission_cli_LDADD = \ +dist_man_MANS = transmission-og-cli.1 +transmission_og_cli_SOURCES = cli.c +nodist_EXTRA_transmission_og_cli_SOURCES = dummy.cxx # force C++ linking +transmission_og_cli_LDADD = \ $(top_builddir)/libtransmission/libtransmission.a \ @LIBNATPMP_LIBS@ \ @LIBUPNP_LIBS@ \ @@ -553,9 +553,9 @@ clean-binPROGRAMS: echo " rm -f" $$list; \ rm -f $$list -transmission-cli$(EXEEXT): $(transmission_cli_OBJECTS) $(transmission_cli_DEPENDENCIES) $(EXTRA_transmission_cli_DEPENDENCIES) - @rm -f transmission-cli$(EXEEXT) - $(AM_V_CXXLD)$(CXXLINK) $(transmission_cli_OBJECTS) $(transmission_cli_LDADD) $(LIBS) +transmission-og-cli$(EXEEXT): $(transmission_og_cli_OBJECTS) $(transmission_og_cli_DEPENDENCIES) $(EXTRA_transmission_og_cli_DEPENDENCIES) + @rm -f transmission-og-cli$(EXEEXT) + $(AM_V_CXXLD)$(CXXLINK) $(transmission_og_cli_OBJECTS) $(transmission_og_cli_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) diff --git a/cli/cli.c b/cli/cli.c index d53aa98e73b..683e25ac300 100644 --- a/cli/cli.c +++ b/cli/cli.c @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) Transmission authors and contributors + * Copyright (c) Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/cli/transmission-cli.1 b/cli/transmission-og-cli.1 similarity index 89% rename from cli/transmission-cli.1 rename to cli/transmission-og-cli.1 index 498e6a004aa..bade1ecb69f 100644 --- a/cli/transmission-cli.1 +++ b/cli/transmission-og-cli.1 @@ -14,13 +14,13 @@ .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" .Dd July 21, 2008 -.Dt TRANSMISSION-CLI 1 +.Dt TRANSMISSION-OG-CLI 1 .Os .Sh NAME -.Nm transmission-cli +.Nm transmission-og-cli .Nd a bittorrent client .Sh SYNOPSIS -.Nm transmission-cli +.Nm transmission-og-cli .Bk -words .Fl h .Nm @@ -47,7 +47,7 @@ scripting capabilities. The options are as follows: .Bl -tag -width Ds .It Fl b Fl -blocklist -Enable peer blocklists. Transmission understands the bluetack blocklist file format. +Enable peer blocklists. Transmission OG understands the bluetack blocklist file format. New blocklists can be added by copying them into the config-dir's "blocklists" subdirectory. .It Fl B Fl -no-blocklist Disable blocklists. @@ -126,12 +126,12 @@ program was written by and .An Mike Gelfand . .Sh SEE ALSO -.Xr transmission-create 1 , -.Xr transmission-daemon 1 , -.Xr transmission-edit 1 , -.Xr transmission-gtk 1 , -.Xr transmission-qt 1 , -.Xr transmission-remote 1 , -.Xr transmission-show 1 +.Xr transmission-og-create 1 , +.Xr transmission-og-daemon 1 , +.Xr transmission-og-edit 1 , +.Xr transmission-og-gtk 1 , +.Xr transmission-og-qt 1 , +.Xr transmission-og-remote 1 , +.Xr transmission-og-show 1 .Pp -https://transmissionbt.com/ +https://github.com/stefantalpalaru/transmission-og diff --git a/cmake/Transmission.rc.in b/cmake/Transmission.rc.in index 5127894bd0f..514287ec165 100644 --- a/cmake/Transmission.rc.in +++ b/cmake/Transmission.rc.in @@ -28,13 +28,13 @@ BEGIN BEGIN BLOCK "040904b0" BEGIN - VALUE "CompanyName", "Transmission Project" + VALUE "CompanyName", "Transmission OG Project" VALUE "FileDescription", "${TR_FILE_DESCRIPTION}" VALUE "FileVersion", LONG_VERSION_STRING VALUE "InternalName", "${TR_INTERNAL_NAME}" - VALUE "LegalCopyright", "2005-2020 Transmission Project" + VALUE "LegalCopyright", "2005-2023 Transmission OG Project" VALUE "OriginalFilename", "${TR_ORIGINAL_FILENAME}" - VALUE "ProductName", "Transmission" + VALUE "ProductName", "Transmission OG" VALUE "ProductVersion", LONG_VERSION_STRING END END diff --git a/config.guess b/config.guess index 980b0208381..69188da73d7 100755 --- a/config.guess +++ b/config.guess @@ -1,10 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2022 Free Software Foundation, Inc. +# Copyright 1992-2023 Free Software Foundation, Inc. # shellcheck disable=SC2006,SC2268 # see below for rationale -timestamp='2022-09-17' +timestamp='2023-01-01' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -60,7 +60,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2022 Free Software Foundation, Inc. +Copyright 1992-2023 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." diff --git a/config.sub b/config.sub index baf1512b3c0..de4259e4047 100755 --- a/config.sub +++ b/config.sub @@ -1,10 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2022 Free Software Foundation, Inc. +# Copyright 1992-2023 Free Software Foundation, Inc. # shellcheck disable=SC2006,SC2268 # see below for rationale -timestamp='2022-09-17' +timestamp='2023-01-21' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -76,7 +76,7 @@ Report bugs and patches to ." version="\ GNU config.sub ($timestamp) -Copyright 1992-2022 Free Software Foundation, Inc. +Copyright 1992-2023 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -1075,7 +1075,7 @@ case $cpu-$vendor in pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) cpu=i586 ;; - pentiumpro-* | p6-* | 6x86-* | athlon-* | athalon_*-*) + pentiumpro-* | p6-* | 6x86-* | athlon-* | athlon_*-*) cpu=i686 ;; pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) diff --git a/configure b/configure index ee8524930b2..a13f98301a4 100755 --- a/configure +++ b/configure @@ -1,8 +1,8 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for transmission 3.01+. +# Generated by GNU Autoconf 2.71 for transmission-og 3.01+. # -# Report bugs to . +# Report bugs to . # # # Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation, @@ -276,10 +276,11 @@ then : printf "%s\n" "$0: be upgraded to zsh 4.3.4 or later." else printf "%s\n" "$0: Please tell bug-autoconf@gnu.org and -$0: https://github.com/transmission/transmission about your -$0: system, including any error possibly output before this -$0: message. Then install a modern shell, or manually run -$0: the script under such a shell if you do have one." +$0: https://github.com/stefantalpalaru/transmission-og +$0: about your system, including any error possibly output +$0: before this message. Then install a modern shell, or +$0: manually run the script under such a shell if you do +$0: have one." fi exit 1 fi @@ -619,11 +620,11 @@ MFLAGS= MAKEFLAGS= # Identity of this package. -PACKAGE_NAME='transmission' -PACKAGE_TARNAME='transmission' +PACKAGE_NAME='transmission-og' +PACKAGE_TARNAME='transmission-og' PACKAGE_VERSION='3.01+' -PACKAGE_STRING='transmission 3.01+' -PACKAGE_BUGREPORT='https://github.com/transmission/transmission' +PACKAGE_STRING='transmission-og 3.01+' +PACKAGE_BUGREPORT='https://github.com/stefantalpalaru/transmission-og' PACKAGE_URL='' ac_unique_file="libtransmission/transmission.h" @@ -1557,7 +1558,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 3.01+ to adapt to many kinds of systems. +\`configure' configures transmission-og 3.01+ to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1606,7 +1607,7 @@ Fine tuning of the installation directories: --infodir=DIR info documentation [DATAROOTDIR/info] --localedir=DIR locale-dependent data [DATAROOTDIR/locale] --mandir=DIR man documentation [DATAROOTDIR/man] - --docdir=DIR documentation root [DATAROOTDIR/doc/transmission] + --docdir=DIR documentation root [DATAROOTDIR/doc/transmission-og] --htmldir=DIR html documentation [DOCDIR] --dvidir=DIR dvi documentation [DOCDIR] --pdfdir=DIR pdf documentation [DOCDIR] @@ -1628,7 +1629,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of transmission 3.01+:";; + short | recursive ) echo "Configuration of transmission-og 3.01+:";; esac cat <<\_ACEOF @@ -1740,7 +1741,7 @@ Some influential environment variables: Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. -Report bugs to . +Report bugs to . _ACEOF ac_status=$? fi @@ -1804,7 +1805,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -transmission configure 3.01+ +transmission-og configure 3.01+ generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -2236,7 +2237,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 3.01+, which was +It was created by transmission-og $as_me 3.01+, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -3729,7 +3730,7 @@ fi # Define the identity of the package. - PACKAGE='transmission' + PACKAGE='transmission-og' VERSION='3.01+' @@ -25557,7 +25558,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 3.01+, which was +This file was extended by transmission-og $as_me 3.01+, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -25608,7 +25609,7 @@ $config_files Configuration commands: $config_commands -Report bugs to ." +Report bugs to ." _ACEOF ac_cs_config=`printf "%s\n" "$ac_configure_args" | sed "$ac_safe_unquote"` @@ -25616,7 +25617,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -transmission config.status 3.01+ +transmission-og config.status 3.01+ configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 169894f6a8c..9dda263c720 100644 --- a/configure.ac +++ b/configure.ac @@ -6,7 +6,7 @@ dnl these should be the only two lines you need to change m4_define([user_agent_prefix],[3.01+]) m4_define([peer_id_prefix],[-TR301Z-]) -AC_INIT([transmission],[user_agent_prefix],[https://github.com/transmission/transmission]) +AC_INIT([transmission-og],[user_agent_prefix],[https://github.com/stefantalpalaru/transmission-og]) AC_SUBST(USERAGENT_PREFIX,[user_agent_prefix]) AC_SUBST(PEERID_PREFIX,[peer_id_prefix]) diff --git a/daemon/CMakeLists.txt b/daemon/CMakeLists.txt index 3b34ed116a0..5b1801d46f1 100644 --- a/daemon/CMakeLists.txt +++ b/daemon/CMakeLists.txt @@ -27,7 +27,7 @@ set(${PROJECT_NAME}_HEADERS ) tr_win32_app_info(${PROJECT_NAME}_WIN32_RC_FILE - "Transmission Daemon" + "Transmission OG Daemon" "${TR_NAME}-daemon" "${TR_NAME}-daemon.exe") diff --git a/daemon/Makefile.am b/daemon/Makefile.am index fb7ac5e480f..1a590d33f5e 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -8,13 +8,13 @@ AM_CFLAGS = \ @PTHREAD_CFLAGS@ EXTRA_DIST = \ - transmission-daemon.service + transmission-og-daemon.service dist_man_MANS = \ - transmission-daemon.1 + transmission-og-daemon.1 bin_PROGRAMS = \ - transmission-daemon + transmission-og-daemon LDADD = \ $(top_builddir)/libtransmission/libtransmission.a \ @@ -34,11 +34,11 @@ LDADD = \ noinst_HEADERS = daemon.h -transmission_daemon_SOURCES = daemon.c -nodist_EXTRA_transmission_daemon_SOURCES = dummy.cxx # force C++ linking +transmission_og_daemon_SOURCES = daemon.c +nodist_EXTRA_transmission_og_daemon_SOURCES = dummy.cxx # force C++ linking if WIN32 -transmission_daemon_SOURCES += daemon-win32.c +transmission_og_daemon_SOURCES += daemon-win32.c else -transmission_daemon_SOURCES += daemon-posix.c +transmission_og_daemon_SOURCES += daemon-posix.c endif diff --git a/daemon/Makefile.in b/daemon/Makefile.in index 390cfbd1132..8cfd311b478 100644 --- a/daemon/Makefile.in +++ b/daemon/Makefile.in @@ -89,7 +89,7 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -bin_PROGRAMS = transmission-daemon$(EXEEXT) +bin_PROGRAMS = transmission-og-daemon$(EXEEXT) @WIN32_TRUE@am__append_1 = daemon-win32.c @WIN32_FALSE@am__append_2 = daemon-posix.c subdir = daemon @@ -109,16 +109,16 @@ CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" PROGRAMS = $(bin_PROGRAMS) -am__transmission_daemon_SOURCES_DIST = daemon.c daemon-win32.c \ +am__transmission_og_daemon_SOURCES_DIST = daemon.c daemon-win32.c \ daemon-posix.c @WIN32_TRUE@am__objects_1 = daemon-win32.$(OBJEXT) @WIN32_FALSE@am__objects_2 = daemon-posix.$(OBJEXT) -am_transmission_daemon_OBJECTS = daemon.$(OBJEXT) $(am__objects_1) \ +am_transmission_og_daemon_OBJECTS = daemon.$(OBJEXT) $(am__objects_1) \ $(am__objects_2) -transmission_daemon_OBJECTS = $(am_transmission_daemon_OBJECTS) -transmission_daemon_LDADD = $(LDADD) +transmission_og_daemon_OBJECTS = $(am_transmission_og_daemon_OBJECTS) +transmission_og_daemon_LDADD = $(LDADD) am__DEPENDENCIES_1 = -transmission_daemon_DEPENDENCIES = \ +transmission_og_daemon_DEPENDENCIES = \ $(top_builddir)/libtransmission/libtransmission.a \ $(am__DEPENDENCIES_1) AM_V_lt = $(am__v_lt_@AM_V@) @@ -180,9 +180,9 @@ AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) am__v_CXXLD_0 = @echo " CXXLD " $@; am__v_CXXLD_1 = -SOURCES = $(transmission_daemon_SOURCES) \ - $(nodist_EXTRA_transmission_daemon_SOURCES) -DIST_SOURCES = $(am__transmission_daemon_SOURCES_DIST) +SOURCES = $(transmission_og_daemon_SOURCES) \ + $(nodist_EXTRA_transmission_og_daemon_SOURCES) +DIST_SOURCES = $(am__transmission_og_daemon_SOURCES_DIST) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -467,10 +467,10 @@ AM_CFLAGS = \ @PTHREAD_CFLAGS@ EXTRA_DIST = \ - transmission-daemon.service + transmission-og-daemon.service dist_man_MANS = \ - transmission-daemon.1 + transmission-og-daemon.1 LDADD = \ $(top_builddir)/libtransmission/libtransmission.a \ @@ -489,8 +489,9 @@ LDADD = \ ${LIBM} noinst_HEADERS = daemon.h -transmission_daemon_SOURCES = daemon.c $(am__append_1) $(am__append_2) -nodist_EXTRA_transmission_daemon_SOURCES = dummy.cxx # force C++ linking +transmission_og_daemon_SOURCES = daemon.c $(am__append_1) \ + $(am__append_2) +nodist_EXTRA_transmission_og_daemon_SOURCES = dummy.cxx # force C++ linking all: all-am .SUFFIXES: @@ -574,9 +575,9 @@ clean-binPROGRAMS: echo " rm -f" $$list; \ rm -f $$list -transmission-daemon$(EXEEXT): $(transmission_daemon_OBJECTS) $(transmission_daemon_DEPENDENCIES) $(EXTRA_transmission_daemon_DEPENDENCIES) - @rm -f transmission-daemon$(EXEEXT) - $(AM_V_CXXLD)$(CXXLINK) $(transmission_daemon_OBJECTS) $(transmission_daemon_LDADD) $(LIBS) +transmission-og-daemon$(EXEEXT): $(transmission_og_daemon_OBJECTS) $(transmission_og_daemon_DEPENDENCIES) $(EXTRA_transmission_og_daemon_DEPENDENCIES) + @rm -f transmission-og-daemon$(EXEEXT) + $(AM_V_CXXLD)$(CXXLINK) $(transmission_og_daemon_OBJECTS) $(transmission_og_daemon_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) diff --git a/daemon/daemon-win32.c b/daemon/daemon-win32.c index e48f7440ccd..f1c26914cb5 100644 --- a/daemon/daemon-win32.c +++ b/daemon/daemon-win32.c @@ -31,7 +31,7 @@ static dtr_callbacks const* callbacks = NULL; static void* callback_arg = NULL; -static LPCWSTR const service_name = L"TransmissionDaemon"; +static LPCWSTR const service_name = L"TransmissionOGDaemon"; static SERVICE_STATUS_HANDLE status_handle = NULL; static DWORD current_state = SERVICE_STOPPED; diff --git a/daemon/daemon.c b/daemon/daemon.c index 56f4b3d6da4..0547c33cd95 100644 --- a/daemon/daemon.c +++ b/daemon/daemon.c @@ -86,10 +86,10 @@ static struct event_base* ev_base = NULL; static char const* getUsage(void) { - return "Transmission " LONG_VERSION_STRING " https://transmissionbt.com/\n" + return "Transmission OG " LONG_VERSION_STRING " https://github.com/stefantalpalaru/transmission-og\n" "A fast and easy BitTorrent client\n" "\n" - MY_NAME " is a headless Transmission session\n" + MY_NAME " is a headless Transmission OG session\n" "that can be controlled via transmission-remote\n" "or the web interface.\n" "\n" diff --git a/daemon/my-valgrind.sh b/daemon/my-valgrind.sh index 52c27f4aa79..43d94b36075 100755 --- a/daemon/my-valgrind.sh +++ b/daemon/my-valgrind.sh @@ -2,5 +2,5 @@ export G_SLICE=always-malloc export G_DEBUG=gc-friendly export GLIBCXX_FORCE_NEW=1 -#valgrind --tool=memcheck --leak-check=full --leak-resolution=high --num-callers=64 --log-file=x-valgrind --show-reachable=yes ./transmission-daemon -f -valgrind --tool=cachegrind ./transmission-daemon -f -g /home/charles/.config/transmission +#valgrind --tool=memcheck --leak-check=full --leak-resolution=high --num-callers=64 --log-file=x-valgrind --show-reachable=yes ./transmission-og-daemon -f +valgrind --tool=cachegrind ./transmission-og-daemon -f -g /home/charles/.config/transmission diff --git a/daemon/transmission-daemon.1 b/daemon/transmission-og-daemon.1 similarity index 87% rename from daemon/transmission-daemon.1 rename to daemon/transmission-og-daemon.1 index 0ae602da359..6d8cee87c79 100644 --- a/daemon/transmission-daemon.1 +++ b/daemon/transmission-og-daemon.1 @@ -1,11 +1,11 @@ .Dd July 21, 2008 -.Dt TRANSMISSION-DAEMON 1 +.Dt TRANSMISSION-OG-DAEMON 1 .Sh NAME -.Nm transmission-daemon +.Nm transmission-og-daemon .Nd a bittorrent client .Sh SYNOPSIS .Bk -words -.Nm transmission-daemon +.Nm transmission-og-daemon .Fl h .Nm .Op Fl a Ar x.x.x.x,... @@ -33,9 +33,9 @@ .Ek .Sh DESCRIPTION .Nm -is a daemon-based Transmission session that can be controlled +is a daemon-based Transmission OG session that can be controlled via RPC commands from transmission's web interface or -.Xr transmission-remote 1 . +.Xr transmission-og-remote 1 . .Sh OPTIONS .Bl -tag -width Ds .It Fl a Fl -allowed Ar x.x.x.x,... @@ -44,17 +44,17 @@ Wildcards can be specified in an address by using '*'. Default: "127.0.0.1,::1" Example: "127.0.0.*,192.168.1.*" .It Fl b Fl -blocklist -Enable peer blocklists. Transmission understands the bluetack blocklist file format. +Enable peer blocklists. Transmission OG understands the bluetack blocklist file format. New blocklists can be added by copying them into the config-dir's "blocklists" subdirectory. .It Fl c Ar directory Directory to watch for new .torrent files to be added. As they are added to this directory, -the daemon will load them into Transmission. +the daemon will load them into Transmission OG. .It Fl C Do not watch for new .torrent files. .It Fl B Fl -no-blocklist Disble blocklists. .It Fl d -Dump transmission-daemon's settings to stderr. +Dump transmission-og-daemon's settings to stderr. .It Fl f Fl -foreground Run in the foreground and print errors to stderr. .It Fl g Fl -config-dir Ar directory @@ -142,7 +142,7 @@ Sets the default config-dir. .El .Sh FILES .Bl -tag -width Ds -compact -.It ~/.config/transmission-daemon +.It ~/.config/transmission-og-daemon The config-dir used when neither .Op Ev TRANSMISSION_HOME nor @@ -159,12 +159,12 @@ See https://github.com/transmission/transmission/wiki/Configuration-Files for mo and .An Mike Gelfand . .Sh SEE ALSO -.Xr transmission-create 1 , -.Xr transmission-daemon 1 , -.Xr transmission-edit 1 , -.Xr transmission-gtk 1 , -.Xr transmission-qt 1 , -.Xr transmission-remote 1 , -.Xr transmission-show 1 +.Xr transmission-og-create 1 , +.Xr transmission-og-daemon 1 , +.Xr transmission-og-edit 1 , +.Xr transmission-og-gtk 1 , +.Xr transmission-og-qt 1 , +.Xr transmission-og-remote 1 , +.Xr transmission-og-show 1 .Pp -https://transmissionbt.com/ +https://github.com/stefantalpalaru/transmission-og diff --git a/daemon/transmission-daemon.service b/daemon/transmission-og-daemon.service similarity index 61% rename from daemon/transmission-daemon.service rename to daemon/transmission-og-daemon.service index 1009f40a7e1..2831f7b161c 100644 --- a/daemon/transmission-daemon.service +++ b/daemon/transmission-og-daemon.service @@ -1,11 +1,11 @@ [Unit] -Description=Transmission BitTorrent Daemon +Description=Transmission OG BitTorrent Daemon After=network.target [Service] User=transmission Type=notify -ExecStart=/usr/bin/transmission-daemon -f --log-error +ExecStart=/usr/bin/transmission-og-daemon -f --log-error ExecReload=/bin/kill -s HUP $MAINPID NoNewPrivileges=true diff --git a/dist/msi/CMakeLists.txt b/dist/msi/CMakeLists.txt index 0badcc49b4e..aa0f9972c32 100644 --- a/dist/msi/CMakeLists.txt +++ b/dist/msi/CMakeLists.txt @@ -41,17 +41,17 @@ endif() set(ICONS_DIR "${CMAKE_SOURCE_DIR}/qt/icons/hicolor") png2ico(Transmission.ico - "${ICONS_DIR}/16x16/transmission-qt.png" - "${ICONS_DIR}/22x22/transmission-qt.png" - "${ICONS_DIR}/24x24/transmission-qt.png" - "${ICONS_DIR}/32x32/transmission-qt.png" - "${ICONS_DIR}/48x48/transmission-qt.png" - "${ICONS_DIR}/64x64/transmission-qt.png" - "${ICONS_DIR}/72x72/transmission-qt.png" - "${ICONS_DIR}/96x96/transmission-qt.png" - "${ICONS_DIR}/128x128/transmission-qt.png" - "${ICONS_DIR}/192x192/transmission-qt.png" - "${ICONS_DIR}/256x256/transmission-qt.png") + "${ICONS_DIR}/16x16/transmission-og-qt.png" + "${ICONS_DIR}/22x22/transmission-og-qt.png" + "${ICONS_DIR}/24x24/transmission-og-qt.png" + "${ICONS_DIR}/32x32/transmission-og-qt.png" + "${ICONS_DIR}/48x48/transmission-og-qt.png" + "${ICONS_DIR}/64x64/transmission-og-qt.png" + "${ICONS_DIR}/72x72/transmission-og-qt.png" + "${ICONS_DIR}/96x96/transmission-og-qt.png" + "${ICONS_DIR}/128x128/transmission-og-qt.png" + "${ICONS_DIR}/192x192/transmission-og-qt.png" + "${ICONS_DIR}/256x256/transmission-og-qt.png") set(WEBSRCDIR "${CMAKE_INSTALL_PREFIX}/share/transmission/web") set(TRQMSRCDIR "${CMAKE_INSTALL_PREFIX}/share/transmission/translations") @@ -94,7 +94,7 @@ wix_candle(${PROJECT_NAME}_OBJS wix_light(${PROJECT_NAME}_OUTPUT NAME - transmission-${MSI_FILENAME_VERSION}-${ARCH} + transmission-og-${MSI_FILENAME_VERSION}-${ARCH} OBJECTS ${${PROJECT_NAME}_OBJS} EXTENSIONS diff --git a/dist/msi/Transmission.wxs b/dist/msi/Transmission.wxs index 33c92b63d9e..354e6fe6547 100644 --- a/dist/msi/Transmission.wxs +++ b/dist/msi/Transmission.wxs @@ -4,17 +4,17 @@ - + - + - - + + @@ -22,10 +22,10 @@ - - + + - + NOT TRQTWINSTALLDIR @@ -39,12 +39,12 @@ - + - + @@ -52,7 +52,7 @@ - + @@ -81,8 +81,8 @@ - - + + diff --git a/extras/rpc-spec.txt b/extras/rpc-spec.txt index 222021e7cad..03723eab35b 100644 --- a/extras/rpc-spec.txt +++ b/extras/rpc-spec.txt @@ -817,9 +817,9 @@ These features will be removed three months after 2.80's release: 1. session-get's 'download-dir-free-space' argument will be removed. - Its functionality has been superceded by the 'free-space' method. + Its functionality has been superseded by the 'free-space' method. 2. HTTP POSTs to http://server:port/transmission/upload will fail. This was an undocumented hack to allow web clients to add files without - client-side access to the file. This functionality is superceded by + client-side access to the file. This functionality is superseded by using HTML5's FileReader object + the documented 'torrent-add' method. diff --git a/extras/send-email-when-torrent-done.sh b/extras/send-email-when-torrent-done.sh index 79d6d8fa2f6..dabe3f1d194 100755 --- a/extras/send-email-when-torrent-done.sh +++ b/extras/send-email-when-torrent-done.sh @@ -48,6 +48,6 @@ SMTP_SERVER=your.smtp.server SUBJECT="Torrent Done!" FROM_ADDR="transmission@localhost.localdomain" TMPFILE=$(mktemp -t transmission.XXXXXXXXXX) -echo "Transmission finished downloading \"$TR_TORRENT_NAME\" on $TR_TIME_LOCALTIME" > "$TMPFILE" +echo "Transmission OG finished downloading \"$TR_TORRENT_NAME\" on $TR_TIME_LOCALTIME" > "$TMPFILE" $NAIL -v -S from="$FROM_ADDR" -S smtp -s "$SUBJECT" -S smtp=$SMTP_SERVER "$TO_ADDR" < "$TMPFILE" rm "$TMPFILE" diff --git a/gtk/CMakeLists.txt b/gtk/CMakeLists.txt index 73c36dd705a..bef89a4d98d 100644 --- a/gtk/CMakeLists.txt +++ b/gtk/CMakeLists.txt @@ -35,7 +35,7 @@ add_custom_command( --c-name transmission transmission.gresource.xml DEPENDS - icons/hicolor_apps_scalable_transmission.svg + icons/hicolor_apps_scalable_transmission-og.svg icons/lock.png icons/ratio.png icons/turtle-blue.png @@ -51,16 +51,16 @@ if(ENABLE_NLS) set(${PROJECT_NAME}_DESKTOP_FILE "${PROJECT_BINARY_DIR}/${TR_NAME}-gtk.desktop") add_custom_command( OUTPUT ${${PROJECT_NAME}_DESKTOP_FILE} - COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} --desktop -d ${CMAKE_SOURCE_DIR}/po --template ${PROJECT_SOURCE_DIR}/transmission-gtk.desktop.in -o ${${PROJECT_NAME}_DESKTOP_FILE} - DEPENDS ${PROJECT_SOURCE_DIR}/transmission-gtk.desktop.in + COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} --desktop -d ${CMAKE_SOURCE_DIR}/po --template ${PROJECT_SOURCE_DIR}/transmission-og-gtk.desktop.in -o ${${PROJECT_NAME}_DESKTOP_FILE} + DEPENDS ${PROJECT_SOURCE_DIR}/transmission-og-gtk.desktop.in VERBATIM ) set(${PROJECT_NAME}_APPDATA_FILE "${PROJECT_BINARY_DIR}/${TR_NAME}-gtk.appdata.xml") add_custom_command( OUTPUT ${${PROJECT_NAME}_APPDATA_FILE} - COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} --xml -d ${CMAKE_SOURCE_DIR}/po --template ${PROJECT_SOURCE_DIR}/transmission-gtk.appdata.xml.in -o ${${PROJECT_NAME}_APPDATA_FILE} - DEPENDS ${PROJECT_SOURCE_DIR}/transmission-gtk.appdata.xml.in + COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} --xml -d ${CMAKE_SOURCE_DIR}/po --template ${PROJECT_SOURCE_DIR}/transmission-og-gtk.appdata.xml.in -o ${${PROJECT_NAME}_APPDATA_FILE} + DEPENDS ${PROJECT_SOURCE_DIR}/transmission-og-gtk.appdata.xml.in VERBATIM ) endif() @@ -145,7 +145,7 @@ add_definitions( ) tr_win32_app_info(${PROJECT_NAME}_WIN32_RC_FILE - "Transmission GTK+ Client" + "Transmission OG GTK+ Client" "${TR_NAME}-gtk" "${TR_NAME}-gtk.exe" "gtk/${TR_NAME}.ico") @@ -173,9 +173,9 @@ endif() install(TARGETS ${TR_NAME}-gtk DESTINATION ${CMAKE_INSTALL_BINDIR}) set(${PROJECT_NAME}_PUBLIC_ICONS - hicolor_apps_scalable_transmission.svg - hicolor_apps_scalable_transmission-devel.svg - hicolor_apps_symbolic_transmission-symbolic.svg + hicolor_apps_scalable_transmission-og.svg + hicolor_apps_scalable_transmission-og-devel.svg + hicolor_apps_symbolic_transmission-og-symbolic.svg ) set(ICON_NAME_REGEX "^([^_]+)_([^_]+)_([^_]+)_(.+)$") @@ -191,7 +191,7 @@ endif() if(ENABLE_NLS) install(FILES ${${PROJECT_NAME}_DESKTOP_FILE} DESTINATION ${CMAKE_INSTALL_DATADIR}/applications) - install(FILES ${${PROJECT_NAME}_APPDATA_FILE} DESTINATION ${CMAKE_INSTALL_DATADIR}/appdata) + install(FILES ${${PROJECT_NAME}_APPDATA_FILE} DESTINATION ${CMAKE_INSTALL_DATADIR}/metainfo) else() - install(FILES transmission-gtk.desktop.in DESTINATION ${CMAKE_INSTALL_DATADIR}/applications RENAME ${TR_NAME}-gtk.desktop) + install(FILES transmission-og-gtk.desktop.in DESTINATION ${CMAKE_INSTALL_DATADIR}/applications RENAME ${TR_NAME}-gtk.desktop) endif() diff --git a/gtk/Makefile.am b/gtk/Makefile.am index beb0f0c4198..5c8e41fcf79 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -48,9 +48,9 @@ noinst_HEADERS = \ tr-window.h \ util.h -bin_PROGRAMS = transmission-gtk +bin_PROGRAMS = transmission-og-gtk -transmission_gtk_SOURCES = \ +transmission_og_gtk_SOURCES = \ actions.c \ conf.c \ details.c \ @@ -75,11 +75,11 @@ transmission_gtk_SOURCES = \ tr-window.c \ util.c -nodist_EXTRA_transmission_gtk_SOURCES = dummy.cxx # force C++ linking +nodist_EXTRA_transmission_og_gtk_SOURCES = dummy.cxx # force C++ linking -dist_man_MANS = transmission-gtk.1 +dist_man_MANS = transmission-og-gtk.1 -transmission_gtk_LDADD = \ +transmission_og_gtk_LDADD = \ $(top_builddir)/libtransmission/libtransmission.a \ @LIBUPNP_LIBS@ \ @LIBNATPMP_LIBS@ \ @@ -95,7 +95,7 @@ transmission_gtk_LDADD = \ @PTHREAD_LIBS@ \ ${LIBM} -DESKTOP_IN_FILES=transmission-gtk.desktop.in +DESKTOP_IN_FILES=transmission-og-gtk.desktop.in DESKTOP_FILES=$(DESKTOP_IN_FILES:.desktop.in=.desktop) MAINTAINERCLEANFILES = $(DESKTOP_FILES) # "mingw32-make" cannot deal with an absolute UNIX path in a rule dependency @@ -107,15 +107,15 @@ MAINTAINERCLEANFILES = $(DESKTOP_FILES) Productivitydir = $(datadir)/applications Productivity_DATA = $(DESKTOP_FILES) -APPDATA_IN_FILES=transmission-gtk.appdata.xml.in +APPDATA_IN_FILES=transmission-og-gtk.appdata.xml.in APPDATA_FILES=$(APPDATA_IN_FILES:.xml.in=.xml) #INTLTOOL_XML_RULE %.xml: %.xml.in $(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 $< $@ -appdatadir = $(datadir)/appdata +appdatadir = $(datadir)/metainfo appdata_DATA = $(APPDATA_FILES) -icon_DATA = transmission.png +icon_DATA = transmission-og.png icondir = $(datadir)/pixmaps UI_FILES = transmission-ui.xml @@ -153,7 +153,7 @@ transmission.res: transmission.rc BUILT_SOURCES += transmission.res CLEANFILES += transmission.res -transmission_gtk_LDADD += transmission.res -transmission_gtk_LDFLAGS = -mwindows +transmission_og_gtk_LDADD += transmission.res +transmission_og_gtk_LDFLAGS = -mwindows endif diff --git a/gtk/Makefile.in b/gtk/Makefile.in index 1a9704d6ec5..6322d6af760 100644 --- a/gtk/Makefile.in +++ b/gtk/Makefile.in @@ -90,7 +90,7 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -bin_PROGRAMS = transmission-gtk$(EXEEXT) +bin_PROGRAMS = transmission-og-gtk$(EXEEXT) @WIN32_TRUE@am__append_1 = transmission.res @WIN32_TRUE@am__append_2 = transmission.res @WIN32_TRUE@am__append_3 = transmission.res @@ -113,7 +113,7 @@ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \ "$(DESTDIR)$(Productivitydir)" "$(DESTDIR)$(appdatadir)" \ "$(DESTDIR)$(icondir)" PROGRAMS = $(bin_PROGRAMS) -am_transmission_gtk_OBJECTS = actions.$(OBJEXT) conf.$(OBJEXT) \ +am_transmission_og_gtk_OBJECTS = actions.$(OBJEXT) conf.$(OBJEXT) \ details.$(OBJEXT) dialogs.$(OBJEXT) favicon.$(OBJEXT) \ file-list.$(OBJEXT) filter.$(OBJEXT) hig.$(OBJEXT) \ icons.$(OBJEXT) main.$(OBJEXT) makemeta-ui.$(OBJEXT) \ @@ -123,18 +123,18 @@ am_transmission_gtk_OBJECTS = actions.$(OBJEXT) conf.$(OBJEXT) \ transmission-resources.$(OBJEXT) tr-core.$(OBJEXT) \ tr-icon.$(OBJEXT) tr-prefs.$(OBJEXT) tr-window.$(OBJEXT) \ util.$(OBJEXT) -transmission_gtk_OBJECTS = $(am_transmission_gtk_OBJECTS) +transmission_og_gtk_OBJECTS = $(am_transmission_og_gtk_OBJECTS) am__DEPENDENCIES_1 = -transmission_gtk_DEPENDENCIES = \ +transmission_og_gtk_DEPENDENCIES = \ $(top_builddir)/libtransmission/libtransmission.a \ $(am__DEPENDENCIES_1) $(am__append_3) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent am__v_lt_1 = -transmission_gtk_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ +transmission_og_gtk_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ - $(AM_CXXFLAGS) $(CXXFLAGS) $(transmission_gtk_LDFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) $(transmission_og_gtk_LDFLAGS) \ $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) @@ -200,9 +200,9 @@ AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) am__v_CXXLD_0 = @echo " CXXLD " $@; am__v_CXXLD_1 = -SOURCES = $(transmission_gtk_SOURCES) \ - $(nodist_EXTRA_transmission_gtk_SOURCES) -DIST_SOURCES = $(transmission_gtk_SOURCES) +SOURCES = $(transmission_og_gtk_SOURCES) \ + $(nodist_EXTRA_transmission_og_gtk_SOURCES) +DIST_SOURCES = $(transmission_og_gtk_SOURCES) RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ ctags-recursive dvi-recursive html-recursive info-recursive \ install-data-recursive install-dvi-recursive \ @@ -570,7 +570,7 @@ noinst_HEADERS = \ tr-window.h \ util.h -transmission_gtk_SOURCES = \ +transmission_og_gtk_SOURCES = \ actions.c \ conf.c \ details.c \ @@ -595,24 +595,24 @@ transmission_gtk_SOURCES = \ tr-window.c \ util.c -nodist_EXTRA_transmission_gtk_SOURCES = dummy.cxx # force C++ linking -dist_man_MANS = transmission-gtk.1 -transmission_gtk_LDADD = \ +nodist_EXTRA_transmission_og_gtk_SOURCES = dummy.cxx # force C++ linking +dist_man_MANS = transmission-og-gtk.1 +transmission_og_gtk_LDADD = \ $(top_builddir)/libtransmission/libtransmission.a \ @LIBUPNP_LIBS@ @LIBNATPMP_LIBS@ @DHT_LIBS@ @LIBB64_LIBS@ \ @LIBUTP_LIBS@ @GTK_LIBS@ @LIBAPPINDICATOR_LIBS@ \ @LIBEVENT_LIBS@ @LIBCURL_LIBS@ @CRYPTO_LIBS@ @ZLIB_LIBS@ \ @PTHREAD_LIBS@ ${LIBM} $(am__append_3) -DESKTOP_IN_FILES = transmission-gtk.desktop.in +DESKTOP_IN_FILES = transmission-og-gtk.desktop.in DESKTOP_FILES = $(DESKTOP_IN_FILES:.desktop.in=.desktop) MAINTAINERCLEANFILES = $(DESKTOP_FILES) Productivitydir = $(datadir)/applications Productivity_DATA = $(DESKTOP_FILES) -APPDATA_IN_FILES = transmission-gtk.appdata.xml.in +APPDATA_IN_FILES = transmission-og-gtk.appdata.xml.in APPDATA_FILES = $(APPDATA_IN_FILES:.xml.in=.xml) -appdatadir = $(datadir)/appdata +appdatadir = $(datadir)/metainfo appdata_DATA = $(APPDATA_FILES) -icon_DATA = transmission.png +icon_DATA = transmission-og.png icondir = $(datadir)/pixmaps UI_FILES = transmission-ui.xml EXTRA_DIST = \ @@ -626,7 +626,7 @@ DISTCLEANFILES = \ $(DESKTOP_FILES) \ $(APPDATA_FILES) -@WIN32_TRUE@transmission_gtk_LDFLAGS = -mwindows +@WIN32_TRUE@transmission_og_gtk_LDFLAGS = -mwindows all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -711,9 +711,9 @@ clean-binPROGRAMS: echo " rm -f" $$list; \ rm -f $$list -transmission-gtk$(EXEEXT): $(transmission_gtk_OBJECTS) $(transmission_gtk_DEPENDENCIES) $(EXTRA_transmission_gtk_DEPENDENCIES) - @rm -f transmission-gtk$(EXEEXT) - $(AM_V_CXXLD)$(transmission_gtk_LINK) $(transmission_gtk_OBJECTS) $(transmission_gtk_LDADD) $(LIBS) +transmission-og-gtk$(EXEEXT): $(transmission_og_gtk_OBJECTS) $(transmission_og_gtk_DEPENDENCIES) $(EXTRA_transmission_og_gtk_DEPENDENCIES) + @rm -f transmission-og-gtk$(EXEEXT) + $(AM_V_CXXLD)$(transmission_og_gtk_LINK) $(transmission_og_gtk_OBJECTS) $(transmission_og_gtk_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) diff --git a/gtk/actions.c b/gtk/actions.c index 91592bef74a..06506b976f0 100644 --- a/gtk/actions.c +++ b/gtk/actions.c @@ -50,7 +50,7 @@ static void sort_changed_cb(GtkAction* action UNUSED, GtkRadioAction* current, g static GtkToggleActionEntry show_toggle_entries[] = { - { "toggle-main-window", NULL, N_("_Show Transmission"), NULL, NULL, G_CALLBACK(action_cb), TRUE }, + { "toggle-main-window", NULL, N_("_Show Transmission OG"), NULL, NULL, G_CALLBACK(action_cb), TRUE }, { "toggle-message-log", NULL, N_("Message _Log"), NULL, NULL, G_CALLBACK(action_cb), FALSE } }; @@ -89,7 +89,6 @@ static GtkActionEntry entries[] = { "torrent-start-now", GTK_STOCK_MEDIA_PLAY, N_("Start _Now"), "S", N_("Start torrent now"), G_CALLBACK(action_cb) }, { "show-stats", NULL, N_("_Statistics"), NULL, NULL, G_CALLBACK(action_cb) }, - { "donate", NULL, N_("_Donate"), NULL, NULL, G_CALLBACK(action_cb) }, { "torrent-verify", NULL, N_("_Verify Local Data"), "V", NULL, G_CALLBACK(action_cb) }, { "torrent-stop", GTK_STOCK_MEDIA_PAUSE, N_("_Pause"), "P", N_("Pause torrent"), G_CALLBACK(action_cb) }, { "pause-all-torrents", GTK_STOCK_MEDIA_PAUSE, N_("_Pause All"), NULL, N_("Pause all torrents"), G_CALLBACK(action_cb) }, diff --git a/gtk/conf.c b/gtk/conf.c index 5c0ca3769ed..6bfd1ebd083 100644 --- a/gtk/conf.c +++ b/gtk/conf.c @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) Transmission authors and contributors + * Copyright (c) Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/gtk/conf.h b/gtk/conf.h index f41a78e99d4..2c08a2bcd87 100644 --- a/gtk/conf.h +++ b/gtk/conf.h @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) Transmission authors and contributors + * Copyright (c) Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/gtk/details.c b/gtk/details.c index 531f25ac82f..9e9a6523812 100644 --- a/gtk/details.c +++ b/gtk/details.c @@ -2899,7 +2899,6 @@ static gboolean periodic_refresh(gpointer data) static void on_details_window_size_allocated(GtkWidget* gtk_window, GtkAllocation* alloc UNUSED, gpointer gdata UNUSED) { - GdkWindow* gdk_window = gtk_widget_get_window(gtk_window); int w, h; gtk_window_get_size(GTK_WINDOW(gtk_window), &w, &h); gtr_pref_int_set(TR_KEY_details_window_width, w); @@ -2945,7 +2944,7 @@ GtkWidget* gtr_torrent_details_dialog_new(GtkWindow* parent, TrCore* core) gtk_window_set_role(GTK_WINDOW(d), "tr-info"); /* return saved window size */ - gtk_window_resize(d, gtr_pref_int_get(TR_KEY_details_window_width), gtr_pref_int_get(TR_KEY_details_window_height)); + gtk_window_resize(GTK_WINDOW(d), gtr_pref_int_get(TR_KEY_details_window_width), gtr_pref_int_get(TR_KEY_details_window_height)); g_signal_connect(d, "size-allocate", G_CALLBACK(on_details_window_size_allocated), NULL); g_signal_connect_swapped(d, "response", G_CALLBACK(gtk_widget_destroy), d); diff --git a/gtk/dialogs.c b/gtk/dialogs.c index 1b749b77a18..8de421296d6 100644 --- a/gtk/dialogs.c +++ b/gtk/dialogs.c @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) Transmission authors and contributors + * Copyright (c) Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/gtk/dialogs.h b/gtk/dialogs.h index 982f5bf2329..acaf4700d29 100644 --- a/gtk/dialogs.h +++ b/gtk/dialogs.h @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) Transmission authors and contributors + * Copyright (c) Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/gtk/file-list.c b/gtk/file-list.c index a58a3f366f7..266df583a86 100644 --- a/gtk/file-list.c +++ b/gtk/file-list.c @@ -593,7 +593,7 @@ void gtr_file_list_set_torrent(GtkWidget* w, int torrentId) gtk_tree_view_set_model(GTK_TREE_VIEW(data->view), data->model); /* set default sort by label */ - gtk_tree_sortable_set_sort_column_id(data->model, FC_LABEL, GTK_SORT_ASCENDING); + gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(data->model), FC_LABEL, GTK_SORT_ASCENDING); gtk_tree_view_expand_all(GTK_TREE_VIEW(data->view)); g_object_unref(data->model); diff --git a/gtk/icons/Makefile.am b/gtk/icons/Makefile.am index 398154f4325..c29760b7288 100644 --- a/gtk/icons/Makefile.am +++ b/gtk/icons/Makefile.am @@ -5,9 +5,9 @@ public_icons_themes = \ $(NULL) public_icons = \ - hicolor_apps_scalable_transmission.svg \ - hicolor_apps_scalable_transmission-devel.svg \ - hicolor_apps_symbolic_transmission-symbolic.svg \ + hicolor_apps_scalable_transmission-og.svg \ + hicolor_apps_scalable_transmission-og-devel.svg \ + hicolor_apps_symbolic_transmission-og-symbolic.svg \ $(NULL) private_icons = \ diff --git a/gtk/icons/Makefile.in b/gtk/icons/Makefile.in index e6a426cc6a4..9516adfc74c 100644 --- a/gtk/icons/Makefile.in +++ b/gtk/icons/Makefile.in @@ -350,9 +350,9 @@ public_icons_themes = \ $(NULL) public_icons = \ - hicolor_apps_scalable_transmission.svg \ - hicolor_apps_scalable_transmission-devel.svg \ - hicolor_apps_symbolic_transmission-symbolic.svg \ + hicolor_apps_scalable_transmission-og.svg \ + hicolor_apps_scalable_transmission-og-devel.svg \ + hicolor_apps_symbolic_transmission-og-symbolic.svg \ $(NULL) private_icons = \ diff --git a/gtk/icons/hicolor_apps_scalable_transmission-devel.svg b/gtk/icons/hicolor_apps_scalable_transmission-og-devel.svg similarity index 100% rename from gtk/icons/hicolor_apps_scalable_transmission-devel.svg rename to gtk/icons/hicolor_apps_scalable_transmission-og-devel.svg diff --git a/gtk/icons/hicolor_apps_scalable_transmission.svg b/gtk/icons/hicolor_apps_scalable_transmission-og.svg similarity index 100% rename from gtk/icons/hicolor_apps_scalable_transmission.svg rename to gtk/icons/hicolor_apps_scalable_transmission-og.svg diff --git a/gtk/icons/hicolor_apps_symbolic_transmission-symbolic.svg b/gtk/icons/hicolor_apps_symbolic_transmission-og-symbolic.svg similarity index 100% rename from gtk/icons/hicolor_apps_symbolic_transmission-symbolic.svg rename to gtk/icons/hicolor_apps_symbolic_transmission-og-symbolic.svg diff --git a/gtk/main.c b/gtk/main.c index 34a116319a0..832f532ebbe 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) Transmission authors and contributors + * Copyright (c) Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -55,13 +55,13 @@ #include "util.h" #define MY_CONFIG_NAME "transmission" -#define MY_READABLE_NAME "transmission-gtk" +#define MY_READABLE_NAME "transmission-og-gtk" #define SHOW_LICENSE static char const* LICENSE = - "Copyright 2005-2020. All code is copyrighted by the respective authors.\n" + "Copyright 2005-2023. All code is copyrighted by the respective authors.\n" "\n" - "Transmission can be redistributed and/or modified under the terms of the " + "Transmission OG can be redistributed and/or modified under the terms of the " "GNU GPL versions 2 or 3 or by any future license endorsed by Mnemosyne LLC.\n" "\n" "In addition, linking to and/or using OpenSSL is allowed.\n" @@ -70,7 +70,7 @@ static char const* LICENSE = "but WITHOUT ANY WARRANTY; without even the implied warranty of " "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" "\n" - "Some of Transmission's source files have more permissive licenses. " + "Some of Transmission OG's source files have more permissive licenses. " "Those files may, of course, be used on their own under their own terms.\n"; struct cbdata @@ -311,7 +311,7 @@ static void register_magnet_link_handler(void) if (error != NULL) { - g_warning(_("Error registering Transmission as a %s handler: %s"), content_type, error->message); + g_warning(_("Error registering Transmission OG as a %s handler: %s"), content_type, error->message); g_error_free(error); } @@ -563,7 +563,7 @@ static void on_activate(GApplication* app UNUSED, struct cbdata* cbdata) /* GApplication emits an 'activate' signal when bootstrapping the primary. * Ordinarily we handle that by presenting the main window, but if the user - * user started Transmission minimized, ignore that initial signal... */ + * user started Transmission OG minimized, ignore that initial signal... */ if (cbdata->is_iconified && cbdata->activation_count == 1) { return; @@ -634,7 +634,7 @@ int main(int argc, char** argv) #if !GLIB_CHECK_VERSION(2, 35, 4) g_type_init(); #endif - g_set_application_name(_("Transmission")); + g_set_application_name(_("Transmission OG")); /* parse the command line */ option_context = g_option_context_new(_("[torrent files or urls]")); @@ -675,7 +675,7 @@ int main(int argc, char** argv) /* init the application for the specified config dir */ stat(cbdata.config_dir, &sb); - application_id = g_strdup_printf("com.transmissionbt.transmission_%lu_%lu", (unsigned long)sb.st_dev, + application_id = g_strdup_printf("com.transmissionbt.transmission_og_%lu_%lu", (unsigned long)sb.st_dev, (unsigned long)sb.st_ino); app = gtk_application_new(application_id, G_APPLICATION_HANDLES_OPEN); g_signal_connect(app, "open", G_CALLBACK(on_open), &cbdata); @@ -743,7 +743,7 @@ static void app_setup(GtkWindow* wind, struct cbdata* cbdata) if (!gtr_pref_flag_get(TR_KEY_user_has_given_informed_consent)) { GtkWidget* w = gtk_message_dialog_new(GTK_WINDOW(wind), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_OTHER, - GTK_BUTTONS_NONE, "%s", _("Transmission is a file sharing program. When you run a torrent, its data will be " + GTK_BUTTONS_NONE, "%s", _("Transmission OG is a file sharing program. When you run a torrent, its data will be " "made available to others by means of upload. Any content you share is your sole responsibility.")); gtk_dialog_add_button(GTK_DIALOG(w), GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT); gtk_dialog_add_button(GTK_DIALOG(w), _("I _Agree"), GTK_RESPONSE_ACCEPT); @@ -898,7 +898,11 @@ static gboolean on_session_closed(gpointer gdata) gtk_widget_destroy(GTK_WIDGET(cbdata->wind)); } - g_object_unref(cbdata->core); + // triggers this error on exit: + // (transmission-og-gtk:16327): GLib-GObject-CRITICAL **: 02:06:12.420: instance with invalid (NULL) class pointer + // (transmission-og-gtk:16327): GLib-GObject-CRITICAL **: 02:06:12.428: g_signal_handler_disconnect: assertion 'G_TYPE_CHECK_INSTANCE (instance)' failed + // + // g_object_unref(cbdata->core); if (cbdata->icon != NULL) { @@ -1353,7 +1357,7 @@ static gboolean update_model_loop(gpointer gdata) static void show_about_dialog(GtkWindow* parent) { - char const* uri = "https://transmissionbt.com/"; + char const* uri = "https://github.com/stefantalpalaru/transmission-og"; char const* authors[] = { "Charles Kerr (Backend; GTK+)", @@ -1365,7 +1369,7 @@ static void show_about_dialog(GtkWindow* parent) gtk_show_about_dialog(parent, "authors", authors, "comments", _("A fast and easy BitTorrent client"), - "copyright", _("Copyright (c) The Transmission Project"), + "copyright", _("Copyright (c) The Transmission OG Project"), "logo-icon-name", MY_CONFIG_NAME, "name", g_get_application_name(), /* Translators: translate "translator-credits" as your name @@ -1533,10 +1537,6 @@ void gtr_actions_handler(char const* action_name, gpointer user_data) GtkWidget* dialog = gtr_stats_dialog_new(data->wind, data->core); gtk_widget_show(dialog); } - else if (g_strcmp0(action_name, "donate") == 0) - { - gtr_open_uri("https://transmissionbt.com/donate/"); - } else if (g_strcmp0(action_name, "pause-all-torrents") == 0) { pause_all_torrents(data); diff --git a/gtk/my-valgrind.sh b/gtk/my-valgrind.sh index 76683ae5b15..1935c9f863b 100755 --- a/gtk/my-valgrind.sh +++ b/gtk/my-valgrind.sh @@ -2,6 +2,6 @@ export G_SLICE=always-malloc export G_DEBUG=gc-friendly export GLIBCXX_FORCE_NEW=1 -#valgrind --tool=cachegrind ./transmission-gtk 2>&1 | tee runlog -#valgrind --tool=cachegrind ./transmission-gtk -p -g /tmp/transmission-test 2>&1 | tee runlog -valgrind --tool=memcheck --leak-check=full --leak-resolution=high --num-callers=48 --log-file=x-valgrind --show-reachable=no ./transmission-gtk -p 2>&1 | tee runlog +#valgrind --tool=cachegrind ./transmission-og-gtk 2>&1 | tee runlog +#valgrind --tool=cachegrind ./transmission-og-gtk -p -g /tmp/transmission-og-test 2>&1 | tee runlog +valgrind --tool=memcheck --leak-check=full --leak-resolution=high --num-callers=48 --log-file=x-valgrind --show-reachable=no ./transmission-og-gtk -p 2>&1 | tee runlog diff --git a/gtk/notify.c b/gtk/notify.c index 1a31e102f6c..92cb72ea227 100644 --- a/gtk/notify.c +++ b/gtk/notify.c @@ -213,7 +213,7 @@ void gtr_notify_torrent_completed(TrCore* core, int torrent_id) } } - g_dbus_proxy_call(proxy, "Notify", g_variant_new("(susssasa{sv}i)", "Transmission", n->id, "transmission", + g_dbus_proxy_call(proxy, "Notify", g_variant_new("(susssasa{sv}i)", "Transmission OG", n->id, "transmission", _("Torrent Complete"), tr_torrentName(tor), &actions_builder, NULL, -1), G_DBUS_CALL_FLAGS_NONE, -1, NULL, notify_callback, n); } @@ -230,6 +230,6 @@ void gtr_notify_torrent_added(char const* name) } n = g_new0(TrNotification, 1); - g_dbus_proxy_call(proxy, "Notify", g_variant_new("(susssasa{sv}i)", "Transmission", 0, "transmission", _("Torrent Added"), + g_dbus_proxy_call(proxy, "Notify", g_variant_new("(susssasa{sv}i)", "Transmission OG", 0, "transmission", _("Torrent Added"), name, NULL, NULL, -1), G_DBUS_CALL_FLAGS_NONE, -1, NULL, notify_callback, n); } diff --git a/gtk/tr-core.c b/gtk/tr-core.c index 8b204ca61da..95ffac0ec30 100644 --- a/gtk/tr-core.c +++ b/gtk/tr-core.c @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) Transmission authors and contributors + * Copyright (c) Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -1588,7 +1588,7 @@ static gboolean gtr_inhibit_hibernation(guint* cookie) GVariant* response; GDBusConnection* connection; GError* err = NULL; - char const* application = "Transmission BitTorrent Client"; + char const* application = "Transmission OG BitTorrent Client"; char const* reason = "BitTorrent Activity"; int const toplevel_xid = 0; int const flags = 4; /* Inhibit suspending the session or computer */ diff --git a/gtk/tr-core.h b/gtk/tr-core.h index f8a282decae..7fa159ff078 100644 --- a/gtk/tr-core.h +++ b/gtk/tr-core.h @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) Transmission authors and contributors + * Copyright (c) Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -32,7 +32,7 @@ G_BEGIN_DECLS #define TR_CORE_TYPE (tr_core_get_type()) #define TR_CORE(o) (G_TYPE_CHECK_INSTANCE_CAST((o), TR_CORE_TYPE, TrCore)) -#define TR_RESOURCE_PATH "/com/transmissionbt/transmission/" +#define TR_RESOURCE_PATH "/com/transmissionbt/transmission-og/" typedef struct _TrCore { diff --git a/gtk/tr-icon.c b/gtk/tr-icon.c index 15d4e22eba6..977e24af617 100644 --- a/gtk/tr-icon.c +++ b/gtk/tr-icon.c @@ -106,7 +106,7 @@ void gtr_icon_refresh(gpointer vicon) * %2$s: current upload limit, if any * %3$s: current download speed * %4$s: current download limit, if any */ - g_snprintf(tip, sizeof(tip), _("Transmission\nUp: %1$s %2$s\nDown: %3$s %4$s"), up, upLimit, down, downLimit); + g_snprintf(tip, sizeof(tip), _("Transmission OG\nUp: %1$s %2$s\nDown: %3$s %4$s"), up, upLimit, down, downLimit); gtk_status_icon_set_tooltip_text(GTK_STATUS_ICON(icon), tip); } diff --git a/gtk/tr-prefs.c b/gtk/tr-prefs.c index 5c72206e833..f1c4ad34004 100644 --- a/gtk/tr-prefs.c +++ b/gtk/tr-prefs.c @@ -406,7 +406,7 @@ static GtkWidget* desktopPage(GObject* core) w = new_check_button(s, TR_KEY_inhibit_desktop_hibernation, core); hig_workarea_add_wide_control(t, &row, w); - s = _("Show Transmission icon in the _notification area"); + s = _("Show Transmission OG icon in the _notification area"); w = new_check_button(s, TR_KEY_show_notification_area_icon, core); hig_workarea_add_wide_control(t, &row, w); @@ -1182,7 +1182,7 @@ static GtkWidget* networkPage(GObject* core) data->prefsTag = g_signal_connect(TR_CORE(core), "prefs-changed", G_CALLBACK(onCorePrefsChanged), data); g_object_weak_ref(G_OBJECT(t), networkPageDestroyed, data); - s = _("Pick a _random port every time Transmission is started"); + s = _("Pick a _random port every time Transmission OG is started"); w = new_check_button(s, TR_KEY_peer_port_random_on_start, core); hig_workarea_add_wide_control(t, &row, w); @@ -1285,7 +1285,7 @@ GtkWidget* gtr_prefs_dialog_new(GtkWindow* parent, GObject* core) data->core = TR_CORE(core); data->core_prefs_tag = g_signal_connect(TR_CORE(core), "prefs-changed", G_CALLBACK(on_core_prefs_changed), data); - d = gtk_dialog_new_with_buttons(_("Transmission Preferences"), parent, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_HELP, + d = gtk_dialog_new_with_buttons(_("Transmission OG Preferences"), parent, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_HELP, GTK_RESPONSE_HELP, GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, NULL); g_object_weak_ref(G_OBJECT(d), on_prefs_dialog_destroyed, data); gtk_window_set_role(GTK_WINDOW(d), "transmission-preferences-dialog"); diff --git a/gtk/tr-window.c b/gtk/tr-window.c index e4c592af7a4..94d1dd4c1f8 100644 --- a/gtk/tr-window.c +++ b/gtk/tr-window.c @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) Transmission authors and contributors + * Copyright (c) Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/gtk/tr-window.h b/gtk/tr-window.h index 2dca8e04323..b0c30a70b35 100644 --- a/gtk/tr-window.h +++ b/gtk/tr-window.h @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) Transmission authors and contributors + * Copyright (c) Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/gtk/transmission-gtk.1 b/gtk/transmission-og-gtk.1 similarity index 89% rename from gtk/transmission-gtk.1 rename to gtk/transmission-og-gtk.1 index c13596631b9..8ece5cd8e12 100644 --- a/gtk/transmission-gtk.1 +++ b/gtk/transmission-og-gtk.1 @@ -18,13 +18,13 @@ .\" FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER .\" DEALINGS IN THE SOFTWARE. .Dd May 20, 2008 -.Dt TRANSMISSION-GTK 1 +.Dt TRANSMISSION-OG-GTK 1 .Os .Sh NAME -.Nm transmission-gtk +.Nm transmission-og-gtk .Nd a bittorrent client .Sh SYNOPSIS -.Nm transmission-gtk +.Nm transmission-og-gtk .Fl ? .Nm .Op Fl pqm @@ -82,12 +82,12 @@ was written by and .An Mike Gelfand . .Sh SEE ALSO -.Xr transmission-create 1 , -.Xr transmission-daemon 1 , -.Xr transmission-edit 1 , -.Xr transmission-gtk 1 , -.Xr transmission-qt 1 , -.Xr transmission-remote 1 , -.Xr transmission-show 1 +.Xr transmission-og-create 1 , +.Xr transmission-og-daemon 1 , +.Xr transmission-og-edit 1 , +.Xr transmission-og-gtk 1 , +.Xr transmission-og-qt 1 , +.Xr transmission-og-remote 1 , +.Xr transmission-og-show 1 .Pp -https://transmissionbt.com/ +https://github.com/stefantalpalaru/transmission-og diff --git a/gtk/transmission-gtk.appdata.xml.in b/gtk/transmission-og-gtk.appdata.xml.in similarity index 65% rename from gtk/transmission-gtk.appdata.xml.in rename to gtk/transmission-og-gtk.appdata.xml.in index 169bdcdd7da..a5294425a39 100644 --- a/gtk/transmission-gtk.appdata.xml.in +++ b/gtk/transmission-og-gtk.appdata.xml.in @@ -4,11 +4,11 @@ Copyright 2014 Richard Hughes Copyright 2017 Endless Mobile, Inc. --> - transmission-gtk.desktop + transmission-og-gtk.desktop CC0-1.0 GPL-2.0 OR GPL-3.0 - Transmission + Transmission OG Download and share files over BitTorrent @@ -18,21 +18,20 @@ Copyright 2017 Endless Mobile, Inc. distribute large amounts of data between multiple users.

- Transmission is a BitTorrent client with an easy-to-use frontend on top a + Transmission OG is a BitTorrent client with an easy-to-use frontend on top a cross-platform backend. Native frontends are available for OS X and Windows, as well as command line and web frontends.

- Notable features of Transmission include support for Local Peer Discovery, encryption, + Notable features of Transmission OG include support for Local Peer Discovery, encryption, DHT, µTP, PEX and Magnet Link.

- https://transmissionbt.com/ + https://github.com/stefantalpalaru/transmission-og - https://raw.githubusercontent.com/transmission/transmission/master/gtk/screenshots/a.png + https://raw.githubusercontent.com/stefantalpalaru/transmission-og/master/gtk/screenshots/a.png - info_AT_transmissionbt.com diff --git a/gtk/transmission-gtk.desktop.in b/gtk/transmission-og-gtk.desktop.in similarity index 71% rename from gtk/transmission-gtk.desktop.in rename to gtk/transmission-og-gtk.desktop.in index 8d568a8b7dc..457df6b800a 100644 --- a/gtk/transmission-gtk.desktop.in +++ b/gtk/transmission-og-gtk.desktop.in @@ -1,13 +1,13 @@ [Desktop Entry] -Name=Transmission +Name=Transmission OG GenericName=BitTorrent Client Comment=Download and share files over BitTorrent # Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! Keywords=torrents;downloading;uploading;share;sharing; -Exec=transmission-gtk %U +Exec=transmission-og-gtk %U Icon=transmission Terminal=false -TryExec=transmission-gtk +TryExec=transmission-og-gtk Type=Application StartupNotify=true MimeType=application/x-bittorrent;x-scheme-handler/magnet; @@ -17,9 +17,9 @@ X-AppInstall-Keywords=torrent Actions=Pause;Minimize; [Desktop Action Pause] -Name=Start Transmission with All Torrents Paused -Exec=transmission-gtk --paused +Name=Start Transmission OG with All Torrents Paused +Exec=transmission-og-gtk --paused [Desktop Action Minimize] -Name=Start Transmission Minimized -Exec=transmission-gtk --minimized +Name=Start Transmission OG Minimized +Exec=transmission-og-gtk --minimized diff --git a/gtk/transmission.ico b/gtk/transmission-og.ico similarity index 100% rename from gtk/transmission.ico rename to gtk/transmission-og.ico diff --git a/gtk/transmission.png b/gtk/transmission-og.png similarity index 100% rename from gtk/transmission.png rename to gtk/transmission-og.png diff --git a/gtk/transmission-ui.xml b/gtk/transmission-ui.xml index c4894810013..061f2ab78fc 100644 --- a/gtk/transmission-ui.xml +++ b/gtk/transmission-ui.xml @@ -61,8 +61,6 @@ - - diff --git a/gtk/transmission.gresource.xml b/gtk/transmission.gresource.xml index 55a3eef0213..85db77e02c2 100644 --- a/gtk/transmission.gresource.xml +++ b/gtk/transmission.gresource.xml @@ -1,8 +1,8 @@ - - icons/hicolor_apps_scalable_transmission.svg - icons/hicolor_apps_scalable_transmission.svg + + icons/hicolor_apps_scalable_transmission-og.svg + icons/hicolor_apps_scalable_transmission-og.svg icons/lock.png icons/ratio.png icons/turtle-blue.png diff --git a/gtk/transmission.rc b/gtk/transmission.rc index 511a6a648ee..e498b280e4c 100644 --- a/gtk/transmission.rc +++ b/gtk/transmission.rc @@ -1 +1 @@ -A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "transmission.ico" +A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "transmission-og.ico" diff --git a/gtk/util.c b/gtk/util.c index 50a6f2bf0ea..3d4dfe5a3b2 100644 --- a/gtk/util.c +++ b/gtk/util.c @@ -600,7 +600,7 @@ void gtr_unrecognized_url_dialog(GtkWidget* parent, char const* url) GtkWidget* w = gtk_message_dialog_new(window, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "%s", _("Unrecognized URL")); - g_string_append_printf(gstr, _("Transmission doesn't know how to use \"%s\""), url); + g_string_append_printf(gstr, _("Transmission OG doesn't know how to use \"%s\""), url); if (gtr_is_magnet_link(url) && strstr(url, xt) == NULL) { diff --git a/libtransmission/CMakeLists.txt b/libtransmission/CMakeLists.txt index dff0af33b33..0a9e9f8d028 100644 --- a/libtransmission/CMakeLists.txt +++ b/libtransmission/CMakeLists.txt @@ -190,6 +190,7 @@ endif() add_definitions( -D__TRANSMISSION__ "-DPACKAGE_DATA_DIR=\"${CMAKE_INSTALL_FULL_DATAROOTDIR}\"" + "-DPACKAGE_NAME=\"${CMAKE_PROJECT_NAME}\"" ${NATPMP_DEFINITIONS} ${MINIUPNPC_DEFINITIONS} ) diff --git a/libtransmission/bandwidth.h b/libtransmission/bandwidth.h index 27b570852b1..ea8760eaf7f 100644 --- a/libtransmission/bandwidth.h +++ b/libtransmission/bandwidth.h @@ -71,7 +71,7 @@ struct tr_band * * HIERARCHY * - * Transmission's bandwidth hierarchy is a tree. + * Transmission OG's bandwidth hierarchy is a tree. * At the top is the global bandwidth object owned by tr_session. * Its children are per-torrent bandwidth objects owned by tr_torrent. * Underneath those are per-peer bandwidth objects owned by tr_peer. @@ -83,7 +83,7 @@ struct tr_band * MEASURING * * When you ask a bandwidth object for its speed, it gives the speed of the - * subtree underneath it as well. So you can get Transmission's overall + * subtree underneath it as well. So you can get Transmission OG's overall * speed by quering tr_session's bandwidth, per-torrent speeds by asking * tr_torrent's bandwidth, and per-peer speeds by asking tr_peer's bandwidth. * diff --git a/libtransmission/clients-test.c b/libtransmission/clients-test.c index 5fa34bfedf0..15bff851173 100644 --- a/libtransmission/clients-test.c +++ b/libtransmission/clients-test.c @@ -21,9 +21,9 @@ int main(void) TEST_CLIENT("-FC1013-", "FileCroc 1.0.1.3"); TEST_CLIENT("-MR1100-", "Miro 1.1.0.0"); - TEST_CLIENT("-TR0006-", "Transmission 0.6"); - TEST_CLIENT("-TR0072-", "Transmission 0.72"); - TEST_CLIENT("-TR111Z-", "Transmission 1.11+"); + TEST_CLIENT("-TR0006-", "Transmission OG 0.6"); + TEST_CLIENT("-TR0072-", "Transmission OG 0.72"); + TEST_CLIENT("-TR111Z-", "Transmission OG 1.11+"); TEST_CLIENT("O1008132", "Osprey 1.0.0"); TEST_CLIENT("TIX0193-", "Tixati 1.93"); TEST_CLIENT("-UT341\0-", "\xc2\xb5Torrent 3.4.1"); diff --git a/libtransmission/clients.c b/libtransmission/clients.c index f9cf568f69a..f0627537db9 100644 --- a/libtransmission/clients.c +++ b/libtransmission/clients.c @@ -202,15 +202,15 @@ char* tr_clientForId(char* buf, size_t buflen, void const* id_in) { if (strncmp(chid + 3, "000", 3) == 0) /* very old client style: -TR0006- is 0.6 */ { - tr_snprintf(buf, buflen, "Transmission 0.%c", id[6]); + tr_snprintf(buf, buflen, "Transmission OG 0.%c", id[6]); } else if (strncmp(chid + 3, "00", 2) == 0) /* previous client style: -TR0072- is 0.72 */ { - tr_snprintf(buf, buflen, "Transmission 0.%02d", strint(id + 5, 2)); + tr_snprintf(buf, buflen, "Transmission OG 0.%02d", strint(id + 5, 2)); } else /* current client style: -TR111Z- is 1.11+ */ { - tr_snprintf(buf, buflen, "Transmission %d.%02d%s", strint(id + 3, 1), strint(id + 4, 2), + tr_snprintf(buf, buflen, "Transmission OG %d.%02d%s", strint(id + 3, 1), strint(id + 4, 2), (id[6] == 'Z' || id[6] == 'X') ? "+" : ""); } } diff --git a/libtransmission/metainfo.c b/libtransmission/metainfo.c index e42065ab3ee..74f002a6b3e 100644 --- a/libtransmission/metainfo.c +++ b/libtransmission/metainfo.c @@ -741,7 +741,7 @@ static char const* tr_metainfoParseImpl(tr_session const* session, tr_info* inf, /* get the url-list */ geturllist(inf, meta); - /* filename of Transmission's copy */ + /* filename of Transmission OG's copy */ tr_free(inf->torrent); inf->torrent = session != NULL ? getTorrentFilename(session, inf, TR_METAINFO_BASENAME_HASH) : NULL; diff --git a/libtransmission/net.c b/libtransmission/net.c index 4928a762a52..5f9dfae5a1a 100644 --- a/libtransmission/net.c +++ b/libtransmission/net.c @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) Transmission authors and contributors + * Copyright (c) Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -440,7 +440,7 @@ static tr_socket_t tr_netBindTCPImpl(tr_address const* addr, tr_port port, bool if (err == EADDRINUSE) { - hint = _("Is another copy of Transmission already running?"); + hint = _("Is another copy of Transmission OG already running?"); } else { diff --git a/libtransmission/net.h b/libtransmission/net.h index 1e436106189..35a4827e28b 100644 --- a/libtransmission/net.h +++ b/libtransmission/net.h @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) Transmission authors and contributors + * Copyright (c) Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/libtransmission/peer-mgr.c b/libtransmission/peer-mgr.c index 8021474df9f..452f415039e 100644 --- a/libtransmission/peer-mgr.c +++ b/libtransmission/peer-mgr.c @@ -2992,7 +2992,7 @@ static void rechokeDownloads(tr_swarm* s) * -how many- peers to be interested in. * * We're working on 2. here, so we need to ignore unresponsive - * peers in our calculations lest they confuse Transmission into + * peers in our calculations lest they confuse Transmission OG into * thinking it's hit its bandwidth cap. */ for (int i = 0; i < peerCount; ++i) diff --git a/libtransmission/platform.c b/libtransmission/platform.c index cf0ecd8258e..dd78eba314d 100644 --- a/libtransmission/platform.c +++ b/libtransmission/platform.c @@ -537,7 +537,7 @@ char const* tr_getWebClientDir(tr_session const* session UNUSED) for (size_t i = 0; s == NULL && i < TR_N_ELEMENTS(known_folder_ids); ++i) { char* dir = win32_get_known_folder(known_folder_ids[i]); - s = tr_buildPath(dir, "Transmission", "Web", NULL); + s = tr_buildPath(dir, "TransmissionOG", "Web", NULL); tr_free(dir); if (!isWebClientDir(s)) @@ -624,7 +624,7 @@ char const* tr_getWebClientDir(tr_session const* session UNUSED) /* walk through the candidates & look for a match */ for (tr_list* l = candidates; l != NULL; l = l->next) { - char* path = tr_buildPath(l->data, "transmission", "web", NULL); + char* path = tr_buildPath(l->data, PACKAGE_NAME, "web", NULL); bool const found = isWebClientDir(path); if (found) @@ -654,7 +654,7 @@ char* tr_getSessionIdDir(void) #else char* program_data_dir = win32_get_known_folder_ex(&FOLDERID_ProgramData, KF_FLAG_CREATE); - char* result = tr_buildPath(program_data_dir, "Transmission", NULL); + char* result = tr_buildPath(program_data_dir, "TransmissionOG", NULL); tr_free(program_data_dir); tr_sys_dir_create(result, 0, 0, NULL); return result; diff --git a/libtransmission/rpc-server.c b/libtransmission/rpc-server.c index fdd6fbbc1ac..05aeb96bf75 100644 --- a/libtransmission/rpc-server.c +++ b/libtransmission/rpc-server.c @@ -433,8 +433,8 @@ static void handle_web_client(struct evhttp_request* req, struct tr_rpc_server* if (tr_str_is_empty(webClientDir)) { send_simple_response(req, HTTP_NOTFOUND, - "

Couldn't find Transmission's web interface files!

" - "

Users: to tell Transmission where to look, " + "

Couldn't find Transmission OG's web interface files!

" + "

Users: to tell Transmission OG where to look, " "set the TRANSMISSION_WEB_HOME environment " "variable to the folder where the web interface's " "index.html is located.

" @@ -703,7 +703,7 @@ static void handle_request(struct evhttp_request* req, void* arg) else if (!isHostnameAllowed(server, req)) { char* const tmp = tr_strdup_printf( - "

Transmission received your request, but the hostname was unrecognized.

" + "

Transmission OG received your request, but the hostname was unrecognized.

" "

To fix this, choose one of the following options:" "

    " "
  • Enable password authentication, then any hostname is allowed.
    • " diff --git a/libtransmission/session.h b/libtransmission/session.h index 129cddca14a..0d477bdb4d0 100644 --- a/libtransmission/session.h +++ b/libtransmission/session.h @@ -12,7 +12,7 @@ #error only libtransmission should #include this header. #endif -#define TR_NAME "Transmission" +#define TR_NAME "Transmission OG" #include @@ -167,7 +167,7 @@ struct tr_session * The open port on the public device for incoming peer requests. * This is usually the same as private_peer_port but can differ * if the public device is a router and it decides to use a different - * port than the one requested by Transmission. + * port than the one requested by Transmission OG. */ tr_port public_peer_port; diff --git a/libtransmission/torrent.c b/libtransmission/torrent.c index 7dc8f93b5e5..d120f749dd4 100644 --- a/libtransmission/torrent.c +++ b/libtransmission/torrent.c @@ -1939,7 +1939,7 @@ static void torrentStart(tr_torrent* tor, bool bypass_queue) /* corresponds to the peer_id sent as a tracker request parameter. * one tracker admin says: "When the same torrent is opened and - * closed and opened again without quitting Transmission ... + * closed and opened again without quitting Transmission OG ... * change the peerid. It would help sometimes if a stopped event * was missed to ensure that we didn't think someone was cheating. */ tr_torrentUnsetPeerId(tor); @@ -2225,7 +2225,7 @@ static char const* getCompletionString(int type) { case TR_PARTIAL_SEED: /* Translators: this is a minor point that's safe to skip over, but FYI: - "Complete" and "Done" are specific, different terms in Transmission: + "Complete" and "Done" are specific, different terms in Transmission OG: "Complete" means we've downloaded every file in the torrent. "Done" means we're done downloading the files we wanted, but NOT all that exist */ diff --git a/libtransmission/tr-dht.c b/libtransmission/tr-dht.c index 1b4d97d5536..d57cd83c9db 100644 --- a/libtransmission/tr-dht.c +++ b/libtransmission/tr-dht.c @@ -817,7 +817,7 @@ static void timer_callback(evutil_socket_t s UNUSED, short type UNUSED, void* se } /* This function should return true when a node is blacklisted. We do - not support using a blacklist with the DHT in Transmission, since + not support using a blacklist with the DHT in Transmission OG, since massive (ab)use of this feature could harm the DHT. However, feel free to add support to your private copy as long as you don't redistribute it. */ diff --git a/libtransmission/transmission.h b/libtransmission/transmission.h index 1917630ca1b..c57f72a1bf7 100644 --- a/libtransmission/transmission.h +++ b/libtransmission/transmission.h @@ -1,5 +1,5 @@ /* - * This file Copyright (C) Transmission authors and contributors + * This file Copyright (C) Transmission OG authors and contributors * * It may be used under the 3-Clause BSD License, the GNU Public License v2, * or v3, or any future license endorsed by Mnemosyne LLC. @@ -87,7 +87,7 @@ tr_encryption_mode; */ /** - * @brief returns Transmission's default configuration file directory. + * @brief returns Transmission OG's default configuration file directory. * * The default configuration directory is determined this way: * -# If the TRANSMISSION_HOME environment variable is set, its value is used. @@ -198,7 +198,7 @@ void tr_sessionSaveSettings(tr_session* session, char const* configDir, struct t * tr_variantFree(&settings); * @endcode * - * @param configDir where Transmission will look for resume files, blocklists, etc. + * @param configDir where Transmission OG will look for resume files, blocklists, etc. * @param messageQueueingEnabled if false, messages will be dumped to stderr * @param settings libtransmission settings * @see tr_sessionGetDefaultSettings() @@ -295,7 +295,7 @@ bool tr_sessionIsIncompleteDirEnabled(tr_session const* session); * to their filename until the file is fully downloaded * * This is not retroactive -- toggling this will not rename existing files. - * It only applies to new files created by Transmission after this API call. + * It only applies to new files created by Transmission OG after this API call. * * @see tr_sessionIsIncompleteFileNamingEnabled() */ @@ -767,7 +767,7 @@ void tr_logFreeQueue(tr_log_message* freeme); @{ */ /** - * Specify a range of IPs for Transmission to block. + * Specify a range of IPs for Transmission OG to block. * * Filename must be an uncompressed ascii file. * @@ -814,7 +814,7 @@ char const* tr_blocklistGetURL(tr_session const*); To remedy this, a Torrent Constructor (struct tr_ctor) has been introduced: - Simplifies the API to two functions: tr_torrentParse() and tr_torrentNew() - You can set the fields you want; the system sets defaults for the rest. - - You can specify whether or not your fields should supercede resume's. + - You can specify whether or not your fields should supersede resume's. - We can add new features to tr_ctor without breaking tr_torrentNew()'s API. All the tr_ctor{Get,Set}* () functions with a return value return @@ -1432,7 +1432,7 @@ typedef struct /* the full scrape URL */ char scrape[1024]; - /* Transmission uses one tracker per tier, + /* Transmission OG uses one tracker per tier, * and the others are kept as backups */ bool isBackup; @@ -1606,7 +1606,7 @@ struct tr_info /* The torrent's name. */ char* name; - /* Path to torrent Transmission's internal copy of the .torrent file. */ + /* Path to torrent Transmission OG's internal copy of the .torrent file. */ char* torrent; char** webseeds; diff --git a/libtransmission/utils.h b/libtransmission/utils.h index ac1f5c3f3b5..f7511152225 100644 --- a/libtransmission/utils.h +++ b/libtransmission/utils.h @@ -269,10 +269,10 @@ void tr_hex_to_binary(char const* input, void* output, size_t byte_length) TR_GN /** @brief convenience function to determine if an address is an IP address (IPv4 or IPv6) */ bool tr_addressIsIP(char const* address); -/** @brief return true if the url is a http or https or UDP url that Transmission understands */ +/** @brief return true if the url is a http or https or UDP url that Transmission OG understands */ bool tr_urlIsValidTracker(char const* url); -/** @brief return true if the url is a [ http, https, ftp, sftp ] url that Transmission understands */ +/** @brief return true if the url is a [ http, https, ftp, sftp ] url that Transmission OG understands */ bool tr_urlIsValid(char const* url, size_t url_len); /** @brief parse a URL into its component parts diff --git a/libtransmission/version.h b/libtransmission/version.h index fe2649881f9..b47aaef0edd 100644 --- a/libtransmission/version.h +++ b/libtransmission/version.h @@ -2,10 +2,10 @@ #define PEERID_PREFIX "-TR301Z-" #define USERAGENT_PREFIX "3.01+" -#define VCS_REVISION "64bba77d55" -#define VCS_REVISION_NUM 64bba77d55 +#define VCS_REVISION "ef6d40bc52" +#define VCS_REVISION_NUM ef6d40bc52 #define SHORT_VERSION_STRING "3.01+" -#define LONG_VERSION_STRING "3.01+ (64bba77d55)" +#define LONG_VERSION_STRING "3.01+ (ef6d40bc52)" #define VERSION_STRING_INFOPLIST 3.01+ #define BUILD_STRING_INFOPLIST 14714.3.1 #define MAJOR_VERSION 3 diff --git a/macosx/AboutWindow.xib b/macosx/AboutWindow.xib index d68db856df0..f286d409945 100644 --- a/macosx/AboutWindow.xib +++ b/macosx/AboutWindow.xib @@ -30,7 +30,7 @@ - + diff --git a/macosx/AboutWindowController.h b/macosx/AboutWindowController.h index 610be4b742f..464f88e10d9 100644 --- a/macosx/AboutWindowController.h +++ b/macosx/AboutWindowController.h @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2007-2012 Transmission authors and contributors + * Copyright (c) 2007-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/AboutWindowController.m b/macosx/AboutWindowController.m index 0e13dc445d9..7db7ca61b84 100644 --- a/macosx/AboutWindowController.m +++ b/macosx/AboutWindowController.m @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2007-2012 Transmission authors and contributors + * Copyright (c) 2007-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/AddMagnetWindowController.h b/macosx/AddMagnetWindowController.h index ac14c1608cf..008e90fef29 100644 --- a/macosx/AddMagnetWindowController.h +++ b/macosx/AddMagnetWindowController.h @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2010-2012 Transmission authors and contributors + * Copyright (c) 2010-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/AddMagnetWindowController.m b/macosx/AddMagnetWindowController.m index 9c44998eef1..f294a0d6871 100644 --- a/macosx/AddMagnetWindowController.m +++ b/macosx/AddMagnetWindowController.m @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2010-2012 Transmission authors and contributors + * Copyright (c) 2010-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/AddWindowController.h b/macosx/AddWindowController.h index 6bb26461873..d50faf7ac74 100644 --- a/macosx/AddWindowController.h +++ b/macosx/AddWindowController.h @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2008-2012 Transmission authors and contributors + * Copyright (c) 2008-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/AddWindowController.m b/macosx/AddWindowController.m index bb2bffc6253..c64913f711e 100644 --- a/macosx/AddWindowController.m +++ b/macosx/AddWindowController.m @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2008-2012 Transmission authors and contributors + * Copyright (c) 2008-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/BadgeView.h b/macosx/BadgeView.h index 7c8c0dff860..313af687ee0 100644 --- a/macosx/BadgeView.h +++ b/macosx/BadgeView.h @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2007-2012 Transmission authors and contributors + * Copyright (c) 2007-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/BadgeView.m b/macosx/BadgeView.m index 73a952d1fb1..660c97a426d 100644 --- a/macosx/BadgeView.m +++ b/macosx/BadgeView.m @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2007-2012 Transmission authors and contributors + * Copyright (c) 2007-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/Badger.h b/macosx/Badger.h index e42d0110d96..2bc0e03a1b6 100644 --- a/macosx/Badger.h +++ b/macosx/Badger.h @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2006-2012 Transmission authors and contributors + * Copyright (c) 2006-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/Badger.m b/macosx/Badger.m index 520e662d2a2..ae2de41da51 100644 --- a/macosx/Badger.m +++ b/macosx/Badger.m @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2006-2012 Transmission authors and contributors + * Copyright (c) 2006-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/BlocklistDownloader.h b/macosx/BlocklistDownloader.h index d739c9d3025..d1f4784a3cf 100644 --- a/macosx/BlocklistDownloader.h +++ b/macosx/BlocklistDownloader.h @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2008-2012 Transmission authors and contributors + * Copyright (c) 2008-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/BlocklistDownloader.m b/macosx/BlocklistDownloader.m index 683e4dfbeba..f081d4e0d58 100644 --- a/macosx/BlocklistDownloader.m +++ b/macosx/BlocklistDownloader.m @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2008-2012 Transmission authors and contributors + * Copyright (c) 2008-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/BlocklistDownloaderViewController.h b/macosx/BlocklistDownloaderViewController.h index 40e9567a348..7e2fa786de1 100644 --- a/macosx/BlocklistDownloaderViewController.h +++ b/macosx/BlocklistDownloaderViewController.h @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2008-2012 Transmission authors and contributors + * Copyright (c) 2008-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/BlocklistDownloaderViewController.m b/macosx/BlocklistDownloaderViewController.m index 8e07e2623ed..1417f434b79 100644 --- a/macosx/BlocklistDownloaderViewController.m +++ b/macosx/BlocklistDownloaderViewController.m @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2008-2012 Transmission authors and contributors + * Copyright (c) 2008-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/BlocklistScheduler.h b/macosx/BlocklistScheduler.h index 2c80974ad38..d26e802b58a 100644 --- a/macosx/BlocklistScheduler.h +++ b/macosx/BlocklistScheduler.h @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2008-2012 Transmission authors and contributors + * Copyright (c) 2008-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/BlocklistScheduler.m b/macosx/BlocklistScheduler.m index 9ada52e8d24..68a1009fc4f 100644 --- a/macosx/BlocklistScheduler.m +++ b/macosx/BlocklistScheduler.m @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2008-2012 Transmission authors and contributors + * Copyright (c) 2008-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/BonjourController.h b/macosx/BonjourController.h index e55b94ba674..f78ba02a439 100644 --- a/macosx/BonjourController.h +++ b/macosx/BonjourController.h @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2008-2012 Transmission authors and contributors + * Copyright (c) 2008-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/BonjourController.m b/macosx/BonjourController.m index e1c8810f618..71230142b6b 100644 --- a/macosx/BonjourController.m +++ b/macosx/BonjourController.m @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2008-2012 Transmission authors and contributors + * Copyright (c) 2008-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -47,7 +47,7 @@ - (void) startWithPort: (int) port { [self stop]; - NSMutableString * serviceName = [NSMutableString stringWithFormat: @"Transmission (%@ - %@)", NSUserName(), [[NSHost currentHost] localizedName]]; + NSMutableString * serviceName = [NSMutableString stringWithFormat: @"Transmission OG (%@ - %@)", NSUserName(), [[NSHost currentHost] localizedName]]; if ([serviceName length] > BONJOUR_SERVICE_NAME_MAX_LENGTH) [serviceName deleteCharactersInRange: NSMakeRange(BONJOUR_SERVICE_NAME_MAX_LENGTH, [serviceName length] - BONJOUR_SERVICE_NAME_MAX_LENGTH)]; diff --git a/macosx/ButtonToolbarItem.h b/macosx/ButtonToolbarItem.h index 7b70118dff2..a0443d21ced 100644 --- a/macosx/ButtonToolbarItem.h +++ b/macosx/ButtonToolbarItem.h @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2007-2012 Transmission authors and contributors + * Copyright (c) 2007-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/ButtonToolbarItem.m b/macosx/ButtonToolbarItem.m index ba4c4231630..fc09bd3dc04 100644 --- a/macosx/ButtonToolbarItem.m +++ b/macosx/ButtonToolbarItem.m @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2007-2012 Transmission authors and contributors + * Copyright (c) 2007-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/CMakeLists.txt b/macosx/CMakeLists.txt index 6a3d8314d10..903057a75bd 100644 --- a/macosx/CMakeLists.txt +++ b/macosx/CMakeLists.txt @@ -417,11 +417,11 @@ target_link_libraries(${TR_NAME}-mac "-framework Security" ) -set(MAC_BUNDLE_NAME Transmission) +set(MAC_BUNDLE_NAME TransmissionOG) set_target_properties(${TR_NAME}-mac PROPERTIES OUTPUT_NAME ${MAC_BUNDLE_NAME} - MACOSX_BUNDLE_GUI_IDENTIFIER "org.m0k.transmission" + MACOSX_BUNDLE_GUI_IDENTIFIER "org.m0k.transmissionog" MACOSX_BUNDLE_INFO_PLIST ${PROJECT_SOURCE_DIR}/Info.plist.in INSTALL_RPATH "@executable_path;@executable_path/../Frameworks" ) diff --git a/macosx/ColorTextField.h b/macosx/ColorTextField.h index acb12d32285..74ef65093ac 100644 --- a/macosx/ColorTextField.h +++ b/macosx/ColorTextField.h @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2008-2012 Transmission authors and contributors + * Copyright (c) 2008-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/ColorTextField.m b/macosx/ColorTextField.m index fe2e7445b58..1ee5af16cf0 100644 --- a/macosx/ColorTextField.m +++ b/macosx/ColorTextField.m @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2008-2012 Transmission authors and contributors + * Copyright (c) 2008-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/Controller.h b/macosx/Controller.h index f35d91fef7d..9f45855deba 100644 --- a/macosx/Controller.h +++ b/macosx/Controller.h @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2005-2019 Transmission authors and contributors + * Copyright (c) 2005-2019 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -257,9 +257,7 @@ typedef enum - (void) toggleQuickLook: (id) sender; - (void) linkHomepage: (id) sender; -- (void) linkForums: (id) sender; - (void) linkGitHub: (id) sender; -- (void) linkDonate: (id) sender; - (void) rpcCallback: (tr_rpc_callback_type) type forTorrentStruct: (struct tr_torrent *) torrentStruct; - (void) rpcAddTorrentStruct: (struct tr_torrent *) torrentStruct; diff --git a/macosx/Controller.m b/macosx/Controller.m index 7087ca7a96c..08f043a7cf0 100644 --- a/macosx/Controller.m +++ b/macosx/Controller.m @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2005-2019 Transmission authors and contributors + * Copyright (c) 2005-2019 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -127,12 +127,8 @@ #define TRANSFER_PLIST @"Transfers.plist" -#define WEBSITE_URL @"https://transmissionbt.com/" -#define FORUM_URL @"https://forum.transmissionbt.com/" -#define GITHUB_URL @"https://github.com/transmission/transmission" -#define DONATE_URL @"https://transmissionbt.com/donate/" - -#define DONATE_NAG_TIME (60 * 60 * 24 * 7) +#define WEBSITE_URL @"https://github.com/stefantalpalaru/transmission-og" +#define GITHUB_URL @"https://github.com/stefantalpalaru/transmission-og" static void altSpeedToggledCallback(tr_session * handle UNUSED, bool active, bool byUser, void * controller) { @@ -240,16 +236,16 @@ + (void) initialize { removeKeRangerRansomware(); - //make sure another Transmission.app isn't running already + //make sure another TransmissionOG.app isn't running already NSArray * apps = [NSRunningApplication runningApplicationsWithBundleIdentifier: [[NSBundle mainBundle] bundleIdentifier]]; if ([apps count] > 1) { NSAlert * alert = [[NSAlert alloc] init]; - [alert addButtonWithTitle: NSLocalizedString(@"OK", "Transmission already running alert -> button")]; - [alert setMessageText: NSLocalizedString(@"Transmission is already running.", - "Transmission already running alert -> title")]; - [alert setInformativeText: NSLocalizedString(@"There is already a copy of Transmission running. " - "This copy cannot be opened until that instance is quit.", "Transmission already running alert -> message")]; + [alert addButtonWithTitle: NSLocalizedString(@"OK", "Transmission OG already running alert -> button")]; + [alert setMessageText: NSLocalizedString(@"Transmission OG is already running.", + "Transmission OG already running alert -> title")]; + [alert setInformativeText: NSLocalizedString(@"There is already a copy of Transmission OG running. " + "This copy cannot be opened until that instance is quit.", "Transmission OG already running alert -> message")]; [alert setAlertStyle: NSCriticalAlertStyle]; [alert runModal]; @@ -274,8 +270,8 @@ + (void) initialize NSAlert * alert = [[NSAlert alloc] init]; [alert addButtonWithTitle: NSLocalizedString(@"I Accept", "Legal alert -> button")]; [alert addButtonWithTitle: NSLocalizedString(@"Quit", "Legal alert -> button")]; - [alert setMessageText: NSLocalizedString(@"Welcome to Transmission", "Legal alert -> title")]; - [alert setInformativeText: NSLocalizedString(@"Transmission is a file-sharing program." + [alert setMessageText: NSLocalizedString(@"Welcome to Transmission OG", "Legal alert -> title")]; + [alert setInformativeText: NSLocalizedString(@"Transmission OG is a file-sharing program." " When you run a torrent, its data will be made available to others by means of upload." " You and you alone are fully responsible for exercising proper judgement and abiding by your local laws.", "Legal alert -> message")]; @@ -420,7 +416,7 @@ - (id) init [gbString UTF8String], [tbString UTF8String]); - const char * configDir = tr_getDefaultConfigDir("Transmission"); + const char * configDir = tr_getDefaultConfigDir("Transmission OG"); fLib = tr_sessionInit(configDir, YES, &settings); tr_variantFree(&settings); @@ -665,50 +661,6 @@ - (void) applicationDidFinishLaunching: (NSNotification *) notification //registering the Web UI to Bonjour if ([fDefaults boolForKey: @"RPC"] && [fDefaults boolForKey: @"RPCWebDiscovery"]) [[BonjourController defaultController] startWithPort: [fDefaults integerForKey: @"RPCPort"]]; - - //shamelessly ask for donations - if ([fDefaults boolForKey: @"WarningDonate"]) - { - tr_session_stats stats; - tr_sessionGetCumulativeStats(fLib, &stats); - const BOOL firstLaunch = stats.sessionCount <= 1; - - NSDate * lastDonateDate = [fDefaults objectForKey: @"DonateAskDate"]; - const BOOL timePassed = !lastDonateDate || (-1 * [lastDonateDate timeIntervalSinceNow]) >= DONATE_NAG_TIME; - - if (!firstLaunch && timePassed) - { - [fDefaults setObject: [NSDate date] forKey: @"DonateAskDate"]; - - NSAlert * alert = [[NSAlert alloc] init]; - [alert setMessageText: NSLocalizedString(@"Support open-source indie software", "Donation beg -> title")]; - - NSString * donateMessage = [NSString stringWithFormat: @"%@\n\n%@", - NSLocalizedString(@"Transmission is a full-featured torrent application." - " A lot of time and effort have gone into development, coding, and refinement." - " If you enjoy using it, please consider showing your love with a donation.", "Donation beg -> message"), - NSLocalizedString(@"Donate or not, there will be no difference to your torrenting experience.", "Donation beg -> message")]; - - [alert setInformativeText: donateMessage]; - [alert setAlertStyle: NSInformationalAlertStyle]; - - [alert addButtonWithTitle: [NSLocalizedString(@"Donate", "Donation beg -> button") stringByAppendingEllipsis]]; - NSButton * noDonateButton = [alert addButtonWithTitle: NSLocalizedString(@"Nope", "Donation beg -> button")]; - [noDonateButton setKeyEquivalent: @"\e"]; //escape key - - const BOOL allowNeverAgain = lastDonateDate != nil; //hide the "don't show again" check the first time - give them time to try the app - [alert setShowsSuppressionButton: allowNeverAgain]; - if (allowNeverAgain) - [[alert suppressionButton] setTitle: NSLocalizedString(@"Don't bug me about this ever again.", "Donation beg -> button")]; - - const NSInteger donateResult = [alert runModal]; - if (donateResult == NSAlertFirstButtonReturn) - [self linkDonate: self]; - - if (allowNeverAgain) - [fDefaults setBool: ([[alert suppressionButton] state] != NSOnState) forKey: @"WarningDonate"]; - } - } } - (BOOL) applicationShouldHandleReopen: (NSApplication *) app hasVisibleWindows: (BOOL) visibleWindows @@ -4494,21 +4446,11 @@ - (void) linkHomepage: (id) sender [[NSWorkspace sharedWorkspace] openURL: [NSURL URLWithString: WEBSITE_URL]]; } -- (void) linkForums: (id) sender -{ - [[NSWorkspace sharedWorkspace] openURL: [NSURL URLWithString: FORUM_URL]]; -} - - (void) linkGitHub: (id) sender { [[NSWorkspace sharedWorkspace] openURL: [NSURL URLWithString: GITHUB_URL]]; } -- (void) linkDonate: (id) sender -{ - [[NSWorkspace sharedWorkspace] openURL: [NSURL URLWithString: DONATE_URL]]; -} - - (void) updaterWillRelaunchApplication: (SUUpdater *) updater { fQuitRequested = YES; diff --git a/macosx/CreatorWindowController.h b/macosx/CreatorWindowController.h index ae246459ec7..0bec27488f3 100644 --- a/macosx/CreatorWindowController.h +++ b/macosx/CreatorWindowController.h @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2007-2012 Transmission authors and contributors + * Copyright (c) 2007-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/CreatorWindowController.m b/macosx/CreatorWindowController.m index 8dba93886bd..c488cccec96 100644 --- a/macosx/CreatorWindowController.m +++ b/macosx/CreatorWindowController.m @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2007-2012 Transmission authors and contributors + * Copyright (c) 2007-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/Credits.rtf b/macosx/Credits.rtf index 186437ee55c..8da57ea055d 100644 --- a/macosx/Credits.rtf +++ b/macosx/Credits.rtf @@ -7,7 +7,7 @@ \vieww14160\viewh15100\viewkind0 \pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40\qc\partightenfactor0 -\f0\b\fs28 \cf2 The Transmission Project +\f0\b\fs28 \cf2 The Transmission OG Project \fs24 \cf3 \ \pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40\qc\partightenfactor0 {\field{\*\fldinst{HYPERLINK "https://transmissionbt.com/"}}{\fldrslt diff --git a/macosx/Defaults.plist b/macosx/Defaults.plist index c3ed9bdb351..9c32bd87d1e 100644 --- a/macosx/Defaults.plist +++ b/macosx/Defaults.plist @@ -192,8 +192,6 @@ WarningCreatorPrivateBlankAddress - WarningDonate - WarningDuplicate WarningFolderDataSameName diff --git a/macosx/DragOverlayView.h b/macosx/DragOverlayView.h index 1f9b3ec4a27..1469e72130f 100644 --- a/macosx/DragOverlayView.h +++ b/macosx/DragOverlayView.h @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2007-2012 Transmission authors and contributors + * Copyright (c) 2007-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/DragOverlayView.m b/macosx/DragOverlayView.m index 8e9e44aa217..2846b109501 100644 --- a/macosx/DragOverlayView.m +++ b/macosx/DragOverlayView.m @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2007-2012 Transmission authors and contributors + * Copyright (c) 2007-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/DragOverlayWindow.h b/macosx/DragOverlayWindow.h index 1636e180d20..215ab219b27 100644 --- a/macosx/DragOverlayWindow.h +++ b/macosx/DragOverlayWindow.h @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2007-2012 Transmission authors and contributors + * Copyright (c) 2007-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/DragOverlayWindow.m b/macosx/DragOverlayWindow.m index 987aa027c79..552a63a5263 100644 --- a/macosx/DragOverlayWindow.m +++ b/macosx/DragOverlayWindow.m @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2007-2012 Transmission authors and contributors + * Copyright (c) 2007-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/ExpandedPathToIconTransformer.h b/macosx/ExpandedPathToIconTransformer.h index bbec7e7f288..15978a5c591 100644 --- a/macosx/ExpandedPathToIconTransformer.h +++ b/macosx/ExpandedPathToIconTransformer.h @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2007-2012 Transmission authors and contributors + * Copyright (c) 2007-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/ExpandedPathToIconTransformer.m b/macosx/ExpandedPathToIconTransformer.m index 3dff06aa284..100c849793a 100644 --- a/macosx/ExpandedPathToIconTransformer.m +++ b/macosx/ExpandedPathToIconTransformer.m @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2007-2012 Transmission authors and contributors + * Copyright (c) 2007-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/ExpandedPathToPathTransformer.h b/macosx/ExpandedPathToPathTransformer.h index e786759aa4c..a3ce0c4f9cf 100644 --- a/macosx/ExpandedPathToPathTransformer.h +++ b/macosx/ExpandedPathToPathTransformer.h @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2007-2012 Transmission authors and contributors + * Copyright (c) 2007-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/ExpandedPathToPathTransformer.m b/macosx/ExpandedPathToPathTransformer.m index 6d8baa27598..8827d98266a 100644 --- a/macosx/ExpandedPathToPathTransformer.m +++ b/macosx/ExpandedPathToPathTransformer.m @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2007-2012 Transmission authors and contributors + * Copyright (c) 2007-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/FileListNode.h b/macosx/FileListNode.h index b3f703d955e..edd93567e40 100644 --- a/macosx/FileListNode.h +++ b/macosx/FileListNode.h @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2008-2012 Transmission authors and contributors + * Copyright (c) 2008-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/FileListNode.m b/macosx/FileListNode.m index 4e1a1ceb61d..132a343b4f4 100644 --- a/macosx/FileListNode.m +++ b/macosx/FileListNode.m @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2008-2012 Transmission authors and contributors + * Copyright (c) 2008-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/FileNameCell.h b/macosx/FileNameCell.h index d3c65a3e337..83578bd6267 100644 --- a/macosx/FileNameCell.h +++ b/macosx/FileNameCell.h @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2007-2012 Transmission authors and contributors + * Copyright (c) 2007-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/FileNameCell.m b/macosx/FileNameCell.m index b69e71a087d..1aa13f9a2c6 100644 --- a/macosx/FileNameCell.m +++ b/macosx/FileNameCell.m @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2007-2012 Transmission authors and contributors + * Copyright (c) 2007-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/FileOutlineController.h b/macosx/FileOutlineController.h index f8882b45a6b..eed29efbfb2 100644 --- a/macosx/FileOutlineController.h +++ b/macosx/FileOutlineController.h @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2008-2012 Transmission authors and contributors + * Copyright (c) 2008-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/FileOutlineController.m b/macosx/FileOutlineController.m index 4294b4f46c2..1efaac66360 100644 --- a/macosx/FileOutlineController.m +++ b/macosx/FileOutlineController.m @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2008-2012 Transmission authors and contributors + * Copyright (c) 2008-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/FileOutlineView.h b/macosx/FileOutlineView.h index 5ba9c33b618..99d89681cc4 100644 --- a/macosx/FileOutlineView.h +++ b/macosx/FileOutlineView.h @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2007-2012 Transmission authors and contributors + * Copyright (c) 2007-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/FileOutlineView.m b/macosx/FileOutlineView.m index e225f1849ad..a685448d0c7 100644 --- a/macosx/FileOutlineView.m +++ b/macosx/FileOutlineView.m @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2007-2012 Transmission authors and contributors + * Copyright (c) 2007-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/FilePriorityCell.h b/macosx/FilePriorityCell.h index 423d45dddf6..0e826fdea8c 100644 --- a/macosx/FilePriorityCell.h +++ b/macosx/FilePriorityCell.h @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2007-2012 Transmission authors and contributors + * Copyright (c) 2007-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/FilePriorityCell.m b/macosx/FilePriorityCell.m index 1e161bffe74..2abcebaa7ed 100644 --- a/macosx/FilePriorityCell.m +++ b/macosx/FilePriorityCell.m @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2007-2012 Transmission authors and contributors + * Copyright (c) 2007-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/FileRenameSheetController.h b/macosx/FileRenameSheetController.h index a51d4c18094..750f2eb2842 100644 --- a/macosx/FileRenameSheetController.h +++ b/macosx/FileRenameSheetController.h @@ -1,9 +1,9 @@ // // FileRenameSheetController.h -// Transmission +// Transmission OG // // Created by Mitchell Livingston on 1/20/13. -// Copyright (c) 2013 The Transmission Project. All rights reserved. +// Copyright (c) 2013 The Transmission OG Project. All rights reserved. // #import diff --git a/macosx/FileRenameSheetController.m b/macosx/FileRenameSheetController.m index d43005c5f95..348c945961c 100644 --- a/macosx/FileRenameSheetController.m +++ b/macosx/FileRenameSheetController.m @@ -1,9 +1,9 @@ // // FileRenameSheetController.m -// Transmission +// Transmission OG // // Created by Mitchell Livingston on 1/20/13. -// Copyright (c) 2013 The Transmission Project. All rights reserved. +// Copyright (c) 2013 The Transmission OG Project. All rights reserved. // #import "FileRenameSheetController.h" diff --git a/macosx/FilterBarController.h b/macosx/FilterBarController.h index e2bc232b84b..5b918d110d5 100644 --- a/macosx/FilterBarController.h +++ b/macosx/FilterBarController.h @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2011-2012 Transmission authors and contributors + * Copyright (c) 2011-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/FilterBarController.m b/macosx/FilterBarController.m index 7ddac1200f8..3a8269dbded 100644 --- a/macosx/FilterBarController.m +++ b/macosx/FilterBarController.m @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2011-2012 Transmission authors and contributors + * Copyright (c) 2011-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/FilterBarView.h b/macosx/FilterBarView.h index 967c3ad99e7..9a93d51e85f 100644 --- a/macosx/FilterBarView.h +++ b/macosx/FilterBarView.h @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2011-2012 Transmission authors and contributors + * Copyright (c) 2011-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/FilterBarView.m b/macosx/FilterBarView.m index 0bfda1e0372..73c099b3278 100644 --- a/macosx/FilterBarView.m +++ b/macosx/FilterBarView.m @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2011-2012 Transmission authors and contributors + * Copyright (c) 2011-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/FilterButton.h b/macosx/FilterButton.h index 8cd6f3804e5..8183543efa1 100644 --- a/macosx/FilterButton.h +++ b/macosx/FilterButton.h @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2007-2012 Transmission authors and contributors + * Copyright (c) 2007-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/FilterButton.m b/macosx/FilterButton.m index 1a0c6e5a383..508967eb454 100644 --- a/macosx/FilterButton.m +++ b/macosx/FilterButton.m @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2007-2012 Transmission authors and contributors + * Copyright (c) 2007-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/GlobalOptionsPopoverViewController.h b/macosx/GlobalOptionsPopoverViewController.h index 70979201c2c..e1533dff5ed 100644 --- a/macosx/GlobalOptionsPopoverViewController.h +++ b/macosx/GlobalOptionsPopoverViewController.h @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2011-2012 Transmission authors and contributors + * Copyright (c) 2011-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/GlobalOptionsPopoverViewController.m b/macosx/GlobalOptionsPopoverViewController.m index 76992756760..47aca9d8b65 100644 --- a/macosx/GlobalOptionsPopoverViewController.m +++ b/macosx/GlobalOptionsPopoverViewController.m @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2011-2012 Transmission authors and contributors + * Copyright (c) 2011-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/GroupToolbarItem.h b/macosx/GroupToolbarItem.h index c5d4e531230..1b6f12cc8e6 100644 --- a/macosx/GroupToolbarItem.h +++ b/macosx/GroupToolbarItem.h @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2007-2012 Transmission authors and contributors + * Copyright (c) 2007-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/GroupToolbarItem.m b/macosx/GroupToolbarItem.m index df8f8f76c0a..99b57cb230f 100644 --- a/macosx/GroupToolbarItem.m +++ b/macosx/GroupToolbarItem.m @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2007-2012 Transmission authors and contributors + * Copyright (c) 2007-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/GroupsController.h b/macosx/GroupsController.h index 37f97b0af3f..4f8f54f85ea 100644 --- a/macosx/GroupsController.h +++ b/macosx/GroupsController.h @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2007-2012 Transmission authors and contributors + * Copyright (c) 2007-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/GroupsController.m b/macosx/GroupsController.m index cf7785adfbe..1868558c715 100644 --- a/macosx/GroupsController.m +++ b/macosx/GroupsController.m @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2007-2012 Transmission authors and contributors + * Copyright (c) 2007-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/GroupsPrefsController.h b/macosx/GroupsPrefsController.h index 52d275073e8..068f3e46d1b 100644 --- a/macosx/GroupsPrefsController.h +++ b/macosx/GroupsPrefsController.h @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2007-2012 Transmission authors and contributors + * Copyright (c) 2007-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/GroupsPrefsController.m b/macosx/GroupsPrefsController.m index f48b188ba9a..b4726aa2d71 100644 --- a/macosx/GroupsPrefsController.m +++ b/macosx/GroupsPrefsController.m @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2007-2012 Transmission authors and contributors + * Copyright (c) 2007-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/Info.plist b/macosx/Info.plist index a1c1355bb0f..872e123e0ac 100644 --- a/macosx/Info.plist +++ b/macosx/Info.plist @@ -26,13 +26,13 @@ CFBundleExecutable - Transmission + TransmissionOG CFBundleGetInfoString VERSION_STRING_INFOPLIST (VCS_REVISION_NUM) CFBundleHelpBookFolder TransmissionHelp CFBundleHelpBookName - Transmission Help + Transmission OG Help CFBundleIconFile Transmission CFBundleIdentifier @@ -40,7 +40,7 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleName - Transmission + TransmissionOG CFBundlePackageType APPL CFBundleShortVersionString @@ -72,7 +72,7 @@ NSHumanReadableCopyright - Copyright © 2005-2020 The Transmission Project + Copyright © 2005-2023 The Transmission OG Project NSMainNibFile MainMenu NSPrincipalClass @@ -81,7 +81,7 @@ NSPortName - Transmission + Transmission OG NSSendTypes NSStringPboardType diff --git a/macosx/Info.plist.in b/macosx/Info.plist.in index d404af23744..bfecdab6f43 100644 --- a/macosx/Info.plist.in +++ b/macosx/Info.plist.in @@ -26,13 +26,13 @@ CFBundleExecutable - Transmission + TransmissionOG CFBundleGetInfoString @TR_USER_AGENT_PREFIX@ (@TR_VCS_REVISION@) CFBundleHelpBookFolder TransmissionHelp CFBundleHelpBookName - Transmission Help + Transmission OG Help CFBundleIconFile Transmission CFBundleIdentifier @@ -40,7 +40,7 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleName - Transmission + TransmissionOG CFBundlePackageType APPL CFBundleShortVersionString @@ -72,7 +72,7 @@ NSHumanReadableCopyright - Copyright © 2005-2020 The Transmission Project + Copyright © 2005-2023 The Transmission OG Project NSMainNibFile MainMenu NSPrincipalClass @@ -81,7 +81,7 @@ NSPortName - Transmission + Transmission OG NSSendTypes NSStringPboardType @@ -91,14 +91,6 @@ NSSupportsAutomaticGraphicsSwitching - SUAllowsAutomaticUpdates - - SUFeedURL - https://update.transmissionbt.com/appcast.xml - SUPublicDSAKeyFile - sparkle_dsa_pub.pem - SUScheduledCheckInterval - 86400 UTExportedTypeDeclarations diff --git a/macosx/InfoActivityViewController.h b/macosx/InfoActivityViewController.h index 487d272111a..dcffb3ac428 100644 --- a/macosx/InfoActivityViewController.h +++ b/macosx/InfoActivityViewController.h @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2010-2012 Transmission authors and contributors + * Copyright (c) 2010-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/InfoActivityViewController.m b/macosx/InfoActivityViewController.m index 0bf6b54b008..f12edc4d353 100644 --- a/macosx/InfoActivityViewController.m +++ b/macosx/InfoActivityViewController.m @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2010-2012 Transmission authors and contributors + * Copyright (c) 2010-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/InfoFileViewController.h b/macosx/InfoFileViewController.h index 3e313fcd868..b44eed35146 100644 --- a/macosx/InfoFileViewController.h +++ b/macosx/InfoFileViewController.h @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2010-2012 Transmission authors and contributors + * Copyright (c) 2010-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/InfoFileViewController.m b/macosx/InfoFileViewController.m index bffdd34c3df..ced94add387 100644 --- a/macosx/InfoFileViewController.m +++ b/macosx/InfoFileViewController.m @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2010-2012 Transmission authors and contributors + * Copyright (c) 2010-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/InfoGeneralViewController.h b/macosx/InfoGeneralViewController.h index 171f31fc4e3..c04874b66e2 100644 --- a/macosx/InfoGeneralViewController.h +++ b/macosx/InfoGeneralViewController.h @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2010-2012 Transmission authors and contributors + * Copyright (c) 2010-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/InfoGeneralViewController.m b/macosx/InfoGeneralViewController.m index 8e63a5a9a8e..fed64a3883d 100644 --- a/macosx/InfoGeneralViewController.m +++ b/macosx/InfoGeneralViewController.m @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2010-2012 Transmission authors and contributors + * Copyright (c) 2010-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/InfoOptionsViewController.h b/macosx/InfoOptionsViewController.h index 517e47a74ec..389947c65d7 100644 --- a/macosx/InfoOptionsViewController.h +++ b/macosx/InfoOptionsViewController.h @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2010-2012 Transmission authors and contributors + * Copyright (c) 2010-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/InfoOptionsViewController.m b/macosx/InfoOptionsViewController.m index 85af3fc5be1..822a7482445 100644 --- a/macosx/InfoOptionsViewController.m +++ b/macosx/InfoOptionsViewController.m @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2010-2012 Transmission authors and contributors + * Copyright (c) 2010-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/InfoPeersViewController.h b/macosx/InfoPeersViewController.h index 4874c0c9964..137225b0b96 100644 --- a/macosx/InfoPeersViewController.h +++ b/macosx/InfoPeersViewController.h @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2010-2012 Transmission authors and contributors + * Copyright (c) 2010-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/InfoPeersViewController.m b/macosx/InfoPeersViewController.m index eb274a0f703..169fb9ff813 100644 --- a/macosx/InfoPeersViewController.m +++ b/macosx/InfoPeersViewController.m @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2010-2012 Transmission authors and contributors + * Copyright (c) 2010-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/InfoTabButtonBack.h b/macosx/InfoTabButtonBack.h index 45c1d11098d..c33cccca354 100644 --- a/macosx/InfoTabButtonBack.h +++ b/macosx/InfoTabButtonBack.h @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2011-2012 Transmission authors and contributors + * Copyright (c) 2011-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/InfoTabButtonBack.m b/macosx/InfoTabButtonBack.m index 5aa83e46ec6..71fe810541f 100644 --- a/macosx/InfoTabButtonBack.m +++ b/macosx/InfoTabButtonBack.m @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2011-2012 Transmission authors and contributors + * Copyright (c) 2011-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/InfoTabButtonCell.h b/macosx/InfoTabButtonCell.h index fed93ef9b42..98541b462d7 100644 --- a/macosx/InfoTabButtonCell.h +++ b/macosx/InfoTabButtonCell.h @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2007-2012 Transmission authors and contributors + * Copyright (c) 2007-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/InfoTabButtonCell.m b/macosx/InfoTabButtonCell.m index c64d93d9e94..4590699eb86 100644 --- a/macosx/InfoTabButtonCell.m +++ b/macosx/InfoTabButtonCell.m @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2007-2012 Transmission authors and contributors + * Copyright (c) 2007-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/InfoTabMatrix.h b/macosx/InfoTabMatrix.h index 5c01357260a..f78c9e86a87 100644 --- a/macosx/InfoTabMatrix.h +++ b/macosx/InfoTabMatrix.h @@ -1,9 +1,9 @@ // // InfoTabMatrix.h -// Transmission +// Transmission OG // // Created by Mitchell Livingston on 12/21/18. -// Copyright © 2018 The Transmission Project. All rights reserved. +// Copyright © 2018 The Transmission OG Project. All rights reserved. // #import diff --git a/macosx/InfoTabMatrix.m b/macosx/InfoTabMatrix.m index a9c4bd8a78a..92ee9fd7d2e 100644 --- a/macosx/InfoTabMatrix.m +++ b/macosx/InfoTabMatrix.m @@ -1,9 +1,9 @@ // // InfoTabMatrix.m -// Transmission +// Transmission OG // // Created by Mitchell Livingston on 12/21/18. -// Copyright © 2018 The Transmission Project. All rights reserved. +// Copyright © 2018 The Transmission OG Project. All rights reserved. // #import "InfoTabMatrix.h" diff --git a/macosx/InfoTextField.h b/macosx/InfoTextField.h index 67313b4dff3..9b3f67f2dc0 100644 --- a/macosx/InfoTextField.h +++ b/macosx/InfoTextField.h @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2009-2012 Transmission authors and contributors + * Copyright (c) 2009-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/InfoTextField.m b/macosx/InfoTextField.m index d4ee82930ab..7b6f8d24748 100644 --- a/macosx/InfoTextField.m +++ b/macosx/InfoTextField.m @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2009-2012 Transmission authors and contributors + * Copyright (c) 2009-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/InfoTrackersViewController.h b/macosx/InfoTrackersViewController.h index a46b6f24fb3..3c744311940 100644 --- a/macosx/InfoTrackersViewController.h +++ b/macosx/InfoTrackersViewController.h @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2010-2012 Transmission authors and contributors + * Copyright (c) 2010-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/InfoTrackersViewController.m b/macosx/InfoTrackersViewController.m index ed333d8aac1..89c585f2296 100644 --- a/macosx/InfoTrackersViewController.m +++ b/macosx/InfoTrackersViewController.m @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2010-2012 Transmission authors and contributors + * Copyright (c) 2010-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -359,13 +359,13 @@ - (void) removeTrackers { [alert setMessageText: [NSString stringWithFormat: NSLocalizedString(@"Are you sure you want to remove %d trackers?", "Remove trackers alert -> title"), removeTrackerCount]]; - [alert setInformativeText: NSLocalizedString(@"Once removed, Transmission will no longer attempt to contact them." + [alert setInformativeText: NSLocalizedString(@"Once removed, Transmission OG will no longer attempt to contact them." " This cannot be undone.", "Remove trackers alert -> message")]; } else { [alert setMessageText: NSLocalizedString(@"Are you sure you want to remove this tracker?", "Remove trackers alert -> title")]; - [alert setInformativeText: NSLocalizedString(@"Once removed, Transmission will no longer attempt to contact it." + [alert setInformativeText: NSLocalizedString(@"Once removed, Transmission OG will no longer attempt to contact it." " This cannot be undone.", "Remove trackers alert -> message")]; } diff --git a/macosx/InfoViewController.h b/macosx/InfoViewController.h index 2fdb3fdebcf..8aa08566126 100644 --- a/macosx/InfoViewController.h +++ b/macosx/InfoViewController.h @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2010-2012 Transmission authors and contributors + * Copyright (c) 2010-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/InfoWindowController.h b/macosx/InfoWindowController.h index f14e1a591f5..b8cff17a079 100644 --- a/macosx/InfoWindowController.h +++ b/macosx/InfoWindowController.h @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2006-2012 Transmission authors and contributors + * Copyright (c) 2006-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/InfoWindowController.m b/macosx/InfoWindowController.m index 07c42519b54..07e64d29aab 100644 --- a/macosx/InfoWindowController.m +++ b/macosx/InfoWindowController.m @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2006-2012 Transmission authors and contributors + * Copyright (c) 2006-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/Makefile.am b/macosx/Makefile.am index 27abb77b668..acebb5f5f1e 100644 --- a/macosx/Makefile.am +++ b/macosx/Makefile.am @@ -183,16 +183,16 @@ clean-local: endif define PACKAGE_RULE1 - $(RM) tmp "Transmission $(VERSION_PACKAGE)" \ - Transmission-$(VERSION_PACKAGE).dmg + $(RM) tmp "TransmissionOG $(VERSION_PACKAGE)" \ + TransmissionOG-$(VERSION_PACKAGE).dmg mkdir -p tmp - cp -R macosx/Transmission.app tmp/ + cp -R macosx/TransmissionOG.app tmp/ endef define PACKAGE_RULE2 - mv tmp "Transmission $(VERSION_PACKAGE)" + mv tmp "TransmissionOG $(VERSION_PACKAGE)" hdiutil create -format UDZO -imagekey zlib-level=9 -srcfolder \ - "Transmission $(VERSION_PACKAGE)" Transmission-$(VERSION_PACKAGE).dmg - rm -rf "Transmission $(VERSION_PACKAGE)" + "TransmissionOG $(VERSION_PACKAGE)" TransmissionOG-$(VERSION_PACKAGE).dmg + rm -rf "TransmissionOG $(VERSION_PACKAGE)" endef package: @@ -201,5 +201,5 @@ package: package-release: $(PACKAGE_RULE1) - strip -S tmp/Transmission.app/Contents/MacOS/Transmission + strip -S tmp/TransmissionOG.app/Contents/MacOS/TransmissionOG $(PACKAGE_RULE2) diff --git a/macosx/Makefile.in b/macosx/Makefile.in index 5709c52007f..fb847f71b5e 100644 --- a/macosx/Makefile.in +++ b/macosx/Makefile.in @@ -724,16 +724,16 @@ dist-hook: @BUILD_MAC_TRUE@ @(cd .. && xcodebuild -alltargets -activeconfiguration clean | grep -v "^$$") define PACKAGE_RULE1 - $(RM) tmp "Transmission $(VERSION_PACKAGE)" \ - Transmission-$(VERSION_PACKAGE).dmg + $(RM) tmp "TransmissionOG $(VERSION_PACKAGE)" \ + TransmissionOG-$(VERSION_PACKAGE).dmg mkdir -p tmp - cp -R macosx/Transmission.app tmp/ + cp -R macosx/TransmissionOG.app tmp/ endef define PACKAGE_RULE2 - mv tmp "Transmission $(VERSION_PACKAGE)" + mv tmp "TransmissionOG $(VERSION_PACKAGE)" hdiutil create -format UDZO -imagekey zlib-level=9 -srcfolder \ - "Transmission $(VERSION_PACKAGE)" Transmission-$(VERSION_PACKAGE).dmg - rm -rf "Transmission $(VERSION_PACKAGE)" + "TransmissionOG $(VERSION_PACKAGE)" TransmissionOG-$(VERSION_PACKAGE).dmg + rm -rf "TransmissionOG $(VERSION_PACKAGE)" endef package: @@ -742,7 +742,7 @@ package: package-release: $(PACKAGE_RULE1) - strip -S tmp/Transmission.app/Contents/MacOS/Transmission + strip -S tmp/TransmissionOG.app/Contents/MacOS/TransmissionOG $(PACKAGE_RULE2) # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/macosx/MessageWindowController.h b/macosx/MessageWindowController.h index ebe1c7a49eb..b90cd2e9fe4 100644 --- a/macosx/MessageWindowController.h +++ b/macosx/MessageWindowController.h @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2006-2012 Transmission authors and contributors + * Copyright (c) 2006-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/MessageWindowController.m b/macosx/MessageWindowController.m index 5c00c8e7d2c..9954234a464 100644 --- a/macosx/MessageWindowController.m +++ b/macosx/MessageWindowController.m @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2006-2012 Transmission authors and contributors + * Copyright (c) 2006-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/NSApplicationAdditions.h b/macosx/NSApplicationAdditions.h index ae735e9c73d..5bc480bbb95 100644 --- a/macosx/NSApplicationAdditions.h +++ b/macosx/NSApplicationAdditions.h @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2009-2012 Transmission authors and contributors + * Copyright (c) 2009-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/NSApplicationAdditions.m b/macosx/NSApplicationAdditions.m index 53c35e67aeb..d35f28f46f4 100644 --- a/macosx/NSApplicationAdditions.m +++ b/macosx/NSApplicationAdditions.m @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2009-2012 Transmission authors and contributors + * Copyright (c) 2009-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/NSImageAdditions.h b/macosx/NSImageAdditions.h index f858789faa5..cfab6934d70 100644 --- a/macosx/NSImageAdditions.h +++ b/macosx/NSImageAdditions.h @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2011-2012 Transmission authors and contributors + * Copyright (c) 2011-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/NSImageAdditions.m b/macosx/NSImageAdditions.m index 95de01ef8e0..c03ad7f5c9d 100644 --- a/macosx/NSImageAdditions.m +++ b/macosx/NSImageAdditions.m @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2011-2012 Transmission authors and contributors + * Copyright (c) 2011-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/NSMutableArrayAdditions.h b/macosx/NSMutableArrayAdditions.h index e39fcb19a38..d19e015c542 100644 --- a/macosx/NSMutableArrayAdditions.h +++ b/macosx/NSMutableArrayAdditions.h @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2011-2012 Transmission authors and contributors + * Copyright (c) 2011-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/NSMutableArrayAdditions.m b/macosx/NSMutableArrayAdditions.m index 27602d5cc48..449003afbb9 100644 --- a/macosx/NSMutableArrayAdditions.m +++ b/macosx/NSMutableArrayAdditions.m @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2011-2012 Transmission authors and contributors + * Copyright (c) 2011-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/NSStringAdditions.h b/macosx/NSStringAdditions.h index e3d931ce060..abe1bbadfaf 100644 --- a/macosx/NSStringAdditions.h +++ b/macosx/NSStringAdditions.h @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2005-2019 Transmission authors and contributors + * Copyright (c) 2005-2019 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/NSStringAdditions.m b/macosx/NSStringAdditions.m index 95b5d1118ed..503518c30c8 100644 --- a/macosx/NSStringAdditions.m +++ b/macosx/NSStringAdditions.m @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2005-2019 Transmission authors and contributors + * Copyright (c) 2005-2019 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/PeerProgressIndicatorCell.h b/macosx/PeerProgressIndicatorCell.h index ecc703b52df..7ea133418fe 100644 --- a/macosx/PeerProgressIndicatorCell.h +++ b/macosx/PeerProgressIndicatorCell.h @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2007-2012 Transmission authors and contributors + * Copyright (c) 2007-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/PeerProgressIndicatorCell.m b/macosx/PeerProgressIndicatorCell.m index bbfff633b2e..3c9ec0ac038 100644 --- a/macosx/PeerProgressIndicatorCell.m +++ b/macosx/PeerProgressIndicatorCell.m @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2007-2012 Transmission authors and contributors + * Copyright (c) 2007-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/PeerTableView.h b/macosx/PeerTableView.h index 02bc9e86659..ab16eb0f7a0 100644 --- a/macosx/PeerTableView.h +++ b/macosx/PeerTableView.h @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2007-2012 Transmission authors and contributors + * Copyright (c) 2007-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/PeerTableView.m b/macosx/PeerTableView.m index 4dd203dce33..cece2eb3a9d 100644 --- a/macosx/PeerTableView.m +++ b/macosx/PeerTableView.m @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2007-2012 Transmission authors and contributors + * Copyright (c) 2007-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/PiecesView.h b/macosx/PiecesView.h index c8280a79fae..158e19ab102 100644 --- a/macosx/PiecesView.h +++ b/macosx/PiecesView.h @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2006-2012 Transmission authors and contributors + * Copyright (c) 2006-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/PiecesView.m b/macosx/PiecesView.m index 0a86b6ed703..141617d90ae 100644 --- a/macosx/PiecesView.m +++ b/macosx/PiecesView.m @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2006-2012 Transmission authors and contributors + * Copyright (c) 2006-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/PortChecker.h b/macosx/PortChecker.h index 9f34da8c6e4..61063def1fd 100644 --- a/macosx/PortChecker.h +++ b/macosx/PortChecker.h @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2006-2012 Transmission authors and contributors + * Copyright (c) 2006-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/PortChecker.m b/macosx/PortChecker.m index ec474904b42..c4b8ce6093e 100644 --- a/macosx/PortChecker.m +++ b/macosx/PortChecker.m @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2006-2012 Transmission authors and contributors + * Copyright (c) 2006-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/PredicateEditorRowTemplateAny.h b/macosx/PredicateEditorRowTemplateAny.h index 0a960a8f936..6bbd8c78563 100644 --- a/macosx/PredicateEditorRowTemplateAny.h +++ b/macosx/PredicateEditorRowTemplateAny.h @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2009-2012 Transmission authors and contributors + * Copyright (c) 2009-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/PredicateEditorRowTemplateAny.m b/macosx/PredicateEditorRowTemplateAny.m index 57fca0f96eb..d4faef8925f 100644 --- a/macosx/PredicateEditorRowTemplateAny.m +++ b/macosx/PredicateEditorRowTemplateAny.m @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2009-2012 Transmission authors and contributors + * Copyright (c) 2009-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/PrefsController.h b/macosx/PrefsController.h index 3717e7c2c6b..4a7544f7465 100644 --- a/macosx/PrefsController.h +++ b/macosx/PrefsController.h @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2005-2019 Transmission authors and contributors + * Copyright (c) 2005-2019 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/PrefsController.m b/macosx/PrefsController.m index 5be411dd096..f99e3cdfbe7 100644 --- a/macosx/PrefsController.m +++ b/macosx/PrefsController.m @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2005-2019 Transmission authors and contributors + * Copyright (c) 2005-2019 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -729,7 +729,6 @@ - (void) resetWarnings: (id) sender [fDefaults removeObjectForKey: @"WarningRemoveTrackers"]; [fDefaults removeObjectForKey: @"WarningInvalidOpen"]; [fDefaults removeObjectForKey: @"WarningRemoveCompleted"]; - [fDefaults removeObjectForKey: @"WarningDonate"]; //[fDefaults removeObjectForKey: @"WarningLegal"]; } diff --git a/macosx/PrefsWindow.h b/macosx/PrefsWindow.h index 39470b77dac..e4c34241b88 100644 --- a/macosx/PrefsWindow.h +++ b/macosx/PrefsWindow.h @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2006-2012 Transmission authors and contributors + * Copyright (c) 2006-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/PrefsWindow.m b/macosx/PrefsWindow.m index d7a4fc259ad..9ca3adab96b 100644 --- a/macosx/PrefsWindow.m +++ b/macosx/PrefsWindow.m @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2006-2012 Transmission authors and contributors + * Copyright (c) 2006-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/ProgressGradients.h b/macosx/ProgressGradients.h index eb0d0883c12..bc0cb80e6a7 100644 --- a/macosx/ProgressGradients.h +++ b/macosx/ProgressGradients.h @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2007-2012 Transmission authors and contributors + * Copyright (c) 2007-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/ProgressGradients.m b/macosx/ProgressGradients.m index 7926bd2fe38..c66ab8871e7 100644 --- a/macosx/ProgressGradients.m +++ b/macosx/ProgressGradients.m @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2007-2012 Transmission authors and contributors + * Copyright (c) 2007-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/QuickLookPlugin/Info.plist.in b/macosx/QuickLookPlugin/Info.plist.in index adf31ca7344..57325e505e4 100644 --- a/macosx/QuickLookPlugin/Info.plist.in +++ b/macosx/QuickLookPlugin/Info.plist.in @@ -47,7 +47,7 @@ CFPlugInUnloadFunction NSHumanReadableCopyright - Copyright © 2005-2020 The Transmission Project + Copyright © 2005-2023 The Transmission OG Project QLNeedsToBeRunInMainThread QLPreviewHeight diff --git a/macosx/QuickLookPlugin/QuickLookPlugin-Info.plist b/macosx/QuickLookPlugin/QuickLookPlugin-Info.plist index 92d598855ca..6d82ed7dc6c 100644 --- a/macosx/QuickLookPlugin/QuickLookPlugin-Info.plist +++ b/macosx/QuickLookPlugin/QuickLookPlugin-Info.plist @@ -49,7 +49,7 @@ CFPlugInUnloadFunction NSHumanReadableCopyright - Copyright © 2005-2020 The Transmission Project + Copyright © 2005-2023 The Transmission OG Project QLNeedsToBeRunInMainThread QLPreviewHeight diff --git a/macosx/ShareToolbarItem.h b/macosx/ShareToolbarItem.h index 456275866f0..79dbe35e959 100644 --- a/macosx/ShareToolbarItem.h +++ b/macosx/ShareToolbarItem.h @@ -1,9 +1,9 @@ // // ShareButtonToolbarItem.h -// Transmission +// Transmission OG // // Created by Mitchell Livingston on 1/8/14. -// Copyright (c) 2014 The Transmission Project. All rights reserved. +// Copyright (c) 2014 The Transmission OG Project. All rights reserved. // #import "ButtonToolbarItem.h" diff --git a/macosx/ShareToolbarItem.m b/macosx/ShareToolbarItem.m index 450264770a7..7ddab5a25f7 100644 --- a/macosx/ShareToolbarItem.m +++ b/macosx/ShareToolbarItem.m @@ -1,9 +1,9 @@ // // ShareToolbarItem.m -// Transmission +// Transmission OG // // Created by Mitchell Livingston on 1/8/14. -// Copyright (c) 2014 The Transmission Project. All rights reserved. +// Copyright (c) 2014 The Transmission OG Project. All rights reserved. // #import "ShareToolbarItem.h" diff --git a/macosx/ShareTorrentFileHelper.h b/macosx/ShareTorrentFileHelper.h index 52d1a1559a9..0feb6cbb50a 100644 --- a/macosx/ShareTorrentFileHelper.h +++ b/macosx/ShareTorrentFileHelper.h @@ -1,9 +1,9 @@ // // ShareTorrentFileHelper.h -// Transmission +// Transmission OG // // Created by Mitchell Livingston on 1/10/14. -// Copyright (c) 2014 The Transmission Project. All rights reserved. +// Copyright (c) 2014 The Transmission OG Project. All rights reserved. // #import diff --git a/macosx/ShareTorrentFileHelper.m b/macosx/ShareTorrentFileHelper.m index fe4d1c47d00..15110c9ee72 100644 --- a/macosx/ShareTorrentFileHelper.m +++ b/macosx/ShareTorrentFileHelper.m @@ -3,7 +3,7 @@ // Transmission // // Created by Mitchell Livingston on 1/10/14. -// Copyright (c) 2014 The Transmission Project. All rights reserved. +// Copyright (c) 2014 The Transmission OG Project. All rights reserved. // #import "ShareTorrentFileHelper.h" diff --git a/macosx/StatsWindowController.h b/macosx/StatsWindowController.h index 3028871e0a5..8a1580ec699 100644 --- a/macosx/StatsWindowController.h +++ b/macosx/StatsWindowController.h @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2007-2012 Transmission authors and contributors + * Copyright (c) 2007-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/StatsWindowController.m b/macosx/StatsWindowController.m index c9f77833ee0..ebe237cb583 100644 --- a/macosx/StatsWindowController.m +++ b/macosx/StatsWindowController.m @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2007-2012 Transmission authors and contributors + * Copyright (c) 2007-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -138,7 +138,7 @@ - (void) resetStats: (id) sender NSAlert * alert = [[NSAlert alloc] init]; [alert setMessageText: NSLocalizedString(@"Are you sure you want to reset usage statistics?", "Stats reset -> title")]; - [alert setInformativeText: NSLocalizedString(@"This will clear the global statistics displayed by Transmission." + [alert setInformativeText: NSLocalizedString(@"This will clear the global statistics displayed by Transmission OG." " Individual transfer statistics will not be affected.", "Stats reset -> message")]; [alert setAlertStyle: NSWarningAlertStyle]; [alert addButtonWithTitle: NSLocalizedString(@"Reset", "Stats reset -> button")]; diff --git a/macosx/StatusBarController.h b/macosx/StatusBarController.h index cc85e998e5b..8c7d1993196 100644 --- a/macosx/StatusBarController.h +++ b/macosx/StatusBarController.h @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2011-2012 Transmission authors and contributors + * Copyright (c) 2011-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/StatusBarController.m b/macosx/StatusBarController.m index 22c965aa62f..dd820b7abf2 100644 --- a/macosx/StatusBarController.m +++ b/macosx/StatusBarController.m @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2011-2012 Transmission authors and contributors + * Copyright (c) 2011-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/StatusBarView.h b/macosx/StatusBarView.h index 35529dfb62e..4b4a47b73d4 100644 --- a/macosx/StatusBarView.h +++ b/macosx/StatusBarView.h @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2006-2012 Transmission authors and contributors + * Copyright (c) 2006-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/StatusBarView.m b/macosx/StatusBarView.m index ce890486c92..8b738a8dca7 100644 --- a/macosx/StatusBarView.m +++ b/macosx/StatusBarView.m @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2006-2012 Transmission authors and contributors + * Copyright (c) 2006-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/ToolbarSegmentedCell.h b/macosx/ToolbarSegmentedCell.h index 56c56ae0532..49fac16cc2b 100644 --- a/macosx/ToolbarSegmentedCell.h +++ b/macosx/ToolbarSegmentedCell.h @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2007-2012 Transmission authors and contributors + * Copyright (c) 2007-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/ToolbarSegmentedCell.m b/macosx/ToolbarSegmentedCell.m index d65b472dd0f..e850bc0958e 100644 --- a/macosx/ToolbarSegmentedCell.m +++ b/macosx/ToolbarSegmentedCell.m @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2007-2012 Transmission authors and contributors + * Copyright (c) 2007-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/Torrent.h b/macosx/Torrent.h index 09d8a7103e5..e7015b74347 100644 --- a/macosx/Torrent.h +++ b/macosx/Torrent.h @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2006-2012 Transmission authors and contributors + * Copyright (c) 2006-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/Torrent.m b/macosx/Torrent.m index 83db10b5a61..4e903ac047b 100644 --- a/macosx/Torrent.m +++ b/macosx/Torrent.m @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2006-2012 Transmission authors and contributors + * Copyright (c) 2006-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/TorrentCell.h b/macosx/TorrentCell.h index f80b0059a44..c57f66df007 100644 --- a/macosx/TorrentCell.h +++ b/macosx/TorrentCell.h @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2006-2012 Transmission authors and contributors + * Copyright (c) 2006-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/TorrentCell.m b/macosx/TorrentCell.m index ffebb7116a5..674a79219ba 100644 --- a/macosx/TorrentCell.m +++ b/macosx/TorrentCell.m @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2006-2012 Transmission authors and contributors + * Copyright (c) 2006-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/TorrentGroup.h b/macosx/TorrentGroup.h index 066dcc5a43e..4f509115db0 100644 --- a/macosx/TorrentGroup.h +++ b/macosx/TorrentGroup.h @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2008-2012 Transmission authors and contributors + * Copyright (c) 2008-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/TorrentGroup.m b/macosx/TorrentGroup.m index 4c6601bba5b..112898b1929 100644 --- a/macosx/TorrentGroup.m +++ b/macosx/TorrentGroup.m @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2008-2012 Transmission authors and contributors + * Copyright (c) 2008-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/TorrentTableView.h b/macosx/TorrentTableView.h index 0cae5b0e97b..ea6709a808e 100644 --- a/macosx/TorrentTableView.h +++ b/macosx/TorrentTableView.h @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2005-2019 Transmission authors and contributors + * Copyright (c) 2005-2019 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/TorrentTableView.m b/macosx/TorrentTableView.m index ad0f5ac41eb..15fe6dbefe9 100644 --- a/macosx/TorrentTableView.m +++ b/macosx/TorrentTableView.m @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2005-2019 Transmission authors and contributors + * Copyright (c) 2005-2019 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/TrackerCell.h b/macosx/TrackerCell.h index 8d2bfd26c21..12c67bcaff9 100644 --- a/macosx/TrackerCell.h +++ b/macosx/TrackerCell.h @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2009-2012 Transmission authors and contributors + * Copyright (c) 2009-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/TrackerCell.m b/macosx/TrackerCell.m index 3c372136025..50914e95585 100644 --- a/macosx/TrackerCell.m +++ b/macosx/TrackerCell.m @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2009-2012 Transmission authors and contributors + * Copyright (c) 2009-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/TrackerNode.h b/macosx/TrackerNode.h index e4002fc8a54..88189c7eaca 100644 --- a/macosx/TrackerNode.h +++ b/macosx/TrackerNode.h @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2009-2012 Transmission authors and contributors + * Copyright (c) 2009-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/TrackerNode.m b/macosx/TrackerNode.m index f5feaf0da1a..aab6dba40b5 100644 --- a/macosx/TrackerNode.m +++ b/macosx/TrackerNode.m @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2009-2012 Transmission authors and contributors + * Copyright (c) 2009-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/TrackerTableView.h b/macosx/TrackerTableView.h index 5a33c95b6f4..ffd6e0bf75e 100644 --- a/macosx/TrackerTableView.h +++ b/macosx/TrackerTableView.h @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2008-2012 Transmission authors and contributors + * Copyright (c) 2008-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/TrackerTableView.m b/macosx/TrackerTableView.m index 181dc01f150..de9199fb3d5 100644 --- a/macosx/TrackerTableView.m +++ b/macosx/TrackerTableView.m @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2008-2012 Transmission authors and contributors + * Copyright (c) 2008-2012 Transmission OG authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/macosx/TransmissionHelp/html/FAQ.html b/macosx/TransmissionHelp/html/FAQ.html index 85725fcdca8..f51b5d921ce 100644 --- a/macosx/TransmissionHelp/html/FAQ.html +++ b/macosx/TransmissionHelp/html/FAQ.html @@ -10,7 +10,7 @@ \ No newline at end of file diff --git a/macosx/TransmissionHelp/html/remote.html b/macosx/TransmissionHelp/html/remote.html index 96c2f00211d..b072ffd3535 100644 --- a/macosx/TransmissionHelp/html/remote.html +++ b/macosx/TransmissionHelp/html/remote.html @@ -11,7 +11,7 @@