Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Do not resolve paths in get_pixbuf_from_file #1314

Merged
merged 1 commit into from
Apr 8, 2024

Conversation

zappolowski
Copy link
Member

The arguments should be already resolved:

  • if it's either new_icon or default_icon it should be done while parsing the configuration
  • if it's coming from DBus whoever sent the message should give a fully resolved path

This fixes #1307.

@zappolowski zappolowski requested a review from bynect March 11, 2024 18:06
@bynect
Copy link
Member

bynect commented Mar 11, 2024

Am I right in thinking that string_to_path is called in the option parser for the icon paths?

@zappolowski
Copy link
Member Author

Am I right in thinking that string_to_path is called in the option parser for the icon paths?

Yes, both default_icon and new_icon are TYPE_PATH and string_to_path is called on them in set_from_string.

@zappolowski zappolowski marked this pull request as ready for review April 5, 2024 08:32
@codecov-commenter
Copy link

codecov-commenter commented Apr 5, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 65.71%. Comparing base (07b68f0) to head (26ea2de).
Report is 1 commits behind head on master.

❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #1314      +/-   ##
==========================================
- Coverage   65.71%   65.71%   -0.01%     
==========================================
  Files          50       50              
  Lines        8041     8038       -3     
  Branches      925      925              
==========================================
- Hits         5284     5282       -2     
+ Misses       2757     2756       -1     
Flag Coverage Δ
unittests 65.71% <100.00%> (-0.01%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@bynect
Copy link
Member

bynect commented Apr 6, 2024

👍🏻

@zappolowski zappolowski mentioned this pull request Apr 8, 2024
4 tasks
The arguments should be already resolved:
* if it's either `new_icon` or `default_icon` it should be done while
  parsing the configuration
* if it's coming from DBus whoever sent the message should give a fully
  resolved path

This fixes dunst-project#1307.
@zappolowski zappolowski merged commit a2bd494 into dunst-project:master Apr 8, 2024
19 checks passed
@zappolowski zappolowski deleted the fix-icon-quoting branch April 8, 2024 18:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

icon file with two ' characters in path fail to load
3 participants