# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: fcasanova@fluendo.com-20090916091453-6gw91olj9koj1q5o
# target_branch: lp:elisa
# testament_sha1: 8dbfb8de39e0690ebdc89180ffa0a321164bcfc6
# timestamp: 2009-09-16 11:15:17 +0200
# base_revision_id: philippe@fluendo.com-20090916080455-\
#   bw87gtf4xhwkgzso
# 
# Begin patch
=== modified file 'elisa-plugins/elisa/plugins/youtube/resource_provider.py'
--- elisa-plugins/elisa/plugins/youtube/resource_provider.py	2009-05-14 14:35:55 +0000
+++ elisa-plugins/elisa/plugins/youtube/resource_provider.py	2009-09-16 09:14:53 +0000
@@ -62,7 +62,7 @@
     api_uri = 'http://%s/feeds/api/.*' % API_SERVER
     api_re = re.compile(api_uri)
     # Queries to the video server
-    video_uri = 'http://%s/watch\?v=.*' % VIDEO_SERVER
+    video_uri = 'http://%s/watch\?.*' % VIDEO_SERVER
     video_re = re.compile(video_uri)
     # Queries to the image server
     img_uri = 'http://%s/vi/.*\.jpg' % IMG_SERVER
@@ -104,7 +104,7 @@
             complete list of available feeds, see
             http://code.google.com/apis/youtube/developers_guide_protocol.html#Standard_feeds
 
-          - http://www.youtube.com/watch?v=.* : query to the Youtube server for
+          - http://www.youtube.com/watch?.* : query to the Youtube server for
             a given video, returns the playable URL of the SWF video file
             (L{elisa.plugins.base.models.media.PlayableModel}).
 
@@ -118,6 +118,7 @@
         C{playable_model} will then be set to the retrieved model.
         """
         url = str(uri)
+        self.debug("GET %s" % uri)
 
         # Select the correct HTTP client to target
         if self.api_re.match(url) is not None:

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWV6F7PoAAaFfgEUQU/P//9+g
nSS////wUAParzJGwU0kwyQlPUepnpNPUym0mntKekyBoPUAaD0nom1BzRkxMAExGBGmBBiMEyYB
GCSIJlDNUPSepPSPU9E9Rp6JoBoBiaNAHNGTEwATEYEaYEGIwTJgEYJKE0DUxMmhkmNTU8RB5I9G
oaA0MjJFcGnX3YPz9vExPiUkwyvbxU8MIiNXHfR41lLBBFcOPTXVwsHjEgCJ96iLWbySIEUqoYFI
i3wzctHtrubqY+Sx0Oi6EGm3PhWC63ctRyj4NXv23dOUKdPFGfmbyaxPLTD0MgzHTarkSxMbaB2P
GRwiBD8TgUNI1rhrEq2zEiB+U7pthlKq5e0J2WYTcCZGDFhY1zhiFE3bTmTzoB7BxKUjOpMLxgho
o0GeBJnoQ5ig8HuNsz3FMJ34n00E+o6B76iuUB0EzZx7gfnKEamIMYFRfkXRc1quhTINaF05ULXl
lEGNhpMjKWYmJ3e8gO7M0xZT+FmaVTMKmUmKxyT1WUECBWbZ1khJQrisJy+mlh4qYyCnrtJ4k9h5
ClSJigtmYXEBhcqxb2qpmOBwmuEyHHLi5WpcBIz7VSSsY4wmNQRBklcJt+ObCpvxDUJ/AUi1prFX
qOYcJeo1+00sL3MX6L7iZsi/NknY4OU5tsJOTZ4bu/yxBhNZkx171i/q238vTIzgO1IvlBHswmPG
hKnQYoBXuYB0h4yBhP9h7sKaDAOWMqdY6qMCGqcXlxS7lwOFp2DzuPNGW3kt4uio9h2EZ3DTEQSx
EZcqIzPeaNGml13AE+TGFlQ5NXYNlRYStCeQnMZIChk1c2bAbKRe8ZhaRTkk79Z3lAWymah4Xqrb
rHRelHbqN2tIbrTETtYFlMfnYDZegmVqYgplVcVuTWaCNVHhzNyZnKDST6DGeB9d2yu4kULI0z5w
WcV0Z9wedpcBQAk4vbKQJRtk0GUicE3EaZPijrB50kFuBxCwIeOpsVoGAQA39eJ77hXNFRf+Iis7
VkDkKdbl082h6qRbduOtIiBaVGdWqplOW0jDFktRWZIGskSjGOxgJBBkMtHaZarXJyQyNs0RxwFy
FUhQAijRAgDFvaqp16XhuAlW/ec5i7OaNGhXvMYYwi4MHWhrmmGdK5q8XUU6NdncTB1Z1WcxWztD
RueLKHcUDPXOnhjHfSiSZed3Y/Y8xm1lgP9lgxnMgGuXIqikHjbqzfDc5y8hU4bCkjkTSvYNNLJg
nUoxPYq9hnRW8kkR1UJF+vdHUs9SmchevGsXpEqQO8i40LKLYWqJuW9TA1ktKUlFJBmkz8cuV+C+
KmrN//F3JFOFCQXoXs+g