Merge lp:~saurabhanandiit/gtg/exportFixed into lp:~gtg/gtg/old-trunk

[Saurabh Anand]

This bug solves the empty window bug after closing the Export tasks plugin window.

[Izidor Matušov (izidor)]

Thanks for the patch

review: Approve (running, code)

=== modified file 'AUTHORS'
--- AUTHORS	2012-03-31 09:25:48 +0000
+++ AUTHORS	2012-04-01 12:45:23 +0000
@@ -102,4 +102,8 @@
 * Steve Scheel <[e-mail]>
 * Anant Gupta <[e-mail]>
 * Marta Maria Casetti <[e-mail]>
+<<<<<<< TREE
 * Song Yangyu <[e-mail]>
+=======
+* Saurabh Anand <[e-mail]>
+>>>>>>> MERGE-SOURCE
 
=== modified file 'CHANGELOG'
--- CHANGELOG	2012-04-01 08:22:34 +0000
+++ CHANGELOG	2012-04-01 12:45:23 +0000
@@ -8,10 +8,14 @@
     * Saved searches could have assigned color
     * Stopped links from opening when accidently letting go of mouse button while selecting them, #823339, by Steve Scheel
     * Search through DBus
+<<<<<<< TREE
     * Small change to QuickAdd toolbar:
       * there is allowed whitespace after due: and others, i.e. "due: 2012-04-01" is parsed as a valid attribute
       * added start: which has the same meaning as defer:
     * Automatic restore a backup XML file if the original XML file could not be loaded
+=======
+    * Solved the Empty window after closing the export tasks window problem
+>>>>>>> MERGE-SOURCE
 
 2012-02-13 Getting Things GNOME! 0.2.9
     * Big refractorization of code, now using liblarch
 
=== modified file 'GTG/plugins/export/export.py'
--- GTG/plugins/export/export.py	2012-03-26 22:14:55 +0000
+++ GTG/plugins/export/export.py	2012-04-01 12:45:23 +0000
@@ -227,6 +227,7 @@
 
     def __gtk_hide(self, sender = None, data = None):
         self.export_dialog.hide()
+        return True
 
     def __on_combo_changed(self, widget = None):
         if self.load_template():