From cf79933fa4c1dc06f99b607bf95b45bbfa9fc972 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Sun, 23 Jan 2011 00:39:36 +0100
Subject: [PATCH] transmission: use our new options dialog

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 .../transmission/config/transmission.conf     | 40 -------------------
 .../transmission/init.d/58_transmission       | 14 +++++--
 packages/network/transmission/install         |  3 --
 3 files changed, 10 insertions(+), 47 deletions(-)
 delete mode 100644 packages/network/transmission/config/transmission.conf

diff --git a/packages/network/transmission/config/transmission.conf b/packages/network/transmission/config/transmission.conf
deleted file mode 100644
index 5872aa16e9..0000000000
--- a/packages/network/transmission/config/transmission.conf
+++ /dev/null
@@ -1,40 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-# transmission.conf
-
-# This configuration file allows you to setup 'Transmission' a
-# BitTorrent daemon
-
-# Start transmission at boot ( yes / no )
-  TRANSMISSION_START="no"
-
-# Allow RPC access to a comma-delimited whitelist of IP addresses.
-# Wildcards can be specified in an address by using '*'.  Default:
-# "127.0.0.1" Example: "127.0.0.*,192.168.1.*"
-  TRANSMISSION_IP="127.0.0.1,192.168.0.*"
-
-# Use authentication for the web frontend ( yes / no )
-  TRANSMISSION_AUTH="yes"
-
-# Username for logging to the webfrontend
-  TRANSMISSION_USER="openelec"
-
-# password for logging to the webfrontend
-  TRANSMISSION_PWD="openelec"
diff --git a/packages/network/transmission/init.d/58_transmission b/packages/network/transmission/init.d/58_transmission
index e2a7ad9276..8f5a2a8c24 100644
--- a/packages/network/transmission/init.d/58_transmission
+++ b/packages/network/transmission/init.d/58_transmission
@@ -22,11 +22,17 @@
 #
 # runlevels: openelec, textmode
 
-(
-  if [ -f /storage/.config/transmission.conf ]; then
-    . /storage/.config/transmission.conf
+OPENELEC_SETTINGS="$HOME/.xbmc/userdata/addon_data/os.openelec.settings/settings.xml"
 
-      if [ "$TRANSMISSION_START" = "yes" ]; then
+(
+  if [ -f "$OPENELEC_SETTINGS" ]; then
+    TRANSMISSION_START=`grep TRANSMISSION_START $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
+    TRANSMISSION_AUTH=`grep TRANSMISSION_AUTH $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
+    TRANSMISSION_USER=`grep TRANSMISSION_USER $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
+    TRANSMISSION_PWD=`grep TRANSMISSION_PWD $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
+    TRANSMISSION_IP=`grep TRANSMISSION_IP $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
+
+    if [ "$TRANSMISSION_START" = "yes" ]; then
 
       wait_for_network
 
diff --git a/packages/network/transmission/install b/packages/network/transmission/install
index 5c6bb3ed00..417efb15af 100755
--- a/packages/network/transmission/install
+++ b/packages/network/transmission/install
@@ -29,6 +29,3 @@ mkdir -p $INSTALL/usr/share/transmission/web
   cp -R $PKG_BUILD/web/* $INSTALL/usr/share/transmission/web
   find $INSTALL/usr/share/transmission/web -name "Makefile*" -exec rm -rf {} ";"
   rm -rf $INSTALL/usr/share/transmission/web/LICENSE
-
-mkdir -p $INSTALL/usr/config
-  cp $PKG_DIR/config/transmission.conf $INSTALL/usr/config