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

Proposed by Saurabh Anand on 2012-04-01
Status: Merged
Merged at revision: 1148
Proposed branch: lp:~saurabhanandiit/gtg/exportFixed
Merge into: lp:~gtg/gtg/old-trunk
Diff against target: 43 lines (+9/-0) (has conflicts)
3 files modified
AUTHORS (+4/-0)
CHANGELOG (+4/-0)
GTG/plugins/export/export.py (+1/-0)
Text conflict in AUTHORS
Text conflict in CHANGELOG
To merge this branch: bzr merge lp:~saurabhanandiit/gtg/exportFixed
Reviewer Review Type Date Requested Status
Izidor Matušov running, code 2012-04-01 Approve on 2012-04-01
Review via email: mp+100332@code.launchpad.net

Description of the change

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

To post a comment you must log in.
Izidor Matušov (izidor) wrote :

Thanks for the patch

review: Approve (running, code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'AUTHORS'
2--- AUTHORS 2012-03-31 09:25:48 +0000
3+++ AUTHORS 2012-04-01 12:45:23 +0000
4@@ -102,4 +102,8 @@
5 * Steve Scheel <nmu.sscheel@gmail.com>
6 * Anant Gupta <anant718@hotmail.com>
7 * Marta Maria Casetti <mmcasetti@gmail.com>
8+<<<<<<< TREE
9 * Song Yangyu <flyfy1@gmail.com>
10+=======
11+* Saurabh Anand <saurabhanandiit@gmail.com>
12+>>>>>>> MERGE-SOURCE
13
14=== modified file 'CHANGELOG'
15--- CHANGELOG 2012-04-01 08:22:34 +0000
16+++ CHANGELOG 2012-04-01 12:45:23 +0000
17@@ -8,10 +8,14 @@
18 * Saved searches could have assigned color
19 * Stopped links from opening when accidently letting go of mouse button while selecting them, #823339, by Steve Scheel
20 * Search through DBus
21+<<<<<<< TREE
22 * Small change to QuickAdd toolbar:
23 * there is allowed whitespace after due: and others, i.e. "due: 2012-04-01" is parsed as a valid attribute
24 * added start: which has the same meaning as defer:
25 * Automatic restore a backup XML file if the original XML file could not be loaded
26+=======
27+ * Solved the Empty window after closing the export tasks window problem
28+>>>>>>> MERGE-SOURCE
29
30 2012-02-13 Getting Things GNOME! 0.2.9
31 * Big refractorization of code, now using liblarch
32
33=== modified file 'GTG/plugins/export/export.py'
34--- GTG/plugins/export/export.py 2012-03-26 22:14:55 +0000
35+++ GTG/plugins/export/export.py 2012-04-01 12:45:23 +0000
36@@ -227,6 +227,7 @@
37
38 def __gtk_hide(self, sender = None, data = None):
39 self.export_dialog.hide()
40+ return True
41
42 def __on_combo_changed(self, widget = None):
43 if self.load_template():

Subscribers

People subscribed via source and target branches

to status/vote changes: