From bb86f55c4a5b902ef1ac20e3b9f65006b68624df Mon Sep 17 00:00:00 2001
From: Jim Miller <retiefjimm@gmail.com>
Date: Wed, 27 Feb 2013 13:44:34 -0600
Subject: [PATCH] www.ficwad.com -> ficwad.com.  Ficwad changed their canonical
 domain.

---
 calibre-plugin/dialogs.py                      | 4 ++--
 defaults.ini                                   | 2 +-
 fanficdownloader/adapters/adapter_ficwadcom.py | 4 ++--
 plugin-defaults.ini                            | 6 +++---
 plugin-example.ini                             | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/calibre-plugin/dialogs.py b/calibre-plugin/dialogs.py
index e31072c..768bff6 100644
--- a/calibre-plugin/dialogs.py
+++ b/calibre-plugin/dialogs.py
@@ -256,8 +256,8 @@ class CollectURLDialog(SizePersistedDialog):
         self.indiv_button.clicked.connect(self.indiv)
         self.l.addWidget(self.indiv_button,2,0)
 
-        self.merge_button = QPushButton('For Anthology Book', self)
-        self.merge_button.setToolTip('Get URLs and go to dialog for Anthology download.\nRequires EpubMerge 1.3.0+ plugin.')
+        self.merge_button = QPushButton('For Anthology Epub', self)
+        self.merge_button.setToolTip('Get URLs and go to dialog for Anthology download.\nRequires EpubMerge 1.3.1+ plugin.')
         self.merge_button.clicked.connect(self.merge)
         self.l.addWidget(self.merge_button,2,1)
         self.merge_button.setEnabled(epubmerge_plugin!=None)
diff --git a/defaults.ini b/defaults.ini
index feced24..c2af98f 100644
--- a/defaults.ini
+++ b/defaults.ini
@@ -1031,7 +1031,7 @@ extratags:
 ## for examples of how to use them.
 extra_valid_entries:reviews,favs,follows
 
-[www.ficwad.com]
+[ficwad.com]
 ## Some sites require login (or login for some rated stories) The
 ## program can prompt you, or you can save it in config.  In
 ## commandline version, this should go in your personal.ini, not
diff --git a/fanficdownloader/adapters/adapter_ficwadcom.py b/fanficdownloader/adapters/adapter_ficwadcom.py
index 3183d54..b8cdf71 100644
--- a/fanficdownloader/adapters/adapter_ficwadcom.py
+++ b/fanficdownloader/adapters/adapter_ficwadcom.py
@@ -43,10 +43,10 @@ class FicwadComSiteAdapter(BaseSiteAdapter):
 
     @staticmethod
     def getSiteDomain():
-        return 'www.ficwad.com'
+        return 'ficwad.com'
 
     def getSiteExampleURLs(self):
-        return "http://www.ficwad.com/story/137169"
+        return "http://ficwad.com/story/137169"
 
     def getSiteURLPattern(self):
         return re.escape(r"http://"+self.getSiteDomain())+"/story/\d+?$"
diff --git a/plugin-defaults.ini b/plugin-defaults.ini
index c9cd2e4..7933b2a 100644
--- a/plugin-defaults.ini
+++ b/plugin-defaults.ini
@@ -157,7 +157,7 @@ extratags: FanFiction
 ## metadata part(s) to look at, 2) a regular expression to match the
 ## template, and 3) the name of the GC setting to use, which must
 ## match exactly.  Use this parameter in [defaults], or by site eg,
-## [www.ficwad.com]
+## [ficwad.com]
 ## Make sure to keep at least one space at the start of each line and
 ## to escape % to %%, if used.
 ## template => regexp to match => GC Setting to use.
@@ -344,7 +344,7 @@ output_css:
 ## It can be either a 'file:' or 'http:' url.
 ## Note that if you enable make_firstimage_cover in [epub], but want
 ## to use default_cover_image for a specific site, use the site:format
-## section, for example: [www.ficwad.com:epub]
+## section, for example: [ficwad.com:epub]
 ## default_cover_image is a python string Template string with
 ## ${title}, ${author} etc, same as titlepage_entries. Unless
 ## allow_unsafe_filename is true, invalid filename chars will be
@@ -1008,7 +1008,7 @@ extratags:
 ## for examples of how to use them.
 extra_valid_entries:reviews,favs,follows
 
-[www.ficwad.com]
+[ficwad.com]
 ## Some sites require login (or login for some rated stories) The
 ## program can prompt you, or you can save it in config.  In
 ## commandline version, this should go in your personal.ini, not
diff --git a/plugin-example.ini b/plugin-example.ini
index 928835a..a0b9237 100644
--- a/plugin-example.ini
+++ b/plugin-example.ini
@@ -51,7 +51,7 @@
 ## default is false
 #collect_series: true
 
-[www.ficwad.com]
+[ficwad.com]
 #username:YourUsername
 #password:YourPassword