Remove RSS protocol

11 files changed, 2 insertions, 53 deletions

diff --git a/resources/images/images.properties b/resources/images/images.properties
index 1af5fe5..7b9e6a3 100644
--- a/resources/images/images.properties
+++ b/resources/images/images.properties
@@ -419,13 +419,6 @@ service.protocol.ssh.CONNECTING_ICON=resources/images/protocol/ssh/ssh-connectin
 service.protocol.ssh.CONNECTED_ICON=resources/images/protocol/ssh/ssh-connected.png
 service.protocol.ssh.FILE_TRANSFER_ICON=resources/images/protocol/ssh/ssh-filetransfer.png
 
-# rss accregwizz
-service.protocol.rss.RSS_16x16=resources/images/protocol/rss/rss-online.png
-service.protocol.rss.RSS_32x32=resources/images/protocol/rss/rss32x32.png
-service.protocol.rss.RSS_48x48=resources/images/protocol/rss/rss48x48.png
-service.protocol.rss.RSS_64x64=resources/images/protocol/rss/rss64x64.png
-service.protocol.rss.OFFLINE_STATUS_ICON=resources/images/protocol/rss/rss-offline.png
-
 # sip protocol icons
 service.protocol.sip.SIP_16x16=resources/images/protocol/sip/sip16x16.png
 service.protocol.sip.SIP_64x64=resources/images/protocol/sip/sip64x64.png
diff --git a/resources/images/protocol/rss/rss-offline.png b/resources/images/protocol/rss/rss-offline.png
deleted file mode 100644
index e7cd8f3..0000000
--- a/resources/images/protocol/rss/rss-offline.png
+++ /dev/null
diff --git a/resources/images/protocol/rss/rss-online.png b/resources/images/protocol/rss/rss-online.png
deleted file mode 100644
index 62907e2..0000000
--- a/resources/images/protocol/rss/rss-online.png
+++ /dev/null
diff --git a/resources/images/protocol/rss/rss32x32.png b/resources/images/protocol/rss/rss32x32.png
deleted file mode 100644
index 329760d..0000000
--- a/resources/images/protocol/rss/rss32x32.png
+++ /dev/null
diff --git a/resources/images/protocol/rss/rss48x48.png b/resources/images/protocol/rss/rss48x48.png
deleted file mode 100644
index feb9c7a..0000000
--- a/resources/images/protocol/rss/rss48x48.png
+++ /dev/null
diff --git a/resources/images/protocol/rss/rss64x64.png b/resources/images/protocol/rss/rss64x64.png
deleted file mode 100644
index da34d1d..0000000
--- a/resources/images/protocol/rss/rss64x64.png
+++ /dev/null
diff --git a/resources/install/build.xml b/resources/install/build.xml
index bdd67a8..9594117 100644
--- a/resources/install/build.xml
+++ b/resources/install/build.xml
@@ -2258,8 +2258,6 @@
                 <exclude name="**/dictaccregwizz/**"/>
                 <exclude name="**/irc/**"/>
                 <exclude name="**/ircaccregwizz/**"/>
-                <exclude name="**/rss/**"/>
-                <exclude name="**/rssaccregwizz/**"/>
                 <exclude name="**/ssh/**"/>
                 <exclude name="**/sshaccregwizz/**"/>
                 <exclude name="**/profiler4j/**"/>
diff --git a/resources/install/debian/jitsi.1.tmpl b/resources/install/debian/jitsi.1.tmpl
index e575285..84e3d98 100644
--- a/resources/install/debian/jitsi.1.tmpl
+++ b/resources/install/debian/jitsi.1.tmpl
@@ -26,8 +26,8 @@ _PACKAGE_NAME_ \- the Java VoIP and Instant Messaging client
 .\" respectively.
 \fB_APP_NAME_\fP is an audio/video Internet phone and instant messenger
 that supports some of the most popular instant messaging and telephony
-protocols such as SIP, Jabber, AIM/ICQ, MSN, Yahoo! Messenger, Bonjour, IRC,
-RSS and soon others like IAX.
+protocols such as SIP, Jabber, AIM/ICQ, MSN, Yahoo! Messenger, Bonjour, IRC
+and soon others like IAX.
 .PP
 .RI "An optional " uri-to-call " expression can be specified to start a call from the command-line. If _APP_NAME_ is already running then the call is handled by the running application, except when it is explicitly told to allow multiple instance launch."
 .SH OPTIONS
diff --git a/resources/install/windows/SCRegistrySpec.wxi b/resources/install/windows/SCRegistrySpec.wxi
index 3894891..6876158 100644
--- a/resources/install/windows/SCRegistrySpec.wxi
+++ b/resources/install/windows/SCRegistrySpec.wxi
@@ -30,25 +30,6 @@
     </RegistryKey>

   </Component>

   <Component

-      Id="Component_FeedRegistryEntries"

-      Directory="TARGETDIR"

-      Guid="BDB06CF9-F840-4CD6-B8B1-C24AC9CD11AB">

-    <Condition><![CDATA[CREATE_FEED_REGISTRY_ENTRIES = 1]]></Condition>

-    <RegistryKey Key="feed" Root="HKCR">

-      <RegistryValue Type="string" Value="URL: RSS Protocol handler" />

-      <RegistryValue Name="URL Protocol" Type="string" Value="" />

-      <RegistryValue

-          Key="DefaultIcon"

-          Type="string"

-          Value="[INSTALLDIR]sc-logo.ico" />

-      <RegistryValue

-          Key="shell\open\command"

-          KeyPath="yes"

-          Type="string"

-          Value='"[INSTALLDIR]@APP_LAUNCHER_NAME@.exe" %1' />

-    </RegistryKey>

-  </Component>

-  <Component

       Id="Component_XmppRegistryEntries"

       Directory="TARGETDIR"

       Guid="3C9C09AE-1F57-11DE-B96D-6B8D56D89593">

diff --git a/resources/install/windows/installer-windows.wxs b/resources/install/windows/installer-windows.wxs
index aa897ce..95c1082 100644
--- a/resources/install/windows/installer-windows.wxs
+++ b/resources/install/windows/installer-windows.wxs
@@ -205,12 +205,6 @@
 

                 <Control Id="RegistryGroup" Type="GroupBox" X="20" Y="130" Width="330" Height="50" Text="!(loc.ShortcutsAndRegistryDlg_AssociateProtocols)" />

                 <Control Id="SipRegistryEntriesCheckBox" Type="CheckBox" X="25" Y="145" Width="320" Height="15" Property="CREATE_SIP_REGISTRY_ENTRIES" CheckBoxValue="1" Text="&amp;SIP" />

-<!--

-  The RSS plug-in has been removed from SIP Communicator so it no longer makes

-  sense to associate SIP Communicator with the FEED protocol.

-

-                <Control Id="FeedRegistryEntriesCheckBox" Type="CheckBox" X="25" Y="160" Width="320" Height="15" Property="CREATE_FEED_REGISTRY_ENTRIES" CheckBoxValue="1" Text="&amp;FEED" />

--->

                 <Control Id="XmppRegistryEntriesCheckBox" Type="CheckBox" X="25" Y="160" Width="320" Height="15" Property="CREATE_XMPP_REGISTRY_ENTRIES" CheckBoxValue="1" Text="&amp;XMPP" />

             </Dialog>

 

@@ -468,11 +462,6 @@
     CREATE_STARTUP_SHORTCUT to 0 in order to remove the old shortcut on update.

 -->

 <Property Id="CREATE_STARTUP_SHORTCUT" Value="0" />

-<!--

-  The RSS plug-in has been removed from SIP Communicator so it no longer makes

-  sense to associate SIP Communicator with the FEED protocol.

--->

-<Property Id="CREATE_FEED_REGISTRY_ENTRIES" Value="0" />

 <Property Id="CREATE_MSOFFICECOMM_REGISTRY_ENTRIES" Value="1" />

 <Property Id="CREATE_SIP_REGISTRY_ENTRIES" Value="1" />

 <Property Id="CREATE_XMPP_REGISTRY_ENTRIES" Value="1" />

diff --git a/resources/languages/resources.properties b/resources/languages/resources.properties
index 930fdd8..72a9e5a 100644
--- a/resources/languages/resources.properties
+++ b/resources/languages/resources.properties
@@ -1126,18 +1126,6 @@ plugin.pluginmanager.SHOW_SYSTEM_BUNDLES=Show system plug-ins
 plugin.pluginmanager.SYSTEM=System
 plugin.pluginmanager.NEW=New
 
-# rss accregwizz
-plugin.rssaccregwizz.PROTOCOL_NAME=RSS
-plugin.rssaccregwizz.PROTICOL_DESCRIPTION=Add your preferred RSS feeds into Jitsi !
-plugin.rssaccregwizz.ERROR_ACCOUNT_EXISTS=RSS account already exists!
-plugin.rssaccregwizz.ACCOUNT_INFO=This wizard will create an RSS account for you.\n\n\
-Note that you could have only one RSS account!\n\n\
-You can add RSS feeds to your contact list using the "Add contact" wizard. Fill in the contact address field with the URI of the RSS feed you would like to add.
-plugin.rssaccregwizz.ACCOUNT_INFO_TITLE=RSS Account Information
-plugin.rssaccregwizz.ACCOUNT_ATTENTION=Please read attentively the information provided below!
-plugin.rssaccregwizz.CONFIRM_ACCOUNT_REMOVAL=The following RSS feed seems to be no longer accessible. Would you like to remove it?\n\n Address: {0}
-plugin.rssaccregwizz.CONFIRM_ACCOUNT_REMOVAL_TITLE=Remove RSS feed
-
 # simple accregwizz
 plugin.simpleaccregwizz.LOGIN_USERNAME=Username
 plugin.simpleaccregwizz.INITIAL_ACCOUNT_REGISTRATION=Configure all your favorite protocols in one click.