diff options
| author | Thomas Haller <thaller@redhat.com> | 2020-04-06 09:28:31 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2020-04-09 21:51:06 +0200 |
| commit | 9eacd99330876b72310e7fd1f4b4c1de13e58088 (patch) | |
| tree | 5ab92c6cbf2b8bfaa3afe2b9521ad4c0372cb29c | |
| parent | 0bbc7659af4ae0ca28904ce95b252718c6660f75 (diff) | |
| download | NetworkManager-9eacd99330876b72310e7fd1f4b4c1de13e58088.tar.gz | |
cli/polkit: avoid G_DECLARE_FINAL_TYPE() in nm-polkit-listener.h
G_DECLARE_FINAL_TYPE() is glib 2.44, while we currently still only require glib 2.40.
| -rw-r--r-- | clients/common/nm-polkit-listener.c | 13 | ||||
| -rw-r--r-- | clients/common/nm-polkit-listener.h | 20 |
2 files changed, 22 insertions, 11 deletions
diff --git a/clients/common/nm-polkit-listener.c b/clients/common/nm-polkit-listener.c index 9ecc92a688..01b0cb3688 100644 --- a/clients/common/nm-polkit-listener.c +++ b/clients/common/nm-polkit-listener.c @@ -60,18 +60,21 @@ static guint signals[LAST_SIGNAL] = { 0 }; struct _NMPolkitListener { GObject parent; - GDBusConnection *dbus_connection; char *name_owner; - guint pk_auth_agent_reg_id; - guint name_owner_changed_id; GCancellable *cancellable; GMainContext *main_context; - gboolean session_agent; CList request_lst_head; + guint pk_auth_agent_reg_id; + guint name_owner_changed_id; + bool session_agent:1; +}; + +struct _NMPolkitListenerClass { + GObjectClass parent; }; -G_DEFINE_TYPE (NMPolkitListener, nm_polkit_listener, G_TYPE_OBJECT) +G_DEFINE_TYPE (NMPolkitListener, nm_polkit_listener, G_TYPE_OBJECT); /*****************************************************************************/ diff --git a/clients/common/nm-polkit-listener.h b/clients/common/nm-polkit-listener.h index d84f3a1bb5..8049a88fe9 100644 --- a/clients/common/nm-polkit-listener.h +++ b/clients/common/nm-polkit-listener.h @@ -6,16 +6,24 @@ #ifndef __NM_POLKIT_LISTENER_H__ #define __NM_POLKIT_LISTENER_H__ -#define NM_TYPE_POLKIT_LISTENER (nm_polkit_listener_get_type ()) -G_DECLARE_FINAL_TYPE (NMPolkitListener, nm_polkit_listener, NM, POLKIT_LISTENER, GObject) - -NMPolkitListener *nm_polkit_listener_new (GDBusConnection *dbus_connection, gboolean session_agent); - -/* Signals */ #define NM_POLKIT_LISTENER_SIGNAL_REGISTERED "registered" #define NM_POLKIT_LISTENER_SIGNAL_REQUEST "secret-request" #define NM_POLKIT_LISTENER_SIGNAL_AUTH_SUCCESS "auth-success" #define NM_POLKIT_LISTENER_SIGNAL_AUTH_FAILURE "auth-failure" #define NM_POLKIT_LISTENER_SIGNAL_ERROR "error" +typedef struct _NMPolkitListener NMPolkitListener; +typedef struct _NMPolkitListenerClass NMPolkitListenerClass; + +#define NM_TYPE_POLKIT_LISTENER (nm_polkit_listener_get_type ()) +#define NM_POLKIT_LISTENER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_POLKIT_LISTENER, NMPolkitListener)) +#define NM_POLKIT_LISTENER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_POLKIT_LISTENER, NMPolkitListenerClass)) +#define NM_IS_POLKIT_LISTENER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_POLKIT_LISTENER)) +#define NM_IS_POLKIT_LISTENER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_POLKIT_LISTENER)) +#define NM_POLKIT_LISTENER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_POLKIT_LISTENER, NMPolkitListenerClass)) + +GType nm_polkit_listener_get_type (void); + +NMPolkitListener *nm_polkit_listener_new (GDBusConnection *dbus_connection, gboolean session_agent); + #endif /* __NM_POLKIT_LISTENER_H__ */ |