[QGIS Commit] r9236 - in trunk/qgis/python/plugins: mapserver_export plugin_installer

[svn_qgis at osgeo.org]

Author: timlinux
Date: 2008-09-01 02:41:50 -0400 (Mon, 01 Sep 2008)
New Revision: 9236

Modified:
   trunk/qgis/python/plugins/mapserver_export/mapserverexport.py
   trunk/qgis/python/plugins/plugin_installer/installer_plugin.py
Log:
Let qgis core plugins work with qgis api changes

Modified: trunk/qgis/python/plugins/mapserver_export/mapserverexport.py
===================================================================
--- trunk/qgis/python/plugins/mapserver_export/mapserverexport.py	2008-08-31 20:45:38 UTC (rev 9235)
+++ trunk/qgis/python/plugins/mapserver_export/mapserverexport.py	2008-09-01 06:41:50 UTC (rev 9236)
@@ -37,14 +37,14 @@
   def initGui(self):  
     # Create action that will start plugin configuration
     self.action = QAction(QIcon(":/plugins/mapserver_export/icon.png"), \
-        "MapServer Export", self.iface.getMainWindow())
+        "MapServer Export", self.iface.mainWindow())
     #self.action.setWhatsThis("Configuration for Zoom To Point plugin")
     # connect the action to the run method
     QObject.connect(self.action, SIGNAL("activated()"), self.run) 
 
     # Add toolbar button and menu item
     self.iface.addToolBarIcon(self.action)
-    self.iface.addPluginMenu("&MapServer Export...", self.action)
+    self.iface.addPluginToMenu("&MapServer Export...", self.action)
 
   def unload(self):
     # Remove the plugin menu item and icon

Modified: trunk/qgis/python/plugins/plugin_installer/installer_plugin.py
===================================================================
--- trunk/qgis/python/plugins/plugin_installer/installer_plugin.py	2008-08-31 20:45:38 UTC (rev 9235)
+++ trunk/qgis/python/plugins/plugin_installer/installer_plugin.py	2008-09-01 06:41:50 UTC (rev 9236)
@@ -25,13 +25,13 @@
   # ----------------------------------------- #
   def initGui(self):
     # create action that will start plugin configuration
-    self.action = QAction(QIcon(":/plugins/installer/icon.xpm"), "Install plugins", self.iface.getMainWindow())
+    self.action = QAction(QIcon(":/plugins/installer/icon.xpm"), "Install plugins", self.iface.mainWindow())
     self.action.setWhatsThis("Plugin Installer")
     QObject.connect(self.action, SIGNAL("activated()"), self.run)
 
     # add toolbar button and menu item
     self.iface.addToolBarIcon(self.action)
-    self.iface.addPluginMenu("&Plugin Installer", self.action)
+    self.iface.addPluginToMenu("&Plugin Installer", self.action)
 
   # ----------------------------------------- #
   def unload(self):