gconf doesn't necessarily return a gedit scheme, e.g. if gedit is not installed. This patch simply lets us use the default scheme from gtksourceview rather than crashing.
Cheers, Jelmer
# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: [email protected] # target_branch: lp:bzr-gtk # testament_sha1: 8c129c9da51e8933562633be69f057678555dff2 # timestamp: 2009-06-10 20:24:16 +0200 # base_revision_id: [email protected] # # Begin patch === modified file 'diff.py' --- diff.py 2009-05-26 13:53:30 +0000 +++ diff.py 2009-06-10 18:24:03 +0000 @@ -95,9 +95,10 @@ client = gconf.client_get_default() style_scheme_name = client.get_string(GEDIT_SCHEME_PATH) - style_scheme = gtksourceview2.StyleSchemeManager().get_scheme(style_scheme_name) - - buf.set_style_scheme(style_scheme) + if style_scheme_name is not None: + style_scheme = gtksourceview2.StyleSchemeManager().get_scheme(style_scheme_name) + + buf.set_style_scheme(style_scheme) @classmethod def apply_colordiff_colors(klass, buf): # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWa5oLTIAAU5fgARQUeP//1IT iQC////wUANZdj1a5TVubvCSiEaY0hpkyJ5Mo/RTJG1NMmjyJgcwAAAAAAAAAAJRMhGU9TRplNqa agaPUAaeo9QaD1AkkTTU2hokwQGmm1ADRoDQAJRCaam1N6SmhgmQNGmTQAAbUMGOa5V6bTPN6b+4 Sy74syomk60pqtpgCXh854+44CqdPGB9BZL4P+fHrd96z5L9Wh043X0eVYydxp+vPt2Fk2YNR67Z 9LZQ7MZ+kYGCJ3dejr1Dmg4ddT+iC7fTXBRVzRBE2Gm6NqQ2nByDns3p5kV8cVBwEeFQQXESMqwS 0oRVikgP8k+9Dz2vpW7mYDwYZRsfCAGnL9Gdzr1TBzhk+/mIYVTVt0QgumnbYjmRDFpXVQvdBsmj QLBXsrUUjcmw3QZByTsym1DV2P5C7HEjGhNC2FYcOIcPahCRUOL73PIM8C63bM0Y2ucRdBHGO5Ms q67T42ZKJSZJjvQ1MgaEaJhORKmyyDPDZrZAi2mRAlkexEYWdvPgrFtZRTOj8JMKn9I3cYWDYxf0 UU65vvPTHszwcYM57sSB9jJj2aD7Zuuf5SVAi2aHlypa6mpAWo5VHmXj7M5kpntGMYXbtnXKKBUq OkdEyOXk5DjF4+EZyiQaDhluMoPTuUuSv4z8ZC3Z+ba85vutR7sKoO++DOyfZtkTVpG6A14RvLzw mOMV2thoYG6KGxbGQupWq+JmrXXCyoHDkNubGgxJTqkMPgMvz7V19UEqDyPjMjTNqf4thQWfFwcC FSxaGUypZsZI4LGY5VFUhutxbvIqiRPmXDE8I9iB4oaWu9/aLXWhjBJyNDKZrQ+wnpUKDil85V1Y 8mrER9doV7moyJUOtSmazDl2e37sOZHA3cWVhPRtlgTOYq8mYCK23UZ2Wyd85FBUMyZmZUiL91Rn qhHMcipgzfrIhlNDoBQNqvnSuhFRFJ5KsGLKRRL+iEUNiEg1oFhueRnpnSmmm9HJhTjKQtuckMt6 iJAPjd3cJIU5VXAa9ApObDbn1gw6iuvXF3FnDce9AvqqGGTbrkGGjRE/cl12KIe8e2pqCEr60/DP B5j/uW6nCWomV3SDSKDKe18J/syHHjg+GeexxrpAemcUUqSAic5uGohZi0XVb1USQPhdyRThQkK5 oLTI
-- bzr-gtk mailing list [email protected] Modify settings or unsubscribe at: https://lists.canonical.com/mailman/listinfo/bzr-gtk
