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

default-applications: Add a widget for a default calculator application #398

Merged
merged 1 commit into from Dec 7, 2018
Merged

Conversation

zhangxianwei8
Copy link
Contributor

• Exposes a widget in Preferred Applications to control the default calculator application schema defined in commit mate-desktop/mate-desktop@3281160
• In order to function properly, this PR is dependent on the merger of these two PRs:

  1. schemas: Define schema for a default calculator mate-desktop#341
  2. media-keys: Execute default calculator application defined by schema mate-settings-daemon#255

• Also fix #291

Fix #291

Signed-off-by: Zhang Xianwei <zhang.xianwei8@zte.com.cn>
@lukefromdc lukefromdc self-requested a review December 6, 2018 21:58
Copy link
Member

@lukefromdc lukefromdc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This PR works, but the companion mate-desktop commit needs a Makefile.am revision. The error dialog instead of fallback to mate-calc, then gnome-calculator when galculator is not found has nothing to do with this PR, which is about being able to set the user's preferred calculator. That just plain works once the mate-desktop install is fixed. See

mate-desktop/mate-desktop#341 (review)

@lukefromdc lukefromdc requested a review from a team December 6, 2018 22:00
@lukefromdc
Copy link
Member

Note that when opening mate-control-center from terminal and selecting perferred applications you will get
g_icon_to_string: assertion 'icon != NULL' failed
in terminal but that is exactly the same in master so has nothing to do with this PR

@lukefromdc lukefromdc merged commit 08d1e4e into mate-desktop:master Dec 7, 2018
zhangxianwei8 added a commit to zhangxianwei8/mate-control-center that referenced this pull request Dec 8, 2018
Prevent runtime failture on g_icon_to_string in fill_combo_box by catching the NULL case

See mate-desktop#398 (comment)

Signed-off-by: Zhang Xianwei <zhang.xianwei8@zte.com.cn>
@zhangxianwei8
Copy link
Contributor Author

zhangxianwei8 commented Dec 8, 2018

Note that when opening mate-control-center from terminal and selecting perferred applications you will get
g_icon_to_string: assertion 'icon != NULL' failed
in terminal but that is exactly the same in master so has nothing to do with this PR

This is because that default application's .desktop file misses default icon "Icon=***" string. @lukefromdc
This PR fixes it: #399

zhangxianwei8 added a commit to zhangxianwei8/mate-control-center that referenced this pull request Dec 8, 2018
Prevent runtime failture on g_icon_to_string in fill_combo_box by catching the NULL case

See mate-desktop#398 (comment)

Signed-off-by: Zhang Xianwei <zhang.xianwei8@zte.com.cn>
lukefromdc pushed a commit that referenced this pull request Dec 10, 2018
Prevent runtime failture on g_icon_to_string in fill_combo_box by catching the NULL case

See #398 (comment)

Signed-off-by: Zhang Xianwei <zhang.xianwei8@zte.com.cn>
monsta pushed a commit that referenced this pull request May 31, 2019
Prevent runtime failture on g_icon_to_string in fill_combo_box by catching the NULL case

See #398 (comment)

Signed-off-by: Zhang Xianwei <zhang.xianwei8@zte.com.cn>
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.

Default calculator application
2 participants