OpenLP

Merge lp:~trb143/openlp/bugfixes into lp:openlp

  1. bugfixes
  2. Merge into trunk
Proposed by Tim Bentley
Status: Merged
Merged at revision: not available
Proposed branch: lp:~trb143/openlp/bugfixes
Merge into: lp:openlp
Diff against target: None lines
To merge this branch: bzr merge lp:~trb143/openlp/bugfixes
Reviewer Review Type Date Requested Status
Raoul Snyman Approve
Review via email: mp+12042@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Tim Bentley (trb143) wrote :

fix error in last merge

Revision history for this message
Raoul Snyman (raoul-snyman) :
review: Approve
lp:~trb143/openlp/bugfixes updated
549. By Tim Bentley

Correction from == to is

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'openlp/plugins/presentations/lib/impresscontroller.py'
--- openlp/plugins/presentations/lib/impresscontroller.py 2009-09-18 06:07:10 +0000
+++ openlp/plugins/presentations/lib/impresscontroller.py 2009-09-18 10:26:26 +0000
@@ -93,7 +93,7 @@
93 else:93 else:
94 desktop = self.getUNODesktop()94 desktop = self.getUNODesktop()
95 url = uno.systemPathToFileUrl(presentation)95 url = uno.systemPathToFileUrl(presentation)
96 if desktop==None:96 if desktop is None:
97 return97 return
98 try:98 try:
99 properties = []99 properties = []