[GTK/MERGE] Small cleanups

[Jelmer Vernooij]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

John Arbash Meinel wrote:
> The attached bundle provides 5 fixes for bzr-gtk.
> 
> 1) Search around for 'olive.glade' rather than only looking in a couple
> hard-coded places. On my system (Mac OS X), python is installed in
> /opt/local/bin and there is a hard-coded search path of only
> /usr/share/olive/olive.glade or dirname(__file__) + 'olive.glade'.
> 
> After finding 'olive.glade' it assumes that is where the other ui glade
> files will be found. So it looks for 'cmenu.ui' in the same directory.
> 
> 2) fix 'bzr gdiff notafile'. It was using "tree2.inventory.path2id', but
> we have 'tree.path2id'.
> 
> 3) fix 'olive-gtk' to give nicer errors when it cannot startup. It was
> trying to 'i18n' certain strings by using _('foo'). However it never
> imported gettext to define _(). For now, I just got rid of the _ call.
> 
> 4) Update 'info_helper.py' to avoid working.inventory instead just using
> working.iter_entries_by_dir(). The code ends up simpler anyway, because
> you have an InventoryEntry and can use 'ie.kind()' rather than trying to
> use Inventory.get_file_kind(file_id)
> 
> 5) Change olive-gtk to not mix tab characters and space characters. I
> was guessing it was an accident, so I felt it was okay to switch
> everything to tabs.
> 
> All of these changes are available from:
> http://bazaar.launchpad.net/~jameinel/bzr-gtk/small-fixes
Better late than never. Merged, thanks!

Cheers,

Jelmer
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iQCVAwUBRjZPOAy0JeEGD2blAQLsxAP+LNwK+10D5kWQr6brV5K5K+t2/DvPNaeI
Po9R1FjhClt8VpA8nEmtgO2ujaszl29L7Sd8SCOZcpkgWcbtnokDzFoamP1sDxIS
TZWw5XrCB1UUpXeU4eROVyHIe4/eKxU8LdozU2EYcvlXdVbhB/9ugoVBVUrk2apF
T/qHF+H3Va8=
=s3m7
-----END PGP SIGNATURE-----