openlp-core team mailing list archive

[Tim Bentley <tim.bentley@xxxxxxxxx>]

Tim Bentley has proposed merging lp:~trb143/openlp/bug-794380 into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  Bug #794380 in OpenLP: "Media item list widgets show incorrect shading"
  https://bugs.launchpad.net/openlp/+bug/794380

For more details, see:
https://code.launchpad.net/~trb143/openlp/bug-794380/+merge/64281

Fix parentage bug so display is now correct.
Remove deprecated references from the desktop file.
-- 
https://code.launchpad.net/~trb143/openlp/bug-794380/+merge/64281
Your team OpenLP Core is requested to review the proposed merge of lp:~trb143/openlp/bug-794380 into lp:openlp.

=== modified file 'openlp/core/lib/mediamanageritem.py'
--- openlp/core/lib/mediamanageritem.py	2011-06-06 18:09:56 +0000
+++ openlp/core/lib/mediamanageritem.py	2011-06-11 07:11:29 +0000
@@ -90,7 +90,7 @@
         """
         Constructor to create the media manager item.
         """
-        QtGui.QWidget.__init__(self, parent)
+        QtGui.QWidget.__init__(self)
         self.hide()
         self.whitespace = re.compile(r'[\W_]+', re.UNICODE)
         self.plugin = plugin

=== modified file 'resources/openlp.desktop'
--- resources/openlp.desktop	2011-03-25 18:50:25 +0000
+++ resources/openlp.desktop	2011-06-11 07:11:29 +0000
@@ -2,7 +2,6 @@
 Categories=AudioVideo;
 Comment[de]=
 Comment=
-Encoding=UTF-8
 Exec=openlp %F
 GenericName[de]=Church lyrics projection
 GenericName=Church lyrics projection
@@ -13,7 +12,6 @@
 Path=
 StartupNotify=true
 Terminal=false
-TerminalOptions=
 Type=Application
 X-DBUS-ServiceName=
 X-DBUS-StartupType=