From 8df96bed806e315fe2f72397507bf19561c9cd4a Mon Sep 17 00:00:00 2001
From: scachemaille <scachemaille@gmail.com>
Date: Wed, 24 Aug 2016 15:28:38 +0200
Subject: [PATCH] fix #155

---
 src/mirrors_config.vala     |  4 ++--
 src/preferences_dialog.vala | 12 ++++++++++--
 src/transaction.vala        |  2 +-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/mirrors_config.vala b/src/mirrors_config.vala
index 5c31303..3f95741 100644
--- a/src/mirrors_config.vala
+++ b/src/mirrors_config.vala
@@ -53,7 +53,7 @@ namespace Pamac {
 		public void reload () {
 			// set default options
 			choosen_generation_method = "rank";
-			choosen_country = dgettext (null, "Worldwide");
+			choosen_country = "ALL";
 			mirrorlists_dir = "/etc/pacman.d/mirrors";
 			parse_file (conf_path);
 		}
@@ -123,7 +123,7 @@ namespace Pamac {
 							}
 						} else if (line.contains ("OnlyCountry")) {
 							if (new_conf.lookup_extended ("OnlyCountry", null, out variant)) {
-								if (variant.get_string () == dgettext (null, "Worldwide")) {
+								if (variant.get_string () == "ALL") {
 									data.append ("#%s\n".printf (line));
 								} else {
 									data.append ("OnlyCountry=%s\n".printf (variant.get_string ()));
diff --git a/src/preferences_dialog.vala b/src/preferences_dialog.vala
index 04f8cb6..1fa16fe 100644
--- a/src/preferences_dialog.vala
+++ b/src/preferences_dialog.vala
@@ -321,7 +321,10 @@ namespace Pamac {
 
 		void on_mirrors_country_comboboxtext_changed () {
 			var new_mirrors_conf = new HashTable<string,Variant> (str_hash, str_equal);
-			new_mirrors_conf.insert ("OnlyCountry", new Variant.string (mirrors_country_comboboxtext.get_active_text ()));
+            var mirror_country = mirrors_country_comboboxtext.get_active_text ();
+			if(mirror_country == dgettext (null, "Worldwide"))
+				mirror_country = "ALL";
+			new_mirrors_conf.insert ("OnlyCountry", new Variant.string (mirror_country) );
 			transaction.start_write_mirrors_config (new_mirrors_conf);
 		}
 
@@ -337,10 +340,15 @@ namespace Pamac {
 
 		void on_write_mirrors_config_finished (string choosen_country, string choosen_generation_method) {
 			int index = 0;
+            
+            string choosen_country_ = dgettext (null, "Worldwide");
+            if( choosen_country != "ALL")
+                choosen_country_ = choosen_country;
+
 			mirrors_country_comboboxtext.model.foreach ((model, path, iter) => {
 				GLib.Value country;
 				model.get_value (iter, 0, out country);
-				if ((string) country == choosen_country) {
+				if ((string) country == choosen_country_) {
 					return true;
 				}
 				index += 1;
diff --git a/src/transaction.vala b/src/transaction.vala
index d0371f3..d44890a 100644
--- a/src/transaction.vala
+++ b/src/transaction.vala
@@ -17,7 +17,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-const string VERSION = "4.1.1";
+const string VERSION = "4.1.1-1";
 
 namespace Pamac {
 	[DBus (name = "org.manjaro.pamac")]