calibre

Merge lp:~user-none/calibre/dev into lp:calibre

  1. dev
  2. Merge into trunk
Proposed by John Schember
Status: Merged
Merged at revision: 14726
Proposed branch: lp:~user-none/calibre/dev
Merge into: lp:calibre
Diff against target: 23 lines (+3/-3)
1 file modified
src/calibre/gui2/store/stores/waterstones_uk_plugin.py (+3/-3)
To merge this branch: bzr merge lp:~user-none/calibre/dev
Reviewer Review Type Date Requested Status
Kovid Goyal Pending
Review via email: mp+157260@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/calibre/gui2/store/stores/waterstones_uk_plugin.py'
2--- src/calibre/gui2/store/stores/waterstones_uk_plugin.py 2013-01-15 09:58:07 +0000
3+++ src/calibre/gui2/store/stores/waterstones_uk_plugin.py 2013-04-05 00:13:32 +0000
4@@ -1,7 +1,7 @@
5 # -*- coding: utf-8 -*-
6
7 from __future__ import (unicode_literals, division, absolute_import, print_function)
8-store_version = 1 # Needed for dynamic plugin loading
9+store_version = 2 # Needed for dynamic plugin loading
10
11 __license__ = 'GPL 3'
12 __copyright__ = '2011, John Schember <john@nachtimwald.com>'
13@@ -24,8 +24,8 @@
14 class WaterstonesUKStore(BasicStoreConfig, StorePlugin):
15
16 def open(self, parent=None, detail_item=None, external=False):
17- url = 'http://clkuk.tradedoubler.com/click?p=51196&a=1951604&g=19333484'
18- url_details = 'http://clkuk.tradedoubler.com/click?p(51196)a(1951604)g(16460516)url({0})'
19+ url = 'http://www.awin1.com/awclick.php?mid=3787&id=120917'
20+ url_details = 'http://www.awin1.com/cread.php?awinmid=3787&awinaffid=120917&clickref=&p={0}'
21
22 if external or self.config.get('open_external', False):
23 if detail_item:

Subscribers

People subscribed via source and target branches

to status/vote changes: