Merge lp:~kiwinote/software-center/bug893247 into lp:software-center

[Kiwinote]

In videoplayer.py we import Gst, but the current version of the code doesn't use it. Importing Gst requires a dependency on gir1.2-gstreamer-0.10, but this isn't installed by default. This results in s-c hanging on startup.

[Gary Lasker (gary-lasker)]

D'oh! Good catch, kiwinote, thanks!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-11-21 13:03:59 +0000
+++ debian/changelog	2011-11-21 20:40:28 +0000
@@ -1,3 +1,13 @@
+software-center (5.1.2.1) UNRELEASED; urgency=low
+
+  [ Kiwinote ]
+  * sc/ui/gtk3/widgets/videoplayer.py:
+    - don't import Gst - we don't use it at the moment
+      this unbreaks startup for those who don't have gir1.2-gstreamer-0.10
+      installed (LP: #893247)
+
+ -- Kiwinote <[e-mail]>  Mon, 21 Nov 2011 20:29:35 +0000
+
 software-center (5.1.2) precise; urgency=low
 
   [ Michael Vogt ]

=== modified file 'softwarecenter/ui/gtk3/widgets/videoplayer.py'
--- softwarecenter/ui/gtk3/widgets/videoplayer.py	2011-11-11 03:20:16 +0000
+++ softwarecenter/ui/gtk3/widgets/videoplayer.py	2011-11-21 20:40:28 +0000
@@ -21,7 +21,9 @@
 
 from gettext import gettext as _
 from gi.repository import Gdk
-from gi.repository import Gst
+# FIXME: uncomment this import and add a dependency on gir1.2-gstreamer-0.10
+#        if we start using VideoPlayerGtk3
+# from gi.repository import Gst
 from gi.repository import Gtk
 from gi.repository import WebKit
 
@@ -144,7 +146,7 @@
 if __name__ == "__main__":
     logging.basicConfig()
     Gdk.threads_init()
-    Gst.init(sys.argv)
+    # Gst.init(sys.argv)
 
     win = get_test_videoplayer_window()
     Gtk.main()