GDBusMethodInvocation: nuke constructor

... that is, make it private. This makes sense because users are never
expected to create such objects themselves - only the GDBus core will
need this.

Signed-off-by: David Zeuthen <davidz@redhat.com>
This commit is contained in:
David Zeuthen 2010-08-22 22:56:49 -04:00
parent 5668d52bab
commit 847e4dfe7d
6 changed files with 32 additions and 31 deletions

View File

@ -2454,7 +2454,6 @@ g_dbus_connection_get_type
<FILE>gdbusmethodinvocation</FILE>
<TITLE>GDBusMethodInvocation</TITLE>
GDBusMethodInvocation
g_dbus_method_invocation_new
g_dbus_method_invocation_get_sender
g_dbus_method_invocation_get_object_path
g_dbus_method_invocation_get_interface_name

View File

@ -4370,15 +4370,15 @@ validate_and_maybe_schedule_method_call (GDBusConnection *connection,
g_variant_type_free (in_type);
/* schedule the call in idle */
invocation = g_dbus_method_invocation_new (g_dbus_message_get_sender (message),
g_dbus_message_get_path (message),
g_dbus_message_get_interface (message),
g_dbus_message_get_member (message),
method_info,
connection,
message,
parameters,
user_data);
invocation = _g_dbus_method_invocation_new (g_dbus_message_get_sender (message),
g_dbus_message_get_path (message),
g_dbus_message_get_interface (message),
g_dbus_message_get_member (message),
method_info,
connection,
message,
parameters,
user_data);
g_variant_unref (parameters);
/* TODO: would be nicer with a real MethodData like we already

View File

@ -279,8 +279,8 @@ g_dbus_method_invocation_get_user_data (GDBusMethodInvocation *invocation)
return invocation->user_data;
}
/**
* g_dbus_method_invocation_new:
/* < internal >
* _g_dbus_method_invocation_new:
* @sender: The bus name that invoked the method or %NULL if @connection is not a bus connection.
* @object_path: The object path the method was invoked on.
* @interface_name: The name of the D-Bus interface the method was invoked on.
@ -298,15 +298,15 @@ g_dbus_method_invocation_get_user_data (GDBusMethodInvocation *invocation)
* Since: 2.26
*/
GDBusMethodInvocation *
g_dbus_method_invocation_new (const gchar *sender,
const gchar *object_path,
const gchar *interface_name,
const gchar *method_name,
const GDBusMethodInfo *method_info,
GDBusConnection *connection,
GDBusMessage *message,
GVariant *parameters,
gpointer user_data)
_g_dbus_method_invocation_new (const gchar *sender,
const gchar *object_path,
const gchar *interface_name,
const gchar *method_name,
const GDBusMethodInfo *method_info,
GDBusConnection *connection,
GDBusMessage *message,
GVariant *parameters,
gpointer user_data)
{
GDBusMethodInvocation *invocation;

View File

@ -36,15 +36,6 @@ G_BEGIN_DECLS
#define G_IS_DBUS_METHOD_INVOCATION(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_DBUS_METHOD_INVOCATION))
GType g_dbus_method_invocation_get_type (void) G_GNUC_CONST;
GDBusMethodInvocation *g_dbus_method_invocation_new (const gchar *sender,
const gchar *object_path,
const gchar *interface_name,
const gchar *method_name,
const GDBusMethodInfo *method_info,
GDBusConnection *connection,
GDBusMessage *message,
GVariant *parameters,
gpointer user_data);
const gchar *g_dbus_method_invocation_get_sender (GDBusMethodInvocation *invocation);
const gchar *g_dbus_method_invocation_get_object_path (GDBusMethodInvocation *invocation);
const gchar *g_dbus_method_invocation_get_interface_name (GDBusMethodInvocation *invocation);

View File

@ -114,4 +114,16 @@ gchar *_g_dbus_enum_to_string (GType enum_type, gint value);
G_END_DECLS
/* ---------------------------------------------------------------------------------------------------- */
GDBusMethodInvocation *_g_dbus_method_invocation_new (const gchar *sender,
const gchar *object_path,
const gchar *interface_name,
const gchar *method_name,
const GDBusMethodInfo *method_info,
GDBusConnection *connection,
GDBusMessage *message,
GVariant *parameters,
gpointer user_data);
#endif /* __G_DBUS_PRIVATE_H__ */

View File

@ -1748,7 +1748,6 @@ g_dbus_message_set_unix_fd_list
#if IN_HEADER(__G_DBUS_METHOD_INVOCATION_H__)
#if IN_FILE(__G_DBUS_METHOD_INVOCATION_C__)
g_dbus_method_invocation_get_type G_GNUC_CONST
g_dbus_method_invocation_new
g_dbus_method_invocation_get_connection
g_dbus_method_invocation_get_interface_name
g_dbus_method_invocation_get_message