Midori Web Browser

Merge lp://qastaging/~midori/midori/builtInIcons into lp://qastaging/midori

  1. builtInIcons
  2. Merge into trunk
Proposed by Cris Dywan
Status: Merged
Approved by: Paweł Forysiuk
Approved revision: 7027
Merged at revision: 7030
Proposed branch: lp://qastaging/~midori/midori/builtInIcons
Merge into: lp://qastaging/midori
Diff against target: 72 lines (+21/-1)
3 files modified
icons/CMakeLists.txt (+5/-1)
icons/index.theme (+12/-0)
katze/midori-paths.vala (+4/-0)
To merge this branch: bzr merge lp://qastaging/~midori/midori/builtInIcons
Reviewer Review Type Date Requested Status
Paweł Forysiuk Approve
gue5t gue5t Needs Fixing
Review via email: mp+268174@code.qastaging.launchpad.net

Commit message

Add fake theme for built-in icons

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

In order for this to work (adblock to find its icons without being installed), this needs to change so that the folder structure looks like: "dir_we_add_to_search_paths/hicolor/index.theme". Right now our index.theme and size folders are directly children of the dir_we_add_to_search_path. See documentation at <https://developer.gnome.org/gtk3/stable/GtkIconTheme.html#gtk-icon-theme-set-search-path>.

We could rename folders or create symlinks as part of build to achieve this; I'm not sure which is easier/cleaner.

review: Needs Fixing
lp://qastaging/~midori/midori/builtInIcons updated
7025. By gue5t <email address hidden>

simplify path handing and make a symlink at build-time to show adblock icons without install

7026. By gue5t <email address hidden>

guard symlink in CMake with UNIX check

7027. By Cris Dywan

Move all icons into the new folder structure

Revision history for this message
Paweł Forysiuk (tuxator) :
review: Approve

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: