Bazaar GTK+ Frontends

Merge lp://staging/~ebichete/bzr-gtk/bugfix_lp429947 into lp://staging/bzr-gtk/gtk2

  1. bugfix_lp429947
  2. Merge into gtk2
Proposed by Edward Ari Bichetero
Status: Merged
Approved by: Jelmer Vernooij
Approved revision: 700
Merged at revision: 710
Proposed branch: lp://staging/~ebichete/bzr-gtk/bugfix_lp429947
Merge into: lp://staging/bzr-gtk/gtk2
Diff against target: 25 lines (+8/-3)
1 file modified
diff.py (+8/-3)
To merge this branch: bzr merge lp://staging/~ebichete/bzr-gtk/bugfix_lp429947
Reviewer Review Type Date Requested Status
Martin Pool (community) Approve
Review via email: mp+39221@code.staging.launchpad.net

Commit message

Fix a crash in 'bzr gdiff' when the user has a gedit highlighting scheme that is also not in the system-wide gedit styles directory.

Description of the change

Fix a crash in 'bzr gdiff' when the user has a gedit highlighting scheme that is also not in the system-wide gedit styles directory.

This fixes bug #429947 (Problem in viewing revision difference from `bzr visualise`)

To post a comment you must log in.
Revision history for this message
Martin Pool (mbp) wrote :

Bit ugly it has to be hardcoded in there, but this seems useful and consistent with the existing code.

review: Approve
Revision history for this message
Edward Ari Bichetero (ebichete) wrote :

> Bit ugly it has to be hardcoded in there, but this seems useful and consistent
> with the existing code.

I agree about the hardcoding. I just could not find a clean way of obtaining the user's gEdit configuration directory.

Revision history for this message
Curtis Hovey (sinzui) wrote :

There is no /correct/ way to locate where gtksourceview2 styles are located. .gnome2/gedit/styles is deprecated and the class does not make that clear.

For the last 18 months or more, user gtksourceview2 styles and languages are kept in ~/.local/share/gtksourceview-2.0. The order of precedence is .local, then .gnome2, then usr/share

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes:
to status/vote changes: