Skip to content

Do not resolve paths in get_pixbuf_from_file#1314

Merged
zappolowski merged 1 commit into
dunst-project:masterfrom
zappolowski:fix-icon-quoting
Apr 8, 2024
Merged

Do not resolve paths in get_pixbuf_from_file#1314
zappolowski merged 1 commit into
dunst-project:masterfrom
zappolowski:fix-icon-quoting

Conversation

@zappolowski
Copy link
Copy Markdown
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
Copy Markdown
Contributor

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
Copy Markdown
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
Copy Markdown

codecov-commenter commented Apr 5, 2024

⚠️ Please install the 'codecov app svg image' to ensure uploads and comments are reliably processed by Codecov.

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 65.71%. Comparing base (07b68f0) to head (26ea2de).
⚠️ Report is 351 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.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@bynect
Copy link
Copy Markdown
Contributor

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
@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