The following commit has been merged in the build branch:
commit e4334eb02290062faf450718d7935c8849100278
Author: Giovanni Mascellani <mascell...@poisson.phc.unipi.it>
Date: Mon Mar 12 00:29:59 2012 +0100
Update patches.
diff --git a/debian/patches/patch/version.diff
b/debian/patches/patch/version.diff
index cee26b6..5aec1e6 100644
--- a/debian/patches/patch/version.diff
+++ b/debian/patches/patch/version.diff
@@ -2,16 +2,18 @@ From: Giovanni Mascellani <mascell...@poisson.phc.unipi.it>
Subject: [PATCH] patch/version
Patches GeoGebra in order to make the Debian version visible
-along with the upstream one.
+along with the upstream one. Also, do not warn the user if
+he's using an old version of GeoGebra.
Signed-off-by: Giovanni Mascellani <mascell...@poisson.phc.unipi.it>
---
geogebra/GeoGebra.java | 2 ++
geogebra/GeoGebraAppletPreloader.java | 3 ++-
+ geogebra/gui/app/GeoGebraFrame.java | 7 -------
geogebra/gui/menubar/GeoGebraMenuBar.java | 4 +++-
geogebra/main/Application.java | 3 ++-
- 4 files changed, 9 insertions(+), 3 deletions(-)
+ 5 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/geogebra/GeoGebra.java b/geogebra/GeoGebra.java
index c503fc7..2a279c4 100644
@@ -40,6 +42,27 @@ index d8de89d..2929722 100644
loadAllJarFiles(true);
}
+diff --git a/geogebra/gui/app/GeoGebraFrame.java
b/geogebra/gui/app/GeoGebraFrame.java
+index bc5fbe0..ec0f215 100644
+--- a/geogebra/gui/app/GeoGebraFrame.java
++++ b/geogebra/gui/app/GeoGebraFrame.java
+@@ -467,16 +467,9 @@ public class GeoGebraFrame extends JFrame implements
WindowFocusListener {
+ String dl =
app.getPlain("GoToDownloadPage");
+ Object[] options = {
app.getMenu("Cancel"), dl };
+ Component comp =
app.getMainComponent();
+- int returnVal =
JOptionPane.showOptionDialog(comp, q,
+- dl,
JOptionPane.DEFAULT_OPTION,
+-
JOptionPane.WARNING_MESSAGE, null, options,
+- options[0]);
+ // store date of current check
only when notification has been shown:
+
GeoGebraPreferences.getPref().savePreference(
+
GeoGebraPreferences.VERSION_LAST_CHECK, nowLS);
+- if (returnVal == 1) {
+-
app.getGuiManager().showURLinBrowser(INSTALLERS_URL);
+- }
+ }
+ } catch (Exception ex) {
+ System.err.println(ex);
diff --git a/geogebra/gui/menubar/GeoGebraMenuBar.java
b/geogebra/gui/menubar/GeoGebraMenuBar.java
index 6991e2c..d6529df 100644
--- a/geogebra/gui/menubar/GeoGebraMenuBar.java
--
GeoGebra: Dynamic mathematics software for education
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
