colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cli/polkit: avoid G_DECLARE_FINAL_TYPE() in nm-polkit-listener.h

Browse Source 
G_DECLARE_FINAL_TYPE() is glib 2.44, while we currently still only require glib 2.40.
This commit is contained in:
Thomas Haller
2020-04-06 09:28:31 +02:00
parent 2384033b05
commit 7d91208218
2 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
clients/common/nm-polkit-listener.c
View File

@@ -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;
};
G_DEFINE_TYPE (NMPolkitListener, nm_polkit_listener, G_TYPE_OBJECT)
struct _NMPolkitListenerClass {
GObjectClass parent;
};
G_DEFINE_TYPE (NMPolkitListener, nm_polkit_listener, G_TYPE_OBJECT);
/*****************************************************************************/

20
clients/common/nm-polkit-listener.h
View File

@@ -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__ */