[SCM] GeoGebra: Dynamic mathematics software for education branch, patch/no_mac, updated. upstream/4.0.19.0+dfsg1-187-g398064f

[Giovanni Mascellani]

The following commit has been merged in the patch/no_mac branch:
commit 398064f746d1c5ed6a5196cd737c8539984475d2
Merge: ada5b8295084987425c05c1126e42e2797ceb4e7 cb0585b952c976be56d9811276f8222975abd743
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date:   Sat May 12 00:30:36 2012 +0200

    Merge commit 'refs/top-bases/patch/no_mac' into patch/no_mac

diff --combined geogebra/gui/app/GeoGebraFrame.java
index 2c8f7df,ec4dda1..b5b8ec2
--- a/geogebra/gui/app/GeoGebraFrame.java
+++ b/geogebra/gui/app/GeoGebraFrame.java
@@@ -255,6 -255,16 +255,6 @@@ public class GeoGebraFrame extends JFra
  	 * MacOS X specific initing. Note: this method can only be run on a Mac!
  	 */
  	public static void initMacSpecifics() {
 -		try {
 -			// init mac application listener
 -			MacApplicationListener.initMacApplicationListener();
 -
 -			// mac menu bar
 -			// System.setProperty("com.apple.macos.useScreenMenuBar", "true");
 -			System.setProperty("apple.laf.useScreenMenuBar", "true");
 -		} catch (Exception e) {
 -			Application.debug(e + "");
 -		}
  	}
  
  	public static synchronized GeoGebraFrame createNewWindow(
@@@ -416,6 -426,9 +416,9 @@@
  		 */
  		
  		private void checkVersion() {
+ 			if (!Application.getVersionCheckAllowed())
+ 				return;
+ 			
  			String lastVersionCheck = GeoGebraPreferences.getPref()
  					.loadPreference(GeoGebraPreferences.VERSION_LAST_CHECK, "");
  			Long nowL = new Date().getTime();

-- 
GeoGebra: Dynamic mathematics software for education