5 files changed, 24 insertions, 19 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e27956cd..e8ee03b5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -86,7 +86,7 @@ if (UNIX AND NOT APPLE)
 endif ()
 embed_make (${EMBED_RESOURCES})
 
-set (EMB_BIN ${CMAKE_CURRENT_BINARY_DIR}/resources.binary)
+set (EMB_BIN ${CMAKE_CURRENT_BINARY_DIR}/resources.lgr)
 set_source_files_properties (${EMB_BIN} PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
 
 # Source files.
@@ -177,7 +177,7 @@ set (SOURCES
     res/about/help.gmi
     res/about/lagrange.gmi
     res/about/version.gmi
-    ${CMAKE_CURRENT_BINARY_DIR}/resources.binary
+    ${CMAKE_CURRENT_BINARY_DIR}/resources.lgr
     ${CMAKE_CURRENT_BINARY_DIR}/embedded.c
     ${CMAKE_CURRENT_BINARY_DIR}/embedded.h
 )
@@ -301,7 +301,7 @@ MimeType=x-scheme-handler/gemini;x-scheme-handler/gopher
     )
     if (NOT ENABLE_RESOURCE_EMBED)
         target_compile_definitions (app PUBLIC
-            LAGRANGE_EMB_BIN="${CMAKE_INSTALL_PREFIX}/share/lagrange/resources.binary")
+            LAGRANGE_EMB_BIN="${CMAKE_INSTALL_PREFIX}/share/lagrange/resources.lgr")
         install (FILES ${EMB_BIN} DESTINATION share/lagrange)
     endif ()
 endif ()
diff --git a/res/Embed.cmake b/res/Embed.cmake
index f21cfb14..3b65b36c 100644
--- a/res/Embed.cmake
+++ b/res/Embed.cmake
@@ -96,7 +96,7 @@ function (embed_make)
             endforeach (fn)
         else ()
             # Collect resources in a single binary file.
-            set (EMB_BIN ${CMAKE_CURRENT_BINARY_DIR}/resources.binary)
+            set (EMB_BIN ${CMAKE_CURRENT_BINARY_DIR}/resources.lgr)
             file (REMOVE ${EMB_BIN})
             list (LENGTH ARGV fileCount)            
             execute_process (COMMAND ${BINCAT_COMMAND} ${EMB_BIN} ${ARGV}
diff --git a/res/about/help.gmi b/res/about/help.gmi
index 86fec802..7260aeb5 100644
--- a/res/about/help.gmi
+++ b/res/about/help.gmi
@@ -344,10 +344,10 @@ Other Unix : ~/.config/lagrange/
 * bindings.txt
 * bookmarks.txt
 * feeds.txt
-* idents.binary and idents/
+* idents.lgr and idents/
 * mimehooks.txt
 * prefs.cfg
-* state.binary
+* state.lgr
 * trusted.txt
 * visited.txt
 
diff --git a/src/app.c b/src/app.c
index 8ee09651..a46a6976 100644
--- a/src/app.c
+++ b/src/app.c
@@ -74,25 +74,26 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 iDeclareType(App)
 
 #if defined (iPlatformApple)
-#define EMB_BIN "../../Resources/resources.binary"
+#define EMB_BIN "../../Resources/resources.lgr"
 static const char *dataDir_App_ = "~/Library/Application Support/fi.skyjake.Lagrange";
 #endif
 #if defined (iPlatformMsys)
-#define EMB_BIN "../resources.binary"
+#define EMB_BIN "../resources.lgr"
 static const char *dataDir_App_ = "~/AppData/Roaming/fi.skyjake.Lagrange";
 #endif
 #if defined (iPlatformLinux) || defined (iPlatformOther)
-#define EMB_BIN  "../../share/lagrange/resources.binary"
+#define EMB_BIN  "../../share/lagrange/resources.lgr"
 static const char *dataDir_App_ = "~/.config/lagrange";
 #endif
 #if defined (LAGRANGE_EMB_BIN) /* specified in build config */
 #  undef EMB_BIN
 #  define EMB_BIN LAGRANGE_EMB_BIN
 #endif
-#define EMB_BIN2 "../resources.binary" /* fallback from build/executable dir */
-static const char *prefsFileName_App_ = "prefs.cfg";
-static const char *stateFileName_App_ = "state.binary";
-static const char *downloadDir_App_   = "~/Downloads";
+#define EMB_BIN2 "../resources.lgr" /* fallback from build/executable dir */
+static const char *prefsFileName_App_    = "prefs.cfg";
+static const char *oldStateFileName_App_ = "state.binary";
+static const char *stateFileName_App_    = "state.lgr";
+static const char *downloadDir_App_      = "~/Downloads";
 
 static const int idleThreshold_App_ = 1000; /* ms */
 
@@ -265,7 +266,9 @@ static const char *magicTabDocument_App_ = "tabd";
 
 static iBool loadState_App_(iApp *d) {
     iUnused(d);
-    iFile *f = iClob(newCStr_File(concatPath_CStr(dataDir_App_, stateFileName_App_)));
+    const char *oldPath = concatPath_CStr(dataDir_App_, oldStateFileName_App_);
+    const char *path    = concatPath_CStr(dataDir_App_, stateFileName_App_);
+    iFile *f = iClob(newCStr_File(fileExistsCStr_FileInfo(path) ? path : oldPath));
     if (open_File(f, readOnly_FileMode)) {
         char magic[4];
         readData_File(f, 4, magic);
diff --git a/src/gmcerts.c b/src/gmcerts.c
index 0a5638fa..da918279 100644
--- a/src/gmcerts.c
+++ b/src/gmcerts.c
@@ -34,9 +34,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include <the_Foundation/time.h>
 #include <ctype.h>
 
-static const char *filename_GmCerts_       = "trusted.txt";
-static const char *identsDir_GmCerts_      = "idents";
-static const char *identsFilename_GmCerts_ = "idents.binary";
+static const char *filename_GmCerts_          = "trusted.txt";
+static const char *identsDir_GmCerts_         = "idents";
+static const char *oldIdentsFilename_GmCerts_ = "idents.binary";
+static const char *identsFilename_GmCerts_    = "idents.lgr";
 
 iDeclareClass(TrustEntry)
 
@@ -237,8 +238,9 @@ static void save_GmCerts_(const iGmCerts *d) {
 }
 
 static void loadIdentities_GmCerts_(iGmCerts *d) {
-    iFile *f =
-        iClob(new_File(collect_String(concatCStr_Path(&d->saveDir, identsFilename_GmCerts_))));
+    const iString *oldPath = collect_String(concatCStr_Path(&d->saveDir, oldIdentsFilename_GmCerts_));
+    const iString *path    = collect_String(concatCStr_Path(&d->saveDir, identsFilename_GmCerts_));
+    iFile *f = iClob(new_File(fileExists_FileInfo(path) ? path : oldPath));
     if (open_File(f, readOnly_FileMode)) {
         char magic[4];
         readData_File(f, sizeof(magic), magic);