GDBus: Avoid using the word interface in public C headers

Same deal as with e.g. index since some libraries may do crazy stuff
such as "#define interface xyz".

Signed-off-by: David Zeuthen <davidz@redhat.com>
This commit is contained in:
David Zeuthen 2011-04-11 15:13:25 -04:00
parent 4dffec8906
commit 4809028736
4 changed files with 12 additions and 12 deletions

View File

@ -59,16 +59,16 @@ struct _GDBusInterfaceIface
GTypeInterface parent_iface; GTypeInterface parent_iface;
/* Virtual Functions */ /* Virtual Functions */
GDBusInterfaceInfo *(*get_info) (GDBusInterface *interface); GDBusInterfaceInfo *(*get_info) (GDBusInterface *interface_);
GDBusObject *(*get_object) (GDBusInterface *interface); GDBusObject *(*get_object) (GDBusInterface *interface_);
void (*set_object) (GDBusInterface *interface, void (*set_object) (GDBusInterface *interface_,
GDBusObject *object); GDBusObject *object);
}; };
GType g_dbus_interface_get_type (void) G_GNUC_CONST; GType g_dbus_interface_get_type (void) G_GNUC_CONST;
GDBusInterfaceInfo *g_dbus_interface_get_info (GDBusInterface *interface); GDBusInterfaceInfo *g_dbus_interface_get_info (GDBusInterface *interface_);
GDBusObject *g_dbus_interface_get_object (GDBusInterface *interface); GDBusObject *g_dbus_interface_get_object (GDBusInterface *interface_);
void g_dbus_interface_set_object (GDBusInterface *interface, void g_dbus_interface_set_object (GDBusInterface *interface_,
GDBusObject *object); GDBusObject *object);
G_END_DECLS G_END_DECLS

View File

@ -73,9 +73,9 @@ struct _GDBusObjectIface
/* Signals */ /* Signals */
void (*interface_added) (GDBusObject *object, void (*interface_added) (GDBusObject *object,
GDBusInterface *interface); GDBusInterface *interface_);
void (*interface_removed) (GDBusObject *object, void (*interface_removed) (GDBusObject *object,
GDBusInterface *interface); GDBusInterface *interface_);
}; };

View File

@ -71,10 +71,10 @@ struct _GDBusObjectManagerIface
void (*interface_added) (GDBusObjectManager *manager, void (*interface_added) (GDBusObjectManager *manager,
GDBusObject *object, GDBusObject *object,
GDBusInterface *interface); GDBusInterface *interface_);
void (*interface_removed) (GDBusObjectManager *manager, void (*interface_removed) (GDBusObjectManager *manager,
GDBusObject *object, GDBusObject *object,
GDBusInterface *interface); GDBusInterface *interface_);
}; };
GType g_dbus_object_manager_get_type (void) G_GNUC_CONST; GType g_dbus_object_manager_get_type (void) G_GNUC_CONST;

View File

@ -78,9 +78,9 @@ GType g_dbus_object_stub_get_type (void) G_GNUC_
GDBusObjectStub *g_dbus_object_stub_new (const gchar *object_path); GDBusObjectStub *g_dbus_object_stub_new (const gchar *object_path);
void g_dbus_object_stub_flush (GDBusObjectStub *object); void g_dbus_object_stub_flush (GDBusObjectStub *object);
void g_dbus_object_stub_add_interface (GDBusObjectStub *object, void g_dbus_object_stub_add_interface (GDBusObjectStub *object,
GDBusInterfaceStub *interface); GDBusInterfaceStub *interface_);
void g_dbus_object_stub_remove_interface (GDBusObjectStub *object, void g_dbus_object_stub_remove_interface (GDBusObjectStub *object,
GDBusInterfaceStub *interface); GDBusInterfaceStub *interface_);
void g_dbus_object_stub_remove_interface_by_name (GDBusObjectStub *object, void g_dbus_object_stub_remove_interface_by_name (GDBusObjectStub *object,
const gchar *interface_name); const gchar *interface_name);
void g_dbus_object_stub_set_object_path (GDBusObjectStub *object, void g_dbus_object_stub_set_object_path (GDBusObjectStub *object,