2004-08-17 Pierre-Luc Paour <gallery@paour.com> (1.4.1-b8)

* Fixed duplicate root album in New Album dialog on G2.
gallery · Aug 17, 2004 · 4dc0e64 · 4dc0e64
1 parent aaee8b3
commit 4dc0e64
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 2 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+2004-08-17  Pierre-Luc Paour <gallery@paour.com> (1.4.1-b8)
+
+	* Fixed duplicate root album in New Album dialog on G2.
+
 2004-08-13  Pierre-Luc Paour <gallery@paour.com> (1.4.1-b7)
 
 	* Fixed cookie handling in HTTPClient (fixes losing G2 sessions).

diff --git a/com/gallery/GalleryRemote/GalleryComm2_5.java b/com/gallery/GalleryRemote/GalleryComm2_5.java
@@ -38,6 +38,8 @@ protected GalleryComm2_5(Gallery g) {
 
 		Arrays.sort(capabilities2);
 		Arrays.sort(capabilities3);
+
+		g.setGalleryVersion(2);
 	}
 
     public NVPair[] fudgeParameters(NVPair[] data) {

diff --git a/com/gallery/GalleryRemote/model/Gallery.java b/com/gallery/GalleryRemote/model/Gallery.java
@@ -65,6 +65,7 @@ public class Gallery extends DefaultTreeModel implements Serializable, Preferenc
 	transient private Boolean ambiguousUrl;
 	transient private boolean blockWrites = false;
 	transient public boolean cookieLogin = false;
+	transient public int galleryVersion = 1;
 
 	public static String types[] = new String[]{STANDALONE, POSTNUKE, PHPNUKE, GEEKLOG};
 	public static final int TYPE_STANDALONE = 0;
@@ -850,6 +851,11 @@ public ArrayList getFlatAlbumList() {
 			} else {
 				flatAlbumList = null;
 			}
+
+			// G2 root is a normal album, don't add a fake root...
+			if (galleryVersion == 2) {
+				flatAlbumList.remove(getRoot());
+			}
 		}
 
 		return flatAlbumList;
@@ -867,4 +873,12 @@ public Album createRootAlbum() {
 
 		return (Album) getRoot();
 	}
+
+	public int getGalleryVersion() {
+		return galleryVersion;
+	}
+
+	public void setGalleryVersion(int galleryVersion) {
+		this.galleryVersion = galleryVersion;
+	}
 }
diff --git a/defaults.properties b/defaults.properties
@@ -234,6 +234,6 @@ updateUrlBeta=http://gallery.sourceforge.net/gallery_remote_version_check_beta.p
 #
 # --- Do not edit below this line ---
 #
-version=1.4.1-b7
-releaseDate=2004/08/13
+version=1.4.1-b8
+releaseDate=2004/08/17
 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\n \n \nArtwork by Ross A. Reyman\n \n \nBundled software:\n \nImageMagick\nJSX\nJava look and feel Graphics Repository icons\njpegtran, Guido Vollbeding's version\nMetadataExtractor