[Mldonkey-commits] mldonkey/distrib ChangeLog ed2k_mozilla/README ...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Branch:         
Changes by:     spiralvoice <address@hidden>    05/12/14 20:15:40

Modified files:
        distrib        : ChangeLog 
        distrib/ed2k_mozilla: README 
        distrib/ed2k_mozilla/src: install.js install.rdf 
        distrib/ed2k_mozilla/src/components: ed2kprotocol.js 
Added files:
        distrib/ed2k_mozilla: mldonkey_protocol_handler-1.7.xpi 
Removed files:
        distrib/ed2k_mozilla: mldonkey_protocol_handler-1.5.xpi 

Log message:
        -

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ChangeLog.diff?tr1=1.611&tr2=1.612&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ed2k_mozilla/README.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ed2k_mozilla/mldonkey_protocol_handler-1.7.xpi?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ed2k_mozilla/src/install.js.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ed2k_mozilla/src/install.rdf.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ed2k_mozilla/src/components/ed2kprotocol.js.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: mldonkey/distrib/ChangeLog
diff -u mldonkey/distrib/ChangeLog:1.611 mldonkey/distrib/ChangeLog:1.612
--- mldonkey/distrib/ChangeLog:1.611    Tue Dec 13 14:54:20 2005
+++ mldonkey/distrib/ChangeLog  Wed Dec 14 20:15:39 2005
@@ -11,6 +11,9 @@
 To compile MLDonkey on MinGW follow this guide:
 http://mldonkey.berlios.de/modules.php?name=Wiki&pagename=Windows
 
+2005/12/14
+      Mozilla MLdonkey Protocol Handler updated to version 1.7
+
 2005/12/13
       Removed orphaned files:
       src/networks/fasttrack/fasttrack.ml
Index: mldonkey/distrib/ed2k_mozilla/README
diff -u mldonkey/distrib/ed2k_mozilla/README:1.6 
mldonkey/distrib/ed2k_mozilla/README:1.7
--- mldonkey/distrib/ed2k_mozilla/README:1.6    Mon Apr 18 13:14:03 2005
+++ mldonkey/distrib/ed2k_mozilla/README        Wed Dec 14 20:15:39 2005
@@ -1,77 +1,124 @@
-Mozilla MLdonkey Protocol Handler 1.5
+Mozilla MLdonkey/eMule Protocol Handler 1.7
 Copyright (C) 2003 - 2005 Simon Peter <address@hidden>
 
 Description:
 ------------
-This is a protocol handler for Mozilla and Firefox (see www.mozilla.org) that
-forwards some link types to a running MLdonkey (see www.mldonkey.net) client.
+This is a protocol handler for Mozilla and Firefox (see
+www.mozilla.org) that forwards some link types to a running MLdonkey
+(see www.mldonkey.net) or eMule (see www.emule-project.net) client.
 
-Supported protocols are ed2k:, magnet: and sig2dat:.
+Supported protocols are ed2k:, magnet: and sig2dat:. For eMule, only
+ed2k: is supported, of course.
 
-The protocol handler is implemented in JavaScript and should run on any
-platform supported by Mozilla or Firefox.
+Also note that eMule support is still beta and has only been tested to
+work with eMule versions 0.45* and 0.46a as of yet. Please send eMule
+specific questions to Dan Fritz.
+
+The protocol handler is implemented in JavaScript and should run on
+any platform supported by Mozilla and Firefox.
+
+Prerequisites:
+--------------
+The Web interface of your Donkey client must be enabled and access for
+the host this extension should be running on must be enabled in order
+for this extension to work.
+
+For eMule, it is advised that you set your web interface template to
+default (eMule.tmpl). It may work with other templates but this has
+not been tested.
 
 Installation:
 -------------
-Just open the .xpi installer file in Mozilla/Firefox and follow the on-screen
-instructions. On a UNIX derivative system, you most likely need to start your
-browser as root to complete the installation.
-
-It is best to shutdown the browser completely by closing all open windows
-prior to restarting it as root because there may be some startup scripts used
-by your version that may just open another window instead of starting it as
-root.
-
-After having installed the package, you need to set it up. Refer to the next
-section on this topic.
-
-After setup, restart your browser and everything should be in place. Supported
-link types will automatically be forwarded to your MLdonkey when you click on
-them.
+Just open the .xpi installer file in Mozilla/Firefox and follow the
+on-screen instructions.
+
+If you are on a UNIX derivative system (e.g. Linux, BSD, MacOS X and
+the like) and like to install this extension for all users on your
+system, you most likely need to start your browser as root before the
+installation.
+
+It is best to shutdown the browser completely by closing all open
+windows prior to restarting it as root because there may be some
+startup scripts used by your version that may just open another window
+instead of starting the whole browser as root.
+
+After having installed the package, you need to set it up. Refer to
+the next section on this topic.
+
+After setup, restart your browser and everything should be in
+place. Supported link types will automatically be forwarded to your
+MLdonkey or eMule client when you click on them.
 
 Configuration:
 --------------
-The protocol handler is configurable through Mozilla's preferences scheme. The
-preferences can be set in multiple ways, depending on your browser version.
-
-For Mozilla 1.3, newer versions and Firefox, the preferences are accessible by
-visiting the URL "about:config" inside the browser. This opens a page
-containing a table of all available preference options. Right clicking on the
-table opens a menu to create, modify and reset the options. Note that the
-preference defaults of this protocol handler are internal and NOT visible
-initially in the list! To set your own preferences, you have to create them.
-
-For Mozilla versions below 1.3, you can set the preferences by creating a file
-'user.js' in your profile directory (this is $HOME/.mozilla/default/<profile>/
-on UNIX systems, where <profile> has to be replaced by some cryptic string --
-just look in that directory) and set the options there by adding lines of the
-form: user_pref("option", "value"); to it.
+The protocol handler is configurable through Mozilla's preferences
+scheme. The preferences can be set in multiple ways, depending on your
+browser version.
+
+For Mozilla 1.3, newer versions and Firefox, the preferences are
+accessible by visiting the URL "about:config" inside the browser. This
+opens a page containing a table of all available preference
+options. Right clicking on the table opens a menu to create, modify
+and reset the options. Note that the preference defaults of this
+protocol handler are internal and NOT visible initially in the list!
+To set your own preferences, you have to create them.
+
+For Mozilla versions below 1.3, you can set the preferences by
+creating a file 'user.js' in your profile directory (this is
+$HOME/.mozilla/default/<profile>/ on UNIX systems, where <profile> has
+to be replaced by some cryptic string -- just look in that directory)
+and set the options there by adding lines of the form:
+user_pref("option", "value"); to it.
 
 The following preference options are available:
 
-Option:                 Default:        Description:
--------                 --------        ------------
-network.mldonkey.server localhost       hostname on which MLdonkey is running
-network.mldonkey.port   4080            port of the MLdonkey WEB service
+Option: network.mldonkey.server
+Default: localhost
+Description: Hostname on which MLdonkey/eMule is running
+
+Option: network.mldonkey.port
+Default: 4080
+Description: Port of the MLdonkey/eMule WEB service
+
+Option: network.mldonkey.pass
+Default: (empty)
+Description: Password for eMule clients (MLdonkey is handled
+automatically by Mozilla's password manager)
+
+Option: network.mldonkey.mode
+Default: mldonkey
+Description: Donkey client to send the data to. This can be set to
+'mldonkey' or 'emule' (without the quotes) to talk to an MLdonkey or
+an eMule client, respectively.
 
-All these options are string options. Remember to restart your browser before
-any of them can take effect!
+All these options are string options. Remember to restart your browser
+before any of them can take effect!
 
 Deinstallation:
 ---------------
-Deinstallation of the plugin in Firefox is straight-forward. Just open the
-Extensions dialog by clicking on Extensions in the Tools menu. Select the
-plugin there and click on Uninstall.
-
-On Mozilla, you have to manually deinstall the plugin by removing the file
-'ed2kprotocol.js' from Mozilla's components directory. On a UNIX system, this
-normally is /usr/lib/mozilla/components.
+Deinstallation of the plugin in Firefox is straight-forward. Just open
+the extensions dialog by clicking on Extensions in the Tools
+menu. Select the plugin there and click on Uninstall.
+
+On Mozilla, you have to manually deinstall the plugin by removing the
+file 'ed2kprotocol.js' from Mozilla's components directory. On a UNIX
+system, this normally is /usr/lib/mozilla/components.
 
 News:
 -----
+Changes for version 1.7:
+- eMule communication is now faster (thanks to ZZ
+  http://forum.emule-project.net/index.php?showuser=9079)
+- Added support for eMule 0.46a 
+- eMule response is now displayed in the same way as MLdonkey
+  responses.
+
+Changes for version 1.6:
+- Added beta support for eMule (thanks to Dan Fritz).
+
 Changes for version 1.5:
-- Added workaround for latest security fixes in Firefox 1.0.1 and Mozilla 
1.7.5,
-  which blocked my extension otherwise.
+- Added workaround for latest security fixes in Firefox 1.0.1 and
+  Mozilla 1.7.5, which blocked my extension otherwise.
 - User authorization is now fully handled by Mozilla/Firefox.
 - Added uninstallation instructions.
 
@@ -120,6 +167,7 @@
 Contributor(s):
 Sven Koch
 Len Walter <address@hidden>
+Dan Fritz <address@hidden>
 
 Alternatively, the contents of this file may be used under the terms of
 either the GNU General Public License Version 2 or later (the "GPL"), or
Index: mldonkey/distrib/ed2k_mozilla/src/components/ed2kprotocol.js
diff -u mldonkey/distrib/ed2k_mozilla/src/components/ed2kprotocol.js:1.2 
mldonkey/distrib/ed2k_mozilla/src/components/ed2kprotocol.js:1.3
--- mldonkey/distrib/ed2k_mozilla/src/components/ed2kprotocol.js:1.2    Mon Apr 
18 13:14:03 2005
+++ mldonkey/distrib/ed2k_mozilla/src/components/ed2kprotocol.js        Wed Dec 
14 20:15:40 2005
@@ -12,7 +12,7 @@
  * for the specific language governing rights and limitations under the
  * License.
  *
- * The Original Code is the MLdonkey protocol handler 1.5.
+ * The Original Code is the MLdonkey protocol handler 1.7.
  *
  * The Initial Developer of the Original Code is
  * Simon Peter <address@hidden>.
@@ -22,6 +22,7 @@
  * Contributor(s):
  * Sven Koch
  * Len Walter <address@hidden>
+ * Dan Fritz (eMule bindings)
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -76,10 +77,15 @@
 const WND_WIDTH = 320;
 const WND_HEIGHT = 200;
 
+const WND_EMULE_WIDTH = 450;
+const WND_EMULE_HEIGHT = 75;
+
 // configuration (and defaults)
 cfgServer   = "localhost";
 cfgPort     = "4080";
 myWnd       = null;
+cfgMode     = "mldonkey"
+cfgPass     = ""
 
 /***** MLdonkeyProtocolHandler *****/
 
@@ -107,20 +113,39 @@
 
 MLdonkeyProtocolHandler.prototype.newChannel = function(aURI)
 {
-    // rewrite the URI into a http URL to the mldonkey server
-    var myURI = "http://";;
-    //    if(cfgUser != "") myURI += cfgUser + ":" + cfgPass + "@";
-    myURI += cfgServer + ":" + cfgPort + "/submit?q=dllink+" +
-    encodeURIComponent(decodeURI(aURI.spec));
-
+    var myUri = "";
+    var myTitle = "";
+    var myWidth = WND_WIDTH;
+    var myHeight = WND_HEIGHT
+     
+    if (cfgMode == "mldonkey") {
+        myTitle = "MLDonkey";
+
+        // rewrite the URI into a http URL to the mldonkey client
+        myURI = "http://";;
+        //    if(cfgUser != "") myURI += cfgUser + ":" + cfgPass + "@";
+        myURI += cfgServer + ":" + cfgPort + "/submit?q=dllink+" +
+                 encodeURIComponent(decodeURI(aURI.spec));         
+    } else {
+        // eMule mode
+        myTitle = "eMule";
+        myWidth = WND_EMULE_WIDTH;
+        myHeight = WND_EMULE_HEIGHT
+        
+        // rewrite the URI into a http URL to the eMule client
+        myURI = "http://";;
+        myURI += cfgServer + ":" + cfgPort + "/?w=password&p=" + cfgPass;
+        myURI += "&cat=0&c=" + encodeURIComponent(decodeURI(aURI.spec));
+    }
+   
     // open up a window with our newly generated http URL
     var wwatch = 
Components.classes[NS_WINDOWWATCHER_CONTRACTID].getService(nsIWindowWatcher);
     if(myWnd == null || myWnd.closed == true)
-      myWnd = wwatch.openWindow(wwatch.activeWindow, myURI, "MLDonkey",
-                                "width=" + WND_WIDTH + ", height=" + 
WND_HEIGHT, null);
+        myWnd = wwatch.openWindow(wwatch.activeWindow, myURI, myTitle,
+                "width=" + myWidth + ", height=" + myHeight, null);
     else
-      myWnd.location.href = myURI;
-
+        myWnd.location.href = myURI;
+            
     // return a fake empty channel so current window doesn't change
     var chan = 
Components.classes[INPUTSTREAMCHANNEL_CONTRACTID].createInstance(nsIChannel);
     return chan;
@@ -137,6 +162,10 @@
       cfgServer = myPrefs.getCharPref(pref_branch + "server");
     if(myPrefs.getPrefType(pref_branch + "port") == myPrefs.PREF_STRING)
       cfgPort = myPrefs.getCharPref(pref_branch + "port");
+    if(myPrefs.getPrefType(pref_branch + "mode") == myPrefs.PREF_STRING)
+      cfgMode = myPrefs.getCharPref(pref_branch + "mode");
+    if(myPrefs.getPrefType(pref_branch + "pass") == myPrefs.PREF_STRING)
+      cfgPass = myPrefs.getCharPref(pref_branch + "pass");
 }
 
 /***** MLdonkeyProtocolHandlerFactory *****/
Index: mldonkey/distrib/ed2k_mozilla/src/install.js
diff -u mldonkey/distrib/ed2k_mozilla/src/install.js:1.6 
mldonkey/distrib/ed2k_mozilla/src/install.js:1.7
--- mldonkey/distrib/ed2k_mozilla/src/install.js:1.6    Mon Apr 18 13:14:03 2005
+++ mldonkey/distrib/ed2k_mozilla/src/install.js        Wed Dec 14 20:15:39 2005
@@ -36,9 +36,9 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-const G_MSG        = "Mozilla MLdonkey Protocol Handler 1.5";
+const G_MSG        = "Mozilla MLdonkey Protocol Handler 1.6";
 const G_NAME       = "ed2k";
-const G_VER        = "1.5";
+const G_VER        = "1.7";
 
 var err = initInstall(G_MSG, G_NAME, G_VER);
 logComment("initInstall: " + err);
Index: mldonkey/distrib/ed2k_mozilla/src/install.rdf
diff -u mldonkey/distrib/ed2k_mozilla/src/install.rdf:1.2 
mldonkey/distrib/ed2k_mozilla/src/install.rdf:1.3
--- mldonkey/distrib/ed2k_mozilla/src/install.rdf:1.2   Mon Apr 18 13:14:03 2005
+++ mldonkey/distrib/ed2k_mozilla/src/install.rdf       Wed Dec 14 20:15:40 2005
@@ -5,7 +5,7 @@
 
   <Description about="urn:mozilla:install-manifest">
     <em:id>{bc72206d-b3ce-4b49-88b9-d59b388a0cde}</em:id>
-    <em:version>1.5</em:version>
+    <em:version>1.7</em:version>
 
     <!-- Target Application this extension can install into,
         with minimum and maximum supported versions. --> 
@@ -13,7 +13,7 @@
       <Description>
         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
         <em:minVersion>0.7</em:minVersion>
-        <em:maxVersion>1.2</em:maxVersion>
+        <em:maxVersion>1.9</em:maxVersion>
       </Description>
     </em:targetApplication>
 
@@ -23,6 +23,7 @@
     <em:creator>Simon Peter</em:creator>
     <em:contributor>Len Walter</em:contributor>
     <em:contributor>Sven Koch</em:contributor>
+    <em:contributor>Dan Fritz</em:contributor>
     
<em:homepageURL>http://www.informatik.uni-oldenburg.de/~dyna/mldonkey/</em:homepageURL>
   </Description>
 </RDF>