diff --git a/usr/lib/linuxmint/mintMenu/mintMenu.py b/usr/lib/linuxmint/mintMenu/mintMenu.py index a1dd833..834c441 100755 --- a/usr/lib/linuxmint/mintMenu/mintMenu.py +++ b/usr/lib/linuxmint/mintMenu/mintMenu.py @@ -9,7 +9,6 @@ from gi.repository import Gio try: import sys - sys.path.append('/usr/lib/linuxmint/mintMenu/plugins') from gi.repository import Pango import os import commands @@ -20,7 +19,6 @@ try: import ctypes from ctypes import * import capi - from execute import * import xdg.Config except Exception, e: print e @@ -67,7 +65,7 @@ if not windowManager: xdg.Config.setWindowManager( windowManager.upper() ) from easybuttons import iconManager -#from execute import * COMMENTED DURING MIGRATION +from execute import * class MainWindow( object ): """This is the main class for the application""" @@ -739,10 +737,8 @@ class MenuWin( object ): self.loadSettings() self.updateButton() - def showAboutDialog( self, uicomponent, verb ): + def showAboutDialog( self, action, userdata = None ): - Gtk.about_dialog_set_email_hook( lambda dialog, mail: gnomevfs.url_show( "mailto:" + mail ) ) - Gtk.about_dialog_set_url_hook( lambda dialog, url: gnomevfs.url_show( url ) ) about = Gtk.AboutDialog() about.set_name("mintMenu") import commands @@ -759,7 +755,7 @@ class MenuWin( object ): except Exception, detail: print detail about.set_comments( _("Advanced Gnome Menu") ) - about.set_authors( ["Clement Lefebvre ", "Lars-Peter Clausen "] ) + # about.set_authors( ["Clement Lefebvre ", "Lars-Peter Clausen "] ) about.set_translator_credits(("translator-credits") ) #about.set_copyright( _("Based on USP from S.Chanderbally") ) about.set_logo( GdkPixbuf.Pixbuf.new_from_file("/usr/lib/linuxmint/mintMenu/icon.svg") ) diff --git a/usr/lib/linuxmint/mintMenu/plugins/applications.py b/usr/lib/linuxmint/mintMenu/plugins/applications.py index 839b4c7..855b83f 100755 --- a/usr/lib/linuxmint/mintMenu/plugins/applications.py +++ b/usr/lib/linuxmint/mintMenu/plugins/applications.py @@ -32,7 +32,7 @@ import matemenu from user import home -GObject.threads_init() +Gdk.threads_init() # i18n gettext.install("mintmenu", "/usr/share/linuxmint/locale") @@ -1001,8 +1001,9 @@ class pluginclass( object ): startupMenuItem.connect( "toggled", self.onAddToStartup, widget ) mTree.connect( 'deactivate', self.onMenuPopupDeactivate) - gtk.gtk_menu_popup(hash(mTree), None, None, None, 3, 0) - #mTree.popup( None, None, None, event.button, event.time ) + gtk.gtk_menu_popup(hash(mTree), None, None, None, None, 0, 0) + #mTree.popup( None, None, None, None, event.button, event.time ) + print "sdfdfs" return True def onMenuPopupDeactivate( self, widget): diff --git a/usr/lib/linuxmint/mintMenu/plugins/places.py b/usr/lib/linuxmint/mintMenu/plugins/places.py index 1a5d37b..24ca1af 100755 --- a/usr/lib/linuxmint/mintMenu/plugins/places.py +++ b/usr/lib/linuxmint/mintMenu/plugins/places.py @@ -258,9 +258,10 @@ class pluginclass( object ): trashMenu.append(emptyTrashMenuItem) trashMenu.show_all() emptyTrashMenuItem.connect ( "activate", self.emptyTrash, widget ) - gtk.gtk_menu_popup(hash(trashMenu), None, None, None, 3, 0) + gtk.gtk_menu_popup(trashMenu, None, None, None, None, 3, 0) #trashMenu.popup( None, None, None, event.button, event.time ) # self.mintMenuWin.grab() + return True def emptyTrash( self, menu, widget):