isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-25 17:40:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

meta, startup-notification: Make type declarations public

Browse Source 
Shell is using these, which was revealed by
1bbb5c8107 breaking its build when
generating its introspection due to meta_startup_notification_get_type()
not being found.

We keep the class structs private, so in practice MetaStartupSequence
and MetaBackend can't be derived from (the are semi-private).
This commit is contained in:
Iain Lane 2019-01-24 11:40:27 +00:00
parent 2528a39781
commit 2e53ce8e75
No known key found for this signature in database
GPG Key ID: E352D5C51C5041D4
4 changed files with 13 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/backends/meta-backend-private.h
View File

@ -49,10 +49,6 @@
#define DEFAULT_XKB_RULES_FILE "evdev" #define DEFAULT_XKB_RULES_FILE "evdev"
#define DEFAULT_XKB_MODEL "pc105+inet" #define DEFAULT_XKB_MODEL "pc105+inet"
#define META_TYPE_BACKEND (meta_backend_get_type ())
META_EXPORT
G_DECLARE_DERIVABLE_TYPE (MetaBackend, meta_backend, META, BACKEND, GObject)
struct _MetaBackendClass struct _MetaBackendClass
{ {
GObjectClass parent_class; GObjectClass parent_class;

14
src/core/startup-notification-private.h
View File

@ -28,8 +28,6 @@
#include "core/display-private.h" #include "core/display-private.h"
#include "meta/meta-startup-notification.h" #include "meta/meta-startup-notification.h"
typedef struct _MetaStartupSequenceClass MetaStartupSequenceClass;
struct _MetaStartupSequenceClass struct _MetaStartupSequenceClass
{ {
GObjectClass parent_class; GObjectClass parent_class;
@ -37,18 +35,6 @@ struct _MetaStartupSequenceClass
void (* complete) (MetaStartupSequence *sequence); void (* complete) (MetaStartupSequence *sequence);
}; };
META_EXPORT
G_DECLARE_FINAL_TYPE (MetaStartupNotification,
meta_startup_notification,
META, STARTUP_NOTIFICATION,
GObject)
META_EXPORT
G_DECLARE_DERIVABLE_TYPE (MetaStartupSequence,
meta_startup_sequence,
META, STARTUP_SEQUENCE,
GObject)
MetaStartupNotification * MetaStartupNotification *
meta_startup_notification_new (MetaDisplay *display); meta_startup_notification_new (MetaDisplay *display);

9
src/meta/meta-backend.h
View File

@ -31,12 +31,9 @@
#include "meta/meta-dnd.h" #include "meta/meta-dnd.h"
#include "meta/meta-remote-access-controller.h" #include "meta/meta-remote-access-controller.h"
typedef struct _MetaBackend MetaBackend; #define META_TYPE_BACKEND (meta_backend_get_type ())
typedef struct _MetaBackendClass MetaBackendClass; META_EXPORT
G_DECLARE_DERIVABLE_TYPE (MetaBackend, meta_backend, META, BACKEND, GObject)
#ifdef __GI_SCANNER__
GType meta_backend_get_type (void);
#endif
META_EXPORT META_EXPORT
MetaBackend * meta_get_backend (void); MetaBackend * meta_get_backend (void);

19
src/meta/meta-startup-notification.h
View File

@ -24,12 +24,17 @@
#define META_TYPE_STARTUP_SEQUENCE (meta_startup_sequence_get_type ()) #define META_TYPE_STARTUP_SEQUENCE (meta_startup_sequence_get_type ())
#define META_TYPE_STARTUP_NOTIFICATION (meta_startup_notification_get_type ()) #define META_TYPE_STARTUP_NOTIFICATION (meta_startup_notification_get_type ())
typedef struct _MetaStartupNotification MetaStartupNotification; META_EXPORT
typedef struct _MetaStartupSequence MetaStartupSequence; G_DECLARE_FINAL_TYPE (MetaStartupNotification,
meta_startup_notification,
META, STARTUP_NOTIFICATION,
GObject)
#ifdef __GI_SCANNER__ META_EXPORT
GType meta_startup_notification_get_type (void); G_DECLARE_DERIVABLE_TYPE (MetaStartupSequence,
#endif meta_startup_sequence,
META, STARTUP_SEQUENCE,
GObject)
/** /**
* meta_startup_notification_get_sequences: (skip) * meta_startup_notification_get_sequences: (skip)
@ -41,10 +46,6 @@ META_EXPORT
MetaLaunchContext * MetaLaunchContext *
meta_startup_notification_create_launcher (MetaStartupNotification *sn); meta_startup_notification_create_launcher (MetaStartupNotification *sn);
#ifdef __GI_SCANNER__
GType meta_startup_sequence_get_type (void);
#endif
META_EXPORT META_EXPORT
const char * meta_startup_sequence_get_id (MetaStartupSequence *sequence); const char * meta_startup_sequence_get_id (MetaStartupSequence *sequence);