# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: txus@txus-codegram-20090921112648-td5cabpp7musvm9p
# target_branch: http://bazaar.launchpad.net/%7Erescuetime-\
#   developers/rescuetime-linux-uploader/trunk/
# testament_sha1: 9ac4c2247e1d19bbdbb345f1423966e8b8329633
# timestamp: 2009-09-21 13:27:33 +0200
# base_revision_id: elliot@elliotmurphy.com-20090304053101-\
#   xmrpsuwxvnt6oo04
# 
# Begin patch
=== modified symlink 'RescueTimeUploader/extensions/Epiphany'
=== target changed 'Epiphany-browser/' => 'Epiphany-browser'
=== modified symlink 'RescueTimeUploader/extensions/Firefox'
=== target changed 'Firefox-bin/' => 'Firefox-bin'
=== modified file 'RescueTimeUploader/extensions/Firefox-bin/extended_info'
--- RescueTimeUploader/extensions/Firefox-bin/extended_info	2008-05-09 22:31:17 +0000
+++ RescueTimeUploader/extensions/Firefox-bin/extended_info	2009-09-21 11:15:28 +0000
@@ -5,7 +5,7 @@
 from urlparse import urlparse
 from os.path import expanduser, join, exists
 
-current_url_path = join(os.getenv("HOME"), ".mozilla", "firefox", "currentURL")
+current_url_path = join(os.getenv("HOME"), ".mozilla", "firefox-3.5", "currentURL")
 whitelist_file = join(expanduser('~'), '.rescuetime', 'domainwhitelist.txt')
 allowed_domains = []
 

=== added symlink 'RescueTimeUploader/extensions/Shiretoko'
=== target is 'Firefox-bin'
=== added directory 'RescueTimeUploader/extensions/Shiretoko-bin'
=== added file 'RescueTimeUploader/extensions/Shiretoko-bin/extended_info'
--- RescueTimeUploader/extensions/Shiretoko-bin/extended_info	1970-01-01 00:00:00 +0000
+++ RescueTimeUploader/extensions/Shiretoko-bin/extended_info	2009-09-21 11:15:28 +0000
@@ -0,0 +1,48 @@
+#!/usr/bin/env python
+
+import os
+import sys
+from urlparse import urlparse
+from os.path import expanduser, join, exists
+
+current_url_path = join(os.getenv("HOME"), ".mozilla", "firefox-3.5", "currentURL")
+whitelist_file = join(expanduser('~'), '.rescuetime', 'domainwhitelist.txt')
+allowed_domains = []
+
+if exists(whitelist_file):
+    have_whitelist = True
+    for line in open(whitelist_file):
+        # strip comments and whitespace
+        line = line.split('#', 1)[0].strip()
+        if line:
+            allowed_domains.append(line)
+else:
+    have_whitelist = False
+
+def check_whitelist(urlparse_tuple):
+    """urlparse_tuple is a tuple returned by urlparse
+    Return True if domain is allowed, False if not.
+    """
+    if not have_whitelist:
+        # let everything through
+        return True
+    name = urlparse_tuple[1]
+    for domain in allowed_domains:
+        if name.find(domain) != -1:
+            return True
+    return False
+
+try:
+    os.stat(current_url_path)
+except:
+    sys.exit(1)
+f = file(current_url_path)
+info = urlparse(f.readline().strip())
+f.close()
+allowed = check_whitelist(info)
+if not allowed:
+    print 'unlisted'
+elif "google" in info[1].lower():
+    print info[0] + "://" + info[1] + info[2]
+else:
+    print info[0] + "://" + info[1]

=== modified file 'RescueTimeUploader/uploader.py'
--- RescueTimeUploader/uploader.py	2009-03-04 05:31:01 +0000
+++ RescueTimeUploader/uploader.py	2009-09-21 11:26:48 +0000
@@ -292,16 +292,16 @@
 		try:
 			if self.app_name == None or self.app_name.isspace() or len(self.app_name) == 0 or self.app_name.lower().strip() == "none":
 				return ""
-			out =  "- os_username: '%s'\n" % os_name
-			out += "  app_name: '%s'\n" % str(self.app_name)
+			out =  "- os_username: \"%s\"\n" % escape_less(os_name)
+			out += "  app_name: \"%s\"\n" % escape_less(str(self.app_name))
 			if self.window_title == None or self.window_title.isspace() or len(self.window_title) == 0:
-				out += "  window_title: 'Untitled Window'\n"
+				out += "  window_title: \"Untitled Window\"\n"
 			else:
-				out += "  window_title: '%s'\n" % str(self.window_title)
+				out += "  window_title: \"%s\"\n" % escape_less(str(self.window_title))
 			if hasattr(self, "extended_info"):
-				out += "  extended_info: '%s'\n" % escape_less(str(self.extended_info))
+				out += "  extended_info: \"%s\"\n" % escape_less(str(self.extended_info))
 			else:
-				out += "  extended_info: ''\n"
+				out += "  extended_info: \"\"\n"
 			out += '  start_time: %s\n' % re.sub("\..*","",str(self.start_time))
 			out += '  end_time: %s\n' % re.sub("\..*","",str(self.end_time))
 			return out

=== modified file 'ez_setup.py'
--- ez_setup.py	2008-02-17 01:45:35 +0000
+++ ez_setup.py	2009-09-21 11:15:28 +0000
@@ -14,7 +14,7 @@
 This file can also be run as a script to install or upgrade setuptools.
 """
 import sys
-DEFAULT_VERSION = "0.6c8"
+DEFAULT_VERSION = "0.6c9"
 DEFAULT_URL     = "http://pypi.python.org/packages/%s/s/setuptools/" % sys.version[:3]
 
 md5_data = {
@@ -48,6 +48,7 @@
     'setuptools-0.6c8-py2.3.egg': '50759d29b349db8cfd807ba8303f1902',
     'setuptools-0.6c8-py2.4.egg': 'cba38d74f7d483c06e9daa6070cce6de',
     'setuptools-0.6c8-py2.5.egg': '1721747ee329dc150590a58b3e1ac95b',
+    'setuptools-0.6c9-py2.6.egg': 'ca37b1ff16fa2ede6e19383e7b59245a',
 }
 
 import sys, os

=== modified file 'firefox_extension/install.rdf'
--- firefox_extension/install.rdf	2008-03-17 20:03:46 +0000
+++ firefox_extension/install.rdf	2009-09-21 11:15:28 +0000
@@ -6,12 +6,12 @@
     <em:name>RescueTime Data Exporter</em:name>
     <em:version>63.3</em:version>
     <em:creator>Angus Helm</em:creator>
-    <em:description>Exports the url of the currently focused tab to ~/.mozilla/firefox/currentURL, so that the RescueTime uploader can read it.</em:description>
+    <em:description>Exports the url of the currently focused tab to ~/.mozilla/firefox(-3.5)/currentURL, so that the RescueTime uploader can read it.</em:description>
     <em:targetApplication>
       <Description>
         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id> <!-- firefox -->
         <em:minVersion>1.5</em:minVersion>
-        <em:maxVersion>3.0.*</em:maxVersion>
+        <em:maxVersion>3.5.*</em:maxVersion>
       </Description>
     </em:targetApplication>
   </Description>

# Begin bundle
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