Olive fails to start when installed on Windows

[James Cook]

After installing on Windows XP by following the instructions for a Windows install (http://wiki.bazaar.canonical.com/WindowsInstall), olive-gtk fails to start.

bzr-gtk version 0.97.0 was installed.

Here is the error message displayed after running olive-gtk.bat:
Traceback (most recent call last):
  File "C:\Python25\Scripts\olive-gtk", line 93, in <module>
    app = OliveGtk()
  File "C:\Python25\Lib\site-packages\bzrlib\plugins\gtk\olive\__init__.py", line 90, in __init__
    self.window = OliveGui(calling_app = self)
  File "C:\Python25\Lib\site-packages\bzrlib\plugins\gtk\olive\window.py", line 37, in __init__
    self.set_icon_list(gtk.gdk.pixbuf_new_from_file(icon_path("oliveicon2.png")),
TypeError: pixbuf_new_from_file() argument 1 must be string, not None

Note that this is the same error described in bug #384536, but in that case the install was not on Windows.

I was able to fix it locally by adding the path to C:\Python25\share\bzr-gtk to the list of directories returned by data_basedirs() in "C:\Python25\Lib\site-packages\bzrlib\plugins\gtk\__init__.py". I attached a patch file that makes the change.

[Jelmer Vernooij (jelmer)]

Hi James, can you perhaps provide a unified diff?