alacarte r426 - in trunk: . Alacarte

[cosimoc svn gnome org]

Author: cosimoc
Date: Mon Feb 16 14:17:13 2009
New Revision: 426
URL: http://svn.gnome.org/viewvc/alacarte?rev=426&view=rev

Log:
2009-02-16  Cosimo Cecchi  <cosimoc gnome org>

	* Alacarte/MainWindow.py: drop libgnomeui dependency.
	* configure.ac: bump required PyGTK version to 2.13.0,
	due to gtk.show_uri().
	Patch by Andreas Proschofsky, fixes bug #570493.


Modified:
   trunk/Alacarte/MainWindow.py
   trunk/ChangeLog
   trunk/configure.ac

Modified: trunk/Alacarte/MainWindow.py
==============================================================================
--- trunk/Alacarte/MainWindow.py	(original)
+++ trunk/Alacarte/MainWindow.py	Mon Feb 16 14:17:13 2009
@@ -16,7 +16,7 @@
 #   License along with this library; if not, write to the Free Software
 #   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-import gtk, gtk.glade, gmenu, gobject, gio, gnome.ui
+import gtk, gtk.glade, gmenu, gobject, gio
 import cgi, os
 import gettext
 import subprocess
@@ -48,7 +48,6 @@
 		self.file_path = datadir
 		self.version = version
 		self.editor = MenuEditor()
-		self.gnome_program = gnome.init('alacarte', version)
 		gtk.window_set_default_icon_name('alacarte')
 		self.tree = gtk.glade.XML(os.path.join(self.file_path, 'alacarte.glade'))
 		signals = {}
@@ -597,7 +596,7 @@
 		self.editor.redo()
 
 	def on_help_button_clicked(self, *args):
-		gnome.help_display_desktop(self.gnome_program, 'user-guide', 'user-guide.xml', 'menu-editor')
+		gtk.show_uri(gtk.gdk.screen_get_default(), "ghelp:user-guide#menu-editor", gtk.get_current_event_time())
 
 	def on_revert_button_clicked(self, button):
 		dialog = self.tree.get_widget('revertdialog')

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Mon Feb 16 14:17:13 2009
@@ -7,7 +7,7 @@
 AM_MAINTAINER_MODE
 
 m4_define(required_pygobject_version, 2.15.1)
-m4_define(required_pygtk_version, 2.8.0)
+m4_define(required_pygtk_version, 2.13.0)
 
 dnl put the ACLOCAL flags in the makefile
 ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"