[Xfce4-commits] <eatmonkey:aria2-xml-rpc> Add version inside config.rb

[Mike Massonnet]

Updating branch refs/heads/aria2-xml-rpc
         to 7454f8a9c041b7e0745d5db02d7f6b5780372852 (commit)
       from 2ca9b6dfb912bb0d686cdc66fdc30271e55154a9 (commit)

commit 7454f8a9c041b7e0745d5db02d7f6b5780372852
Author: Mike Massonnet <mmassonnet at xfce.org>
Date:   Sat Jan 30 13:55:18 2010 +0100

    Add version inside config.rb

 src/config.rb     |    3 ++-
 src/eataria2.rb   |    5 +++--
 src/eatmanager.rb |    2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/config.rb b/src/config.rb
index 6b399bb..cfc8084 100644
--- a/src/config.rb
+++ b/src/config.rb
@@ -1,4 +1,5 @@
 #!/usr/bin/ruby -w
 
-PACKAGE_STRING = "Eatmonkey 0.1.0"
+PACKAGE_VERSION = "0.1.0"
+PACKAGE_STRING = "Eatmonkey #{PACKAGE_VERSION}"
 PACKAGE_URL = "http://goodies.xfce.org/projects/applications/eatmonkey"
diff --git a/src/eataria2.rb b/src/eataria2.rb
index b790065..221f09c 100644
--- a/src/eataria2.rb
+++ b/src/eataria2.rb
@@ -6,6 +6,7 @@ require "singleton"
 require "timeout"
 require "pp"
 
+require "config"
 require "glib2"
 
 def debug(*args)
@@ -475,7 +476,7 @@ class Eat::Aria2Config
 		@values["load-cookies"] = "" # cookies file name to use, supports Firefox3 (sqlite) and Netscape
 		@values["save-cookies"] = "" # save cookies to file name in Netscape format
 		@values["use-head"] = false # use HEAD method for first request
-		@values["user-agent"] = "Eatmonkey/0.1.0 aria2/1.8.0"
+		@values["user-agent"] = "Eatmonkey/#{PACKAGE_VERSION} aria2"
 
 		# FTP options
 		@values["ftp-user"] = "anonymous" # FTP user
@@ -507,7 +508,7 @@ class Eat::Aria2Config
 		@values["listen-port"] = "6881-6999" # TCP listening port for BitTorrent
 		@values["max-overall-upload-limit"] = 0 # max overall upload speed in B/s, 0 means unlimited
 		@values["max-upload-limit"] = 0 # max upload speed per each download, 0 means unlimited
-		@values["peer-id-prefix"] = "Eatmonkey/0.1.0" # set peer ID, max 20 bytes
+		@values["peer-id-prefix"] = "Eatmonkey/#{PACKAGE_VERSION}" # set peer ID, max 20 bytes
 		@values["seed-ratio"] = 1.0 # specify share ratio
 
 		# Metalink options
diff --git a/src/eatmanager.rb b/src/eatmanager.rb
index 9ae67bf..c7d2d54 100644
--- a/src/eatmanager.rb
+++ b/src/eatmanager.rb
@@ -187,7 +187,7 @@ class Eat::Manager
 		end
 		AboutDialog.show(@window,
 				"program-name" => "Eatmonkey",
-				"version" => "0.1.0",
+				"version" => PACKAGE_VERSION,
 				"copyright" => "Copyright 2010 \xC2\xA9 Mike Massonnet",
 				"logo" => logo,
 				"comments" => "Stupid download manager for monkeys and Capuchins!" \