Merge lp:~lesuisse-dev/joliebulle/bugfix-1049572 into lp:joliebulle

[Le suisse]

Fix #1049572

=== modified file 'main.py'
--- main.py	2012-09-11 16:41:24 +0000
+++ main.py	2012-09-13 14:51:44 +0000
@@ -461,7 +461,7 @@
         menuFile.addAction(self.actionEnregistrer)
         menuFile.addAction(self.actionEnregistrer_Sous)
         menuFile.addAction(self.actionExporterHtml)
-        menuFile.addAction(self.actionQuitter_2)
+        menuFile.addAction(self.actionQuitter)
 
         # le menu ingredients
         menuIngredients=generalMenu.addMenu(self.trUtf8('''Ingrédients'''))
@@ -538,6 +538,7 @@
         self.connect(self.actionRecharger, QtCore.SIGNAL("triggered()"), self.recharger)
         #self.connect(self.actionSwitch, QtCore.SIGNAL("triggered()"), self.switch)
         self.actionImporter.triggered.connect(self.importInLib)
+        self.connect(self.actionQuitter, QtCore.SIGNAL("triggered()"), app, QtCore.SLOT("quit()"))
         
         self.connect(self.actionEditGrains, QtCore.SIGNAL("triggered()"), self.editGrains)
         self.connect(self.actionEditHoublons, QtCore.SIGNAL("triggered()"), self.editHoublons)