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

panel-util: avoid X11-specific header #1104

Merged
merged 1 commit into from Jun 26, 2020
Merged

panel-util: avoid X11-specific header #1104

merged 1 commit into from Jun 26, 2020

Conversation

jbeich
Copy link
Contributor

@jbeich jbeich commented Jun 24, 2020

When building with --disable-x11 (Wayland-only) one X11-related header appears to be included outside of #ifdef HAVE_X11. However, Gtk+ 3 only installs the header if built with --enable-x11-backend.

@raveit65
Copy link
Member

Commit message is misleading. Why in gtk3?
MATE use only gtk3 since 1.20.

@rbuj
Copy link
Contributor

rbuj commented Jun 25, 2020

It shoud be #include <gdk/gdk.h> instead of #include <gdk/gdkx.h>. Eclipse's Organize Imports output:

<cut>
#include <gdk/gdkcairo.h>
#include <gdk/gdkcursor.h>
#include <gdk/gdkdisplay.h>
#include <gdk/gdktypes.h>
#include <gdk/gdkwindow.h>
<cut>

panel-util.c:31:10: fatal error: 'gdk/gdkx.h' file not found
 #include <gdk/gdkx.h>
          ^~~~~~~~~~~~
@rbuj
Copy link
Contributor

rbuj commented Jun 26, 2020

@jbeich Please, change the subjects of the pull request and the commit message to make easier the tracking at first sight.

For instance, you can add the name of the modified file, since only one file is modified. Next, you can add a summary of the change that other developers can uniquely understand.

panel-util: summary

Try to keep commit message subject under 72 characters.

@jbeich jbeich changed the title Drop unused header, gated by --enable-x11-backend in gtk3 panel-util: avoid X11-specific header Jun 26, 2020
@jbeich
Copy link
Contributor Author

jbeich commented Jun 26, 2020

@rbuj, is it good enough now or do PR description and commit message have to match?

Copy link
Contributor

@rbuj rbuj left a comment

Choose a reason for hiding this comment

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

LGTM

@rbuj rbuj merged commit 9f15be5 into mate-desktop:master Jun 26, 2020
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.

None yet

3 participants