mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2024-11-10 03:16:17 +01:00
GDBus: Hide class structures for classes we don't want to be subclassed
E.g. move these C structures out of public header files and into their respective C files. Also nuke padding since this is no longer needed. This leaves only GDBusProxy as an extendable type. Signed-off-by: David Zeuthen <davidz@redhat.com>
This commit is contained in:
parent
62a1ccf526
commit
2d2a321a4b
@ -2272,7 +2272,6 @@ g_dbus_is_interface_name
|
|||||||
<FILE>gdbusauthobserver</FILE>
|
<FILE>gdbusauthobserver</FILE>
|
||||||
<TITLE>GDBusAuthObserver</TITLE>
|
<TITLE>GDBusAuthObserver</TITLE>
|
||||||
GDBusAuthObserver
|
GDBusAuthObserver
|
||||||
GDBusAuthObserverClass
|
|
||||||
g_dbus_auth_observer_new
|
g_dbus_auth_observer_new
|
||||||
g_dbus_auth_observer_authorize_authenticated_peer
|
g_dbus_auth_observer_authorize_authenticated_peer
|
||||||
<SUBSECTION Standard>
|
<SUBSECTION Standard>
|
||||||
@ -2291,7 +2290,6 @@ g_dbus_auth_observer_get_type
|
|||||||
<FILE>gdbusserver</FILE>
|
<FILE>gdbusserver</FILE>
|
||||||
<TITLE>GDBusServer</TITLE>
|
<TITLE>GDBusServer</TITLE>
|
||||||
GDBusServer
|
GDBusServer
|
||||||
GDBusServerClass
|
|
||||||
GDBusServerFlags
|
GDBusServerFlags
|
||||||
g_dbus_server_new_sync
|
g_dbus_server_new_sync
|
||||||
g_dbus_server_start
|
g_dbus_server_start
|
||||||
@ -2315,11 +2313,10 @@ g_dbus_server_get_type
|
|||||||
<SECTION>
|
<SECTION>
|
||||||
<FILE>gdbusmessage</FILE>
|
<FILE>gdbusmessage</FILE>
|
||||||
<TITLE>GDBusMessage</TITLE>
|
<TITLE>GDBusMessage</TITLE>
|
||||||
|
GDBusMessage
|
||||||
GDBusMessageType
|
GDBusMessageType
|
||||||
GDBusMessageFlags
|
GDBusMessageFlags
|
||||||
GDBusMessageHeaderField
|
GDBusMessageHeaderField
|
||||||
GDBusMessage
|
|
||||||
GDBusMessageClass
|
|
||||||
g_dbus_message_new
|
g_dbus_message_new
|
||||||
g_dbus_message_new_signal
|
g_dbus_message_new_signal
|
||||||
g_dbus_message_new_method_call
|
g_dbus_message_new_method_call
|
||||||
@ -2384,7 +2381,6 @@ g_bus_get
|
|||||||
g_bus_get_finish
|
g_bus_get_finish
|
||||||
g_bus_get_sync
|
g_bus_get_sync
|
||||||
GDBusConnection
|
GDBusConnection
|
||||||
GDBusConnectionClass
|
|
||||||
GDBusConnectionFlags
|
GDBusConnectionFlags
|
||||||
g_dbus_connection_new
|
g_dbus_connection_new
|
||||||
g_dbus_connection_new_finish
|
g_dbus_connection_new_finish
|
||||||
@ -2393,7 +2389,6 @@ g_dbus_connection_new_for_address
|
|||||||
g_dbus_connection_new_for_address_finish
|
g_dbus_connection_new_for_address_finish
|
||||||
g_dbus_connection_new_for_address_sync
|
g_dbus_connection_new_for_address_sync
|
||||||
g_dbus_connection_start_message_processing
|
g_dbus_connection_start_message_processing
|
||||||
GDBusCapabilityFlags
|
|
||||||
g_dbus_connection_close
|
g_dbus_connection_close
|
||||||
g_dbus_connection_is_closed
|
g_dbus_connection_is_closed
|
||||||
g_dbus_connection_flush
|
g_dbus_connection_flush
|
||||||
@ -2404,6 +2399,7 @@ g_dbus_connection_set_exit_on_close
|
|||||||
g_dbus_connection_get_stream
|
g_dbus_connection_get_stream
|
||||||
g_dbus_connection_get_guid
|
g_dbus_connection_get_guid
|
||||||
g_dbus_connection_get_unique_name
|
g_dbus_connection_get_unique_name
|
||||||
|
GDBusCapabilityFlags
|
||||||
g_dbus_connection_get_capabilities
|
g_dbus_connection_get_capabilities
|
||||||
g_dbus_connection_get_peer_credentials
|
g_dbus_connection_get_peer_credentials
|
||||||
GDBusCallFlags
|
GDBusCallFlags
|
||||||
@ -2450,7 +2446,6 @@ g_dbus_connection_get_type
|
|||||||
<FILE>gdbusmethodinvocation</FILE>
|
<FILE>gdbusmethodinvocation</FILE>
|
||||||
<TITLE>GDBusMethodInvocation</TITLE>
|
<TITLE>GDBusMethodInvocation</TITLE>
|
||||||
GDBusMethodInvocation
|
GDBusMethodInvocation
|
||||||
GDBusMethodInvocationClass
|
|
||||||
g_dbus_method_invocation_new
|
g_dbus_method_invocation_new
|
||||||
g_dbus_method_invocation_get_sender
|
g_dbus_method_invocation_get_sender
|
||||||
g_dbus_method_invocation_get_object_path
|
g_dbus_method_invocation_get_object_path
|
||||||
|
@ -46,10 +46,6 @@ struct _GDBusAuthClass
|
|||||||
{
|
{
|
||||||
/*< private >*/
|
/*< private >*/
|
||||||
GObjectClass parent_class;
|
GObjectClass parent_class;
|
||||||
|
|
||||||
/*< private >*/
|
|
||||||
/* Padding for future expansion */
|
|
||||||
gpointer padding[16];
|
|
||||||
};
|
};
|
||||||
|
|
||||||
struct _GDBusAuth
|
struct _GDBusAuth
|
||||||
|
@ -100,10 +100,6 @@ struct _GDBusAuthMechanismClass
|
|||||||
gchar *(*client_data_send) (GDBusAuthMechanism *mechanism,
|
gchar *(*client_data_send) (GDBusAuthMechanism *mechanism,
|
||||||
gsize *out_data_len);
|
gsize *out_data_len);
|
||||||
void (*client_shutdown) (GDBusAuthMechanism *mechanism);
|
void (*client_shutdown) (GDBusAuthMechanism *mechanism);
|
||||||
|
|
||||||
/*< private >*/
|
|
||||||
/* Padding for future expansion */
|
|
||||||
gpointer padding[16];
|
|
||||||
};
|
};
|
||||||
|
|
||||||
struct _GDBusAuthMechanism
|
struct _GDBusAuthMechanism
|
||||||
|
@ -47,10 +47,6 @@ struct _GDBusAuthMechanismAnonClass
|
|||||||
{
|
{
|
||||||
/*< private >*/
|
/*< private >*/
|
||||||
GDBusAuthMechanismClass parent_class;
|
GDBusAuthMechanismClass parent_class;
|
||||||
|
|
||||||
/*< private >*/
|
|
||||||
/* Padding for future expansion */
|
|
||||||
gpointer padding[16];
|
|
||||||
};
|
};
|
||||||
|
|
||||||
struct _GDBusAuthMechanismAnon
|
struct _GDBusAuthMechanismAnon
|
||||||
|
@ -47,10 +47,6 @@ struct _GDBusAuthMechanismExternalClass
|
|||||||
{
|
{
|
||||||
/*< private >*/
|
/*< private >*/
|
||||||
GDBusAuthMechanismClass parent_class;
|
GDBusAuthMechanismClass parent_class;
|
||||||
|
|
||||||
/*< private >*/
|
|
||||||
/* Padding for future expansion */
|
|
||||||
gpointer padding[16];
|
|
||||||
};
|
};
|
||||||
|
|
||||||
struct _GDBusAuthMechanismExternal
|
struct _GDBusAuthMechanismExternal
|
||||||
|
@ -47,10 +47,6 @@ struct _GDBusAuthMechanismSha1Class
|
|||||||
{
|
{
|
||||||
/*< private >*/
|
/*< private >*/
|
||||||
GDBusAuthMechanismClass parent_class;
|
GDBusAuthMechanismClass parent_class;
|
||||||
|
|
||||||
/*< private >*/
|
|
||||||
/* Padding for future expansion */
|
|
||||||
gpointer padding[16];
|
|
||||||
};
|
};
|
||||||
|
|
||||||
struct _GDBusAuthMechanismSha1
|
struct _GDBusAuthMechanismSha1
|
||||||
|
@ -100,6 +100,27 @@
|
|||||||
* </programlisting></example>
|
* </programlisting></example>
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* GDBusAuthObserverClass:
|
||||||
|
* @authorize_authenticated_peer: Signal class handler for the #GDBusAuthObserver::authorize-authenticated-peer signal.
|
||||||
|
*
|
||||||
|
* Class structure for #GDBusAuthObserverClass.
|
||||||
|
*
|
||||||
|
* Since: 2.26
|
||||||
|
*/
|
||||||
|
struct _GDBusAuthObserverClass
|
||||||
|
{
|
||||||
|
/*< private >*/
|
||||||
|
GObjectClass parent_class;
|
||||||
|
|
||||||
|
/*< public >*/
|
||||||
|
|
||||||
|
/* Signals */
|
||||||
|
gboolean (*authorize_authenticated_peer) (GDBusAuthObserver *observer,
|
||||||
|
GIOStream *stream,
|
||||||
|
GCredentials *credentials);
|
||||||
|
};
|
||||||
|
|
||||||
struct _GDBusAuthObserverPrivate
|
struct _GDBusAuthObserverPrivate
|
||||||
{
|
{
|
||||||
gint foo;
|
gint foo;
|
||||||
|
@ -41,33 +41,6 @@ G_BEGIN_DECLS
|
|||||||
typedef struct _GDBusAuthObserverClass GDBusAuthObserverClass;
|
typedef struct _GDBusAuthObserverClass GDBusAuthObserverClass;
|
||||||
typedef struct _GDBusAuthObserverPrivate GDBusAuthObserverPrivate;
|
typedef struct _GDBusAuthObserverPrivate GDBusAuthObserverPrivate;
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* GDBusAuthObserverClass:
|
|
||||||
* @authorize_authenticated_peer: Signal class handler for the #GDBusAuthObserver::authorize-authenticated-peer signal.
|
|
||||||
*
|
|
||||||
* Class structure for #GDBusAuthObserverClass.
|
|
||||||
*
|
|
||||||
* Since: 2.26
|
|
||||||
*/
|
|
||||||
struct _GDBusAuthObserverClass
|
|
||||||
{
|
|
||||||
/*< private >*/
|
|
||||||
GObjectClass parent_class;
|
|
||||||
|
|
||||||
/*< public >*/
|
|
||||||
|
|
||||||
/* Signals */
|
|
||||||
gboolean (*authorize_authenticated_peer) (GDBusAuthObserver *observer,
|
|
||||||
GIOStream *stream,
|
|
||||||
GCredentials *credentials);
|
|
||||||
|
|
||||||
|
|
||||||
/*< private >*/
|
|
||||||
/* Padding for future expansion */
|
|
||||||
gpointer padding[32];
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* GDBusAuthObserver:
|
* GDBusAuthObserver:
|
||||||
*
|
*
|
||||||
|
@ -157,6 +157,26 @@
|
|||||||
|
|
||||||
/* ---------------------------------------------------------------------------------------------------- */
|
/* ---------------------------------------------------------------------------------------------------- */
|
||||||
|
|
||||||
|
/**
|
||||||
|
* GDBusConnectionClass:
|
||||||
|
* @closed: Signal class handler for the #GDBusConnection::closed signal.
|
||||||
|
*
|
||||||
|
* Class structure for #GDBusConnection.
|
||||||
|
*
|
||||||
|
* Since: 2.26
|
||||||
|
*/
|
||||||
|
struct _GDBusConnectionClass
|
||||||
|
{
|
||||||
|
/*< private >*/
|
||||||
|
GObjectClass parent_class;
|
||||||
|
|
||||||
|
/*< public >*/
|
||||||
|
/* Signals */
|
||||||
|
void (*closed) (GDBusConnection *connection,
|
||||||
|
gboolean remote_peer_vanished,
|
||||||
|
GError *error);
|
||||||
|
};
|
||||||
|
|
||||||
G_LOCK_DEFINE_STATIC (message_bus_lock);
|
G_LOCK_DEFINE_STATIC (message_bus_lock);
|
||||||
|
|
||||||
static GDBusConnection *the_session_bus = NULL;
|
static GDBusConnection *the_session_bus = NULL;
|
||||||
|
@ -56,30 +56,6 @@ struct _GDBusConnection
|
|||||||
GDBusConnectionPrivate *priv;
|
GDBusConnectionPrivate *priv;
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
|
||||||
* GDBusConnectionClass:
|
|
||||||
* @closed: Signal class handler for the #GDBusConnection::closed signal.
|
|
||||||
*
|
|
||||||
* Class structure for #GDBusConnection.
|
|
||||||
*
|
|
||||||
* Since: 2.26
|
|
||||||
*/
|
|
||||||
struct _GDBusConnectionClass
|
|
||||||
{
|
|
||||||
/*< private >*/
|
|
||||||
GObjectClass parent_class;
|
|
||||||
|
|
||||||
/*< public >*/
|
|
||||||
/* Signals */
|
|
||||||
void (*closed) (GDBusConnection *connection,
|
|
||||||
gboolean remote_peer_vanished,
|
|
||||||
GError *error);
|
|
||||||
|
|
||||||
/*< private >*/
|
|
||||||
/* Padding for future expansion */
|
|
||||||
gpointer padding[64];
|
|
||||||
};
|
|
||||||
|
|
||||||
GType g_dbus_connection_get_type (void) G_GNUC_CONST;
|
GType g_dbus_connection_get_type (void) G_GNUC_CONST;
|
||||||
|
|
||||||
/* ---------------------------------------------------------------------------------------------------- */
|
/* ---------------------------------------------------------------------------------------------------- */
|
||||||
|
@ -63,6 +63,20 @@
|
|||||||
* on a #GDBusConnection.
|
* on a #GDBusConnection.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* GDBusMessageClass:
|
||||||
|
*
|
||||||
|
* Class structure for #GDBusMessage.
|
||||||
|
*
|
||||||
|
* Since: 2.26
|
||||||
|
*/
|
||||||
|
struct _GDBusMessageClass
|
||||||
|
{
|
||||||
|
/*< private >*/
|
||||||
|
GObjectClass parent_class;
|
||||||
|
};
|
||||||
|
|
||||||
struct _GDBusMessagePrivate
|
struct _GDBusMessagePrivate
|
||||||
{
|
{
|
||||||
GDBusMessageType type;
|
GDBusMessageType type;
|
||||||
|
@ -41,23 +41,6 @@ G_BEGIN_DECLS
|
|||||||
typedef struct _GDBusMessageClass GDBusMessageClass;
|
typedef struct _GDBusMessageClass GDBusMessageClass;
|
||||||
typedef struct _GDBusMessagePrivate GDBusMessagePrivate;
|
typedef struct _GDBusMessagePrivate GDBusMessagePrivate;
|
||||||
|
|
||||||
/**
|
|
||||||
* GDBusMessageClass:
|
|
||||||
*
|
|
||||||
* Class structure for #GDBusMessage.
|
|
||||||
*
|
|
||||||
* Since: 2.26
|
|
||||||
*/
|
|
||||||
struct _GDBusMessageClass
|
|
||||||
{
|
|
||||||
/*< private >*/
|
|
||||||
GObjectClass parent_class;
|
|
||||||
|
|
||||||
/*< private >*/
|
|
||||||
/* Padding for future expansion */
|
|
||||||
gpointer padding[32];
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* GDBusMessage:
|
* GDBusMessage:
|
||||||
*
|
*
|
||||||
|
@ -49,6 +49,19 @@
|
|||||||
* #GDBusInterfaceVTable that was passed to g_dbus_connection_register_object().
|
* #GDBusInterfaceVTable that was passed to g_dbus_connection_register_object().
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* GDBusMethodInvocationClass:
|
||||||
|
*
|
||||||
|
* Class structure for #GDBusMethodInvocation.
|
||||||
|
*
|
||||||
|
* Since: 2.26
|
||||||
|
*/
|
||||||
|
struct _GDBusMethodInvocationClass
|
||||||
|
{
|
||||||
|
/*< private >*/
|
||||||
|
GObjectClass parent_class;
|
||||||
|
};
|
||||||
|
|
||||||
struct _GDBusMethodInvocationPrivate
|
struct _GDBusMethodInvocationPrivate
|
||||||
{
|
{
|
||||||
/* construct-only properties */
|
/* construct-only properties */
|
||||||
|
@ -56,23 +56,6 @@ struct _GDBusMethodInvocation
|
|||||||
GDBusMethodInvocationPrivate *priv;
|
GDBusMethodInvocationPrivate *priv;
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
|
||||||
* GDBusMethodInvocationClass:
|
|
||||||
*
|
|
||||||
* Class structure for #GDBusMethodInvocation.
|
|
||||||
*
|
|
||||||
* Since: 2.26
|
|
||||||
*/
|
|
||||||
struct _GDBusMethodInvocationClass
|
|
||||||
{
|
|
||||||
/*< private >*/
|
|
||||||
GObjectClass parent_class;
|
|
||||||
|
|
||||||
/*< private >*/
|
|
||||||
/* Padding for future expansion */
|
|
||||||
gpointer padding[32];
|
|
||||||
};
|
|
||||||
|
|
||||||
GType g_dbus_method_invocation_get_type (void) G_GNUC_CONST;
|
GType g_dbus_method_invocation_get_type (void) G_GNUC_CONST;
|
||||||
GDBusMethodInvocation *g_dbus_method_invocation_new (const gchar *sender,
|
GDBusMethodInvocation *g_dbus_method_invocation_new (const gchar *sender,
|
||||||
const gchar *object_path,
|
const gchar *object_path,
|
||||||
|
@ -69,6 +69,25 @@
|
|||||||
* <example id="gdbus-peer-to-peer"><title>D-Bus peer-to-peer example</title><programlisting><xi:include xmlns:xi="http://www.w3.org/2001/XInclude" parse="text" href="../../../../gio/tests/gdbus-example-peer.c"><xi:fallback>FIXME: MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting></example>
|
* <example id="gdbus-peer-to-peer"><title>D-Bus peer-to-peer example</title><programlisting><xi:include xmlns:xi="http://www.w3.org/2001/XInclude" parse="text" href="../../../../gio/tests/gdbus-example-peer.c"><xi:fallback>FIXME: MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting></example>
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* GDBusServerClass:
|
||||||
|
* @new_connection: Signal class handler for the #GDBusServer::new-connection signal.
|
||||||
|
*
|
||||||
|
* Class structure for #GDBusServer.
|
||||||
|
*
|
||||||
|
* Since: 2.26
|
||||||
|
*/
|
||||||
|
struct _GDBusServerClass
|
||||||
|
{
|
||||||
|
/*< private >*/
|
||||||
|
GObjectClass parent_class;
|
||||||
|
|
||||||
|
/*< public >*/
|
||||||
|
/* Signals */
|
||||||
|
void (*new_connection) (GDBusServer *server,
|
||||||
|
GDBusConnection *connection);
|
||||||
|
};
|
||||||
|
|
||||||
struct _GDBusServerPrivate
|
struct _GDBusServerPrivate
|
||||||
{
|
{
|
||||||
GDBusServerFlags flags;
|
GDBusServerFlags flags;
|
||||||
|
@ -56,29 +56,6 @@ struct _GDBusServer
|
|||||||
GDBusServerPrivate *priv;
|
GDBusServerPrivate *priv;
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
|
||||||
* GDBusServerClass:
|
|
||||||
* @new_connection: Signal class handler for the #GDBusServer::new-connection signal.
|
|
||||||
*
|
|
||||||
* Class structure for #GDBusServer.
|
|
||||||
*
|
|
||||||
* Since: 2.26
|
|
||||||
*/
|
|
||||||
struct _GDBusServerClass
|
|
||||||
{
|
|
||||||
/*< private >*/
|
|
||||||
GObjectClass parent_class;
|
|
||||||
|
|
||||||
/*< public >*/
|
|
||||||
/* Signals */
|
|
||||||
void (*new_connection) (GDBusServer *server,
|
|
||||||
GDBusConnection *connection);
|
|
||||||
|
|
||||||
/*< private >*/
|
|
||||||
/* Padding for future expansion */
|
|
||||||
gpointer padding[16];
|
|
||||||
};
|
|
||||||
|
|
||||||
GType g_dbus_server_get_type (void) G_GNUC_CONST;
|
GType g_dbus_server_get_type (void) G_GNUC_CONST;
|
||||||
GDBusServer *g_dbus_server_new_sync (const gchar *address,
|
GDBusServer *g_dbus_server_new_sync (const gchar *address,
|
||||||
GDBusServerFlags flags,
|
GDBusServerFlags flags,
|
||||||
|
Loading…
Reference in New Issue
Block a user