[SCM] GeoGebra: Dynamic mathematics software for education branch, build, updated. debian/3.2.47.0+dfsg1-1-29-g84ae449

[Giovanni Mascellani]

The following commit has been merged in the build branch:
commit e6c97840023d17976ca9779688e5090a89a88d20
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date:   Fri Dec 16 14:55:56 2011 +0100

    Update patches.

diff --git a/debian/patches/patch/no_mac.diff b/debian/patches/patch/no_mac.diff
index 51df825..75ae1ce 100644
--- a/debian/patches/patch/no_mac.diff
+++ b/debian/patches/patch/no_mac.diff
@@ -6,9 +6,31 @@ Removes Mac OS X specific code.
 Signed-off-by: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
 
 ---
+ geogebra/gui/app/GeoGebraFrame.java          |   10 ---
  geogebra/gui/app/MacApplicationListener.java |  101 --------------------------
- 1 files changed, 0 insertions(+), 101 deletions(-)
+ 2 files changed, 0 insertions(+), 111 deletions(-)
 
+diff --git a/geogebra/gui/app/GeoGebraFrame.java b/geogebra/gui/app/GeoGebraFrame.java
+index bafbee0..4ee3b7a 100644
+--- a/geogebra/gui/app/GeoGebraFrame.java
++++ b/geogebra/gui/app/GeoGebraFrame.java
+@@ -255,16 +255,6 @@ public class GeoGebraFrame extends JFrame implements WindowFocusListener {
+ 	 * 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(
 diff --git a/geogebra/gui/app/MacApplicationListener.java b/geogebra/gui/app/MacApplicationListener.java
 deleted file mode 100644
 index 0c53155..0000000

-- 
GeoGebra: Dynamic mathematics software for education