From 3f4c0385c8bd2a992072732bc721a72cb93f35bd Mon Sep 17 00:00:00 2001
From: joss17 <joss17@users.sourceforge.net>
Date: Sat, 6 Feb 2010 21:56:26 +0000
Subject: [PATCH] removed unused settings bis

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2219 b45a01b8-16f6-495d-af2f-9b41ad6348cc
---
 .../src/gui/settings/rsettingswin.cpp          |  2 ++
 retroshare-gui/src/gui/settings/settings.ui    | 18 ------------------
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/retroshare-gui/src/gui/settings/rsettingswin.cpp b/retroshare-gui/src/gui/settings/rsettingswin.cpp
index 1ad103350..d1d83ce74 100644
--- a/retroshare-gui/src/gui/settings/rsettingswin.cpp
+++ b/retroshare-gui/src/gui/settings/rsettingswin.cpp
@@ -110,6 +110,7 @@ RSettingsWin::setNewPage(int page)
             text = tr("Appearance");
 	    pageicon->setPixmap(QPixmap(":/images/looknfeel.png"));
             break;
+        #ifndef RS_RELEASE_VERSION
         case Fileassociations:
             text = tr("File Associations");
 	    pageicon->setPixmap(QPixmap(":/images/filetype-association.png"));
@@ -118,6 +119,7 @@ RSettingsWin::setNewPage(int page)
             text = tr("Sound");
 	    pageicon->setPixmap(QPixmap(":/images/sound.png"));
             break;
+        #endif
         default:
             text = tr("UnknownPage");// impossible case
     }
diff --git a/retroshare-gui/src/gui/settings/settings.ui b/retroshare-gui/src/gui/settings/settings.ui
index 298e983de..00a914679 100755
--- a/retroshare-gui/src/gui/settings/settings.ui
+++ b/retroshare-gui/src/gui/settings/settings.ui
@@ -140,24 +140,6 @@
         <normaloff>:/images/looknfeel.png</normaloff>:/images/looknfeel.png</iconset>
       </property>
      </item>
-     <item>
-      <property name="text">
-       <string>File Associations</string>
-      </property>
-      <property name="icon">
-       <iconset resource="../images.qrc">
-        <normaloff>:/images/filetype-association.png</normaloff>:/images/filetype-association.png</iconset>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>Sound</string>
-      </property>
-      <property name="icon">
-       <iconset resource="../images.qrc">
-        <normaloff>:/images/sound.png</normaloff>:/images/sound.png</iconset>
-      </property>
-     </item>
     </widget>
    </item>
    <item row="0" column="1">