brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

monitor-manager: Don't include generated code in header file

Browse Source 
Meson doesn't seem to handle depending on generated headers, at least
when those headers are pulled in indirectly via another header file.

Luckily, we don't actually need to include the generated D-Bus boiler
plate in meta-monitor-manager-private.h, since the MetaMonitorManager
type no longer is based on the D-Bus service skeleton.

So, by moving the inclusion of the generated D-Bus header file into
meta-monitor-manager.c, we should hopefully get rid of the sporadic
build issues.

Closes: https://gitlab.gnome.org/GNOME/mutter/-/issues/1682
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1819>
This commit is contained in:
Jonas Ådahl 2021-04-12 11:46:30 +02:00 committed by Marge Bot
parent 4c7a846dc8
commit 91117bb052
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/backends/meta-monitor-manager-private.h
View File

@ -37,8 +37,6 @@
#include "meta/display.h" #include "meta/display.h"
#include "meta/meta-monitor-manager.h" #include "meta/meta-monitor-manager.h"
#include "meta-dbus-display-config.h"
#define META_MONITOR_MANAGER_MIN_SCREEN_WIDTH 640 #define META_MONITOR_MANAGER_MIN_SCREEN_WIDTH 640
#define META_MONITOR_MANAGER_MIN_SCREEN_HEIGHT 480 #define META_MONITOR_MANAGER_MIN_SCREEN_HEIGHT 480
@ -111,6 +109,8 @@ typedef struct _MetaOutputCtm
#define META_IS_MONITOR_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), META_TYPE_MONITOR_MANAGER)) #define META_IS_MONITOR_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), META_TYPE_MONITOR_MANAGER))
#define META_MONITOR_MANAGER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), META_TYPE_MONITOR_MANAGER, MetaMonitorManagerClass)) #define META_MONITOR_MANAGER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), META_TYPE_MONITOR_MANAGER, MetaMonitorManagerClass))
typedef struct _MetaDBusDisplayConfig MetaDBusDisplayConfig;
G_DEFINE_AUTOPTR_CLEANUP_FUNC (MetaMonitorManager, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC (MetaMonitorManager, g_object_unref)
struct _MetaMonitorManager struct _MetaMonitorManager
@ -197,7 +197,7 @@ struct _MetaMonitorManager
*/ */
struct _MetaMonitorManagerClass struct _MetaMonitorManagerClass
{ {
MetaDBusDisplayConfigSkeletonClass parent_class; GObjectClass parent_class;
GBytes * (* read_edid) (MetaMonitorManager *manager, GBytes * (* read_edid) (MetaMonitorManager *manager,
MetaOutput *output); MetaOutput *output);

2
src/backends/meta-monitor-manager.c
View File

@ -61,6 +61,8 @@
#include "meta/main.h" #include "meta/main.h"
#include "meta/meta-x11-errors.h" #include "meta/meta-x11-errors.h"
#include "meta-dbus-display-config.h"
#define DEFAULT_DISPLAY_CONFIGURATION_TIMEOUT 20 #define DEFAULT_DISPLAY_CONFIGURATION_TIMEOUT 20
enum enum