[SCM] GeoGebra: Dynamic mathematics software for education branch, patch/version, updated. upstream/4.0.19.0+dfsg1-160-g30bc5d3
Giovanni Mascellani
mascellani at poisson.phc.unipi.it
Mon Mar 12 00:03:47 UTC 2012
The following commit has been merged in the patch/version branch:
commit 30bc5d39c4b3e487769094137ee76a6238b3b549
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date: Mon Mar 12 00:28:03 2012 +0100
No old GeoGebra version warning.
diff --git a/.topmsg b/.topmsg
index 4100900..33444b2 100644
--- a/.topmsg
+++ b/.topmsg
@@ -2,6 +2,7 @@ From: Giovanni Mascellani <mascellani at 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 <mascellani at poisson.phc.unipi.it>
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);
--
GeoGebra: Dynamic mathematics software for education
More information about the pkg-java-commits
mailing list