Merge remote-tracking branch 'linux/linux' into linux

Conflicts:
	appshell/client_app_gtk.cpp

Author: radorodopski

appshell/cefclient_gtk.cpp

@@ -57,7 +57,6 @@ int GetInitialUrl() {
 
     if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT)
       {
-        szInitialUrl = "file://";
         szInitialUrl.append(gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)));
         gtk_widget_destroy (dialog);
         return 0;
@@ -75,7 +74,6 @@ std::string AppGetRunningDirectory() {
   if(szRunningDir.length() > 0)
     return szRunningDir;
 
-  szRunningDir = "file://";
   char buf[512];
   int len = readlink("/proc/self/exe", buf, 512);
 
@@ -136,7 +134,7 @@ int main(int argc, char* argv[]) {
 
   {
     struct stat buf;
-    if(!(stat(szInitialUrl.c_str()+7, &buf) >= 0) || !(S_ISREG(buf.st_mode)))
+    if(!(stat(szInitialUrl.c_str(), &buf) >= 0) || !(S_ISREG(buf.st_mode)))
       if(GetInitialUrl() < 0)
         return 0;
   }
@@ -186,7 +184,7 @@ int main(int argc, char* argv[]) {
   CefBrowserHost::CreateBrowser(
       window_info,
       static_cast<CefRefPtr<CefClient> >(g_handler),
-      szInitialUrl, browserSettings);
+      "file://"+szInitialUrl, browserSettings);
 
   gtk_container_add(GTK_CONTAINER(window), vbox);
   gtk_widget_show_all(GTK_WIDGET(window));

appshell/client_app_gtk.cpp

@@ -37,6 +37,7 @@ extern char _binary_appshell_appshell_extensions_js_start;
 
 CefString ClientApp::GetCurrentLanguage()
 {
+<<<<<<< HEAD
     //TODO proper locale in GTK
     printf("in GetCurrentLanguage: ");
     const char* locconst =  pango_language_to_string( gtk_get_default_language() );
@@ -47,6 +48,17 @@ CefString ClientApp::GetCurrentLanguage()
         if ( (loc[i] == '-') || (loc[i] == '_') ) { loc[i] = 0; break; }
     printf( "%s\n",  loc ); // here it prints just "en"
 	return CefString(loc);
+=======
+    const char* locconst =  pango_language_to_string( gtk_get_default_language() );
+    //Rado: for me it prints "en-us", so I have to strip everything after the "-"
+    char loc[10] = {0};
+    strncpy(loc, locconst, 9);
+    for(int i=0; i<8; i++)
+        if ( (loc[i] == '-') || (loc[i] == '_') ) { loc[i] = 0; break; }
+
+    //TODO Explore possibility of using locale as-is, without stripping
+    return CefString(loc);
+>>>>>>> linux/linux
 }
 
 std::string ClientApp::GetExtensionJSSource()