Merge lp:~serpent-consulting-services/openobject-client/5.0-886608-SerpentCS into lp:openobject-client/5.0

Proposed by Serpent Consulting Services
Status: Needs review
Proposed branch: lp:~serpent-consulting-services/openobject-client/5.0-886608-SerpentCS
Merge into: lp:openobject-client/5.0
Diff against target: 22 lines (+7/-1)
1 file modified
bin/common/common.py (+7/-1)
To merge this branch: bzr merge lp:~serpent-consulting-services/openobject-client/5.0-886608-SerpentCS
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+81365@code.launchpad.net
To post a comment you must log in.

Unmerged revisions

1100. By Serpent Consulting Services

[FIX] Predefined exports failed due to the change in GTK version.Corrected by a fix

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/common/common.py'
2--- bin/common/common.py 2010-03-23 23:37:45 +0000
3+++ bin/common/common.py 2011-11-05 17:27:25 +0000
4@@ -558,11 +558,17 @@
5
6 response = win.run()
7 parent.present()
8+ # https://launchpad.net/ubuntu/+source/gtk+2.0/+changelog
9+ # https://launchpad.net/ubuntu/+source/gtk+2.0/2.20.0-0ubuntu1
10+ # https://bugzilla.gnome.org/show_bug.cgi?id=613549
11+ # https://bugzilla.gnome.org/show_bug.cgi?id=613241
12+ # New Version of GTK has the tendency to nullify the text after call to destroy,so we have to save the value
13+ ask_text = entry.get_text()
14 win.destroy()
15 if response == gtk.RESPONSE_CANCEL:
16 return None
17 else:
18- return entry.get_text()
19+ return ask_text
20
21 def concurrency(resource, id, context, parent=None):
22 dia = glade.XML(common.terp_path("openerp.glade"),'dialog_concurrency_exception',gettext.textdomain())