Replaced zenity dependency with mint-common's entrydialog

linuxmint · Jul 30, 2012 · 2aee6d6 · 2aee6d6
1 parent 72cb656
commit 2aee6d6
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,9 @@
+mintnanny (1.3.9) maya; urgency=low
+
+  * Replaced zenity dependency with mint-common's entrydialog
+
+ -- Clement Lefebvre <root@linuxmint.com>  Mon, 30 Jul 2012 14:34:55 +0100
+
 mintnanny (1.3.8) helena; urgency=low
 
   * Bug fix: redirecting warning/errors to /dev/null when using zenity

diff --git a/debian/control b/debian/control
@@ -1,13 +1,13 @@
 Source: mintnanny
 Section: admin
 Priority: optional
-Maintainer: clem <root@linuxmint.com>
+Maintainer: Clement Lefebvre <root@linuxmint.com>
 Build-Depends: debhelper (>= 5)
 Standards-Version: 3.7.2
 
 Package: mintnanny
 Architecture: all
-Depends: python (>= 2.4), python (<< 3), python-gtk2, python-glade2, zenity, mint-common
+Depends: python (>= 2.4), python (<< 3), python-gtk2, python-glade2, mint-common
 Conflicts: mintnanny-gnome, mintnanny-kde
 Replaces: mintnanny-gnome, mintnanny-kde
 Description: Domain blocker for Linux Mint

diff --git a/usr/lib/linuxmint/mintNanny/mintNanny.py b/usr/lib/linuxmint/mintNanny/mintNanny.py
@@ -53,8 +53,8 @@ def close(w, res):
 	dlg.connect("response", close)
 	dlg.show()
 
-def add_domain(widget, treeview_domains):
-	name = commands.getoutput("zenity --entry --text=\"" + _("Domain name:") + "\" --title=mintNanny --window-icon=/usr/lib/linuxmint/mintNanny/icon.svg 2> /dev/null")
+def add_domain(widget, treeview_domains):	
+	name = commands.getoutput("/usr/lib/linuxmint/common/entrydialog.py '" + _("Please type the domain name you want to block") + "' '" + _("Domain name:") + "' '' 'mintNanny' 2> /dev/null")
 	domain = name.strip()
 	if domain != '':
 		model = treeview_domains.get_model()