Merge branch 'dev'

debian/changelog

@@ -1,4 +1,4 @@
-polo-file-manager (17.8) xenial; urgency=low
+polo-file-manager (17.9) xenial; urgency=low
 
   * Beta 10
 

polo.geany

@@ -28,7 +28,7 @@ long_line_behaviour=1
 long_line_column=72
 
 [files]
-current_page=71
+current_page=26
 FILE_NAME_0=1061;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fpolo%2Fsrc%2FGtk%2FAdminBar.vala;0;4
 FILE_NAME_1=48865;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fpolo%2Fsrc%2FGtk%2FCreateArchiveWindow.vala;0;4
 FILE_NAME_2=9021;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fpolo%2Fsrc%2FGtk%2FFileContextMenu.vala;0;4
@@ -55,7 +55,7 @@ FILE_NAME_22=2783;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fpolo
 FILE_NAME_23=4280;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fpolo%2Fsrc%2FGtk%2FStatusbar.vala;0;4
 FILE_NAME_24=4788;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fpolo%2Fsrc%2FGtk%2FTrashBar.vala;0;4
 FILE_NAME_25=3354;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fpolo%2Fsrc%2FGtk%2FWizardWindow.vala;0;4
-FILE_NAME_26=39933;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fpolo%2Fsrc%2FCommon%2FMain.vala;0;4
+FILE_NAME_26=39998;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fpolo%2Fsrc%2FCommon%2FMain.vala;0;4
 FILE_NAME_27=2021;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fpolo%2Fsrc%2FUtility%2FGtkTheme.vala;0;4
 FILE_NAME_28=1374;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fpolo%2Fsrc%2FUtility%2FAppLock.vala;0;4
 FILE_NAME_29=1860;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fpolo%2Fsrc%2FUtility%2FAsyncTask.vala;0;4

polo.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: polo 1.6\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2017-09-17 14:18+0530\n"
+"POT-Creation-Date: 2017-09-17 14:44+0530\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -196,11 +196,11 @@ msgstr ""
 msgid "Another instance of this application is running"
 msgstr ""
 
-#: Common/Main.vala:912 Common/Main.vala:1058 Common/Main.vala:1147
+#: Common/Main.vala:912 Common/Main.vala:1062 Common/Main.vala:1151
 msgid "App config loaded"
 msgstr ""
 
-#: Common/Main.vala:725 Common/Main.vala:1025 Common/Main.vala:1103
+#: Common/Main.vala:725 Common/Main.vala:1029 Common/Main.vala:1107
 msgid "App config saved"
 msgstr ""
 
@@ -1367,7 +1367,7 @@ msgstr ""
 msgid "Exit"
 msgstr ""
 
-#: Common/Main.vala:1198
+#: Common/Main.vala:1202
 msgid "Exiting Application"
 msgstr ""
 

src/Common/Main.vala

@@ -37,8 +37,8 @@ using TeeJee.Misc;
 public Main App;
 public const string AppName = "Polo File Manager";
 public const string AppShortName = "polo";
-public const string AppVersion = "17.8 (BETA 10)";
-public const string AppWikiVersion = "17.8 (BETA 10)"; // update only if wiki page exists
+public const string AppVersion = "17.9 (BETA 10)";
+public const string AppWikiVersion = "17.9 (BETA 10)"; // update only if wiki page exists
 public const string AppAuthor = "Tony George";
 public const string AppAuthorEmail = "[email protected]";
 
@@ -922,31 +922,35 @@ public class Main : GLib.Object {
 	}
 
 	private void init_gtk_themes(){
+
+		log_debug("Main(): gtk_theme: user: %s".printf(user_name_effective));
 
 		GtkTheme.query(user_name);
 
 		if (!GtkTheme.has_theme("Arc-Darker-Polo")){
 
-			log_debug("Main(): theme not found: Arc-Darker-Polo");
-			log_debug("Main(): installing theme...");
+			log_debug("Main(): gtk_theme: not_found: Arc-Darker-Polo");
+			log_debug("Main(): gtk_theme: installing: Arc-Darker-Polo");
 
 			string sh_file = "/usr/share/polo/files/gtk-theme/install-gtk-theme";
 			Posix.system(sh_file);
 
-			GtkTheme.query(user_name); // requery
+			GtkTheme.query(user_name_effective); // requery
 		}
 		else{
-			log_debug("Main(): theme found: Arc-Darker-Polo");
+			log_debug("Main(): gtk_theme: found: Arc-Darker-Polo");
 		}
 
 		if (gtk_theme.length == 0){
 
-			log_debug("Main(): gtk_theme not selected");
+			log_debug("Main(): gtk_theme: none_selected");
 			GtkTheme.set_gtk_theme_preferred();
 			gtk_theme = GtkTheme.get_gtk_theme();
+			log_debug("Main(): gtk_theme: applied: Arc-Darker-Polo");
 		}
 		else {
 			GtkTheme.set_gtk_theme(gtk_theme);
+			log_debug("Main(): gtk_theme: applied: %s".printf(gtk_theme));
 		}
 	}