From: Willem Liu <willem.liu@gmail.com>
Date: Tue, 3 May 2011 17:55:40 +0000 (+0200)
Subject: Changed changelog.txt
X-Git-Tag: easylist-0.3.26~1
X-Git-Url: https://vcs.maemo.org/git/?p=easylist;a=commitdiff_plain;h=5383b879d54d21b9699ec801aa19a912a3a03320

Changed changelog.txt
---

diff --git a/changelog.txt b/changelog.txt
index ffb49fd..c16aec1 100755
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,11 @@
+easylist (0.3.26) unstable; urgency=low
+
+	* Changed default sync website to http://easylist.willemliu.nl
+	* Changed default sync URL to http://easylist.willemliu.nl/getList.php
+  * Minor improvements to the About box.
+
+ -- Willem Liu <willem.liu@gmail.com>  Sat, 3 May 2011 19:53:57 +0200
+ 
 easylist (0.3.25) unstable; urgency=low
 
   * Merged with sync window improvements from Dotblank.
diff --git a/debian/changelog b/debian/changelog
index 0dd7f76..edce4fa 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,4 +4,4 @@ easylist (0.3.26) unstable; urgency=low
 	* Changed default sync URL to http://easylist.willemliu.nl/getList.php
   * Minor improvements to the About box.
 
- -- Willem Liu <willem.liu@gmail.com>  Sat, 30 Apr 2011 11:57:57 +0200
+ -- Willem Liu <willem.liu@gmail.com>  Sat, 3 May 2011 19:53:57 +0200
diff --git a/debian/rules b/debian/rules
index 0ba1cee..8cfb926 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,6 +27,7 @@ build-stamp: configure-stamp
 	dh_testdir
 
 	# Add here commands to compile the package.
+	qmake
 	$(MAKE)
 	#docbook-to-man debian/easylist.sgml > easylist.1
 
@@ -38,7 +39,7 @@ clean:
 	rm -f build-stamp configure-stamp
 
 	# Add here commands to clean up after the build process.
-	$(MAKE) clean
+	# $(MAKE) clean
 
 	dh_clean 
 
diff --git a/mainform.cpp b/mainform.cpp
index afb9f6a..0c61735 100755
--- a/mainform.cpp
+++ b/mainform.cpp
@@ -236,6 +236,8 @@ void MainForm::on_actionSync_triggered()
 
 void MainForm::slotSyncList(QNetworkReply* pReply)
 {
+    settings->setValue(LIST_TEXT, MyCheckBoxContainer::getInstance()->getListText());
+    SystemSettings::getInstance()->saveCurrentList();
     QByteArray data=pReply->readAll();
     QString list = QString::fromUtf8(data);
     settings->setValue(LIST_TEXT, list);
diff --git a/qtc_packaging/debian_fremantle/changelog b/qtc_packaging/debian_fremantle/changelog
index 1491e30..edce4fa 100755
--- a/qtc_packaging/debian_fremantle/changelog
+++ b/qtc_packaging/debian_fremantle/changelog
@@ -1,5 +1,7 @@
 easylist (0.3.26) unstable; urgency=low
 
-  * Initial Release.
+	* Changed default sync website to http://easylist.willemliu.nl
+	* Changed default sync URL to http://easylist.willemliu.nl/getList.php
+  * Minor improvements to the About box.
 
- -- Willem Liu <willem.liu@gmail.com>  Sat, 30 Apr 2011 11:57:57 +0200
+ -- Willem Liu <willem.liu@gmail.com>  Sat, 3 May 2011 19:53:57 +0200
diff --git a/qtc_packaging/debian_fremantle/rules b/qtc_packaging/debian_fremantle/rules
index 0ba1cee..8cfb926 100755
--- a/qtc_packaging/debian_fremantle/rules
+++ b/qtc_packaging/debian_fremantle/rules
@@ -27,6 +27,7 @@ build-stamp: configure-stamp
 	dh_testdir
 
 	# Add here commands to compile the package.
+	qmake
 	$(MAKE)
 	#docbook-to-man debian/easylist.sgml > easylist.1
 
@@ -38,7 +39,7 @@ clean:
 	rm -f build-stamp configure-stamp
 
 	# Add here commands to clean up after the build process.
-	$(MAKE) clean
+	# $(MAKE) clean
 
 	dh_clean