2005-05-20 Pierre-Luc Paour <gallery@paour.com> (1.4.2-b20)

* Added ability to force the Gallery version to avoid problems with auto-detection of G1 installations when the web server sends back a bogus 404 message. Just add to your GalleryRemote.properties a line with forceGalleryVersion.1=[1|2].
gallery · May 20, 2005 · 2b6f526 · 2b6f526
1 parent 5c70548
commit 2b6f526
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,10 @@
+2005-05-20  Pierre-Luc Paour <gallery@paour.com> (1.4.2-b20)
+
+	* Added ability to force the Gallery version to avoid problems with
+	  auto-detection of G1 installations when the web server sends back
+	  a bogus 404 message. Just add to your GalleryRemote.properties a line
+	  with forceGalleryVersion.1=[1|2].
+
 2005-05-19  Pierre-Luc Paour <gallery@paour.com> (1.4.2-b19)
 
 	* Added ability for the slideshow to loop.

diff --git a/com/gallery/GalleryRemote/model/Gallery.java b/com/gallery/GalleryRemote/model/Gallery.java
@@ -666,6 +666,8 @@ public static Gallery readFromProperties(GalleryProperties p, int prefsIndex, St
 		}
 		g.setAlias(p.getProperty(ALIAS + prefsIndex));
 
+		g.forceGalleryVersion = p.getIntProperty(FORCE_GALLERY_VERSION + prefsIndex, 0);
+
 		g.setPrefsIndex(prefsIndex);
 
 		g.setBlockWrites(false);

diff --git a/com/gallery/GalleryRemote/prefs/PreferenceNames.java b/com/gallery/GalleryRemote/prefs/PreferenceNames.java
@@ -49,6 +49,7 @@ public interface PreferenceNames {
 	public static final String GL_GALLERY_URL = "glGalleryUrl.";
 	public static final String GL_LOGIN_URL = "glLoginUrl.";
 	public static final String ALIAS = "alias.";
+	public static final String FORCE_GALLERY_VERSION = "forceGalleryVersion.";
 
 	// Proxy panel
 	public static final String USE_PROXY = "useProxy";

diff --git a/defaults.properties b/defaults.properties
@@ -245,6 +245,6 @@ updateUrlBeta=http://gallery.sourceforge.net/gallery_remote_version_check_beta.p
 #
 # --- Do not edit below this line ---
 #
-version=1.4.2-b19
-releaseDate=2005/05/19
+version=1.4.2-b20
+releaseDate=2005/05/20
 aboutText=Gallery Remote\n \n \nA part of the Gallery Open-Source Project\nhttp://gallery.sourceforge.net\n \n \nMaintained by:\n \nPierre-Luc Paour\n \n \nInitial version by Chris Smith\n \n \nContributors:\n \nTim Miller\nDolan Halbrook\nMarkus Cozowicz\nScott Gartner\nAmedeo Paglione\nChris Schwerdt\nSeth Ladd\n \n \nArtwork by Ross A. Reyman\n \n \nBundled software:\n \nImageMagick\nJava look and feel Graphics Repository icons\njpegtran, Guido Vollbeding's version\nMetadataExtractor