projects
/
platform
/
upstream
/
glib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[kdbus] Rework kdbus core files
[platform/upstream/glib.git]
/
gio
/
gdbusobject.h
diff --git
a/gio/gdbusobject.h
b/gio/gdbusobject.h
index
603229f
..
b408e2e
100644
(file)
--- a/
gio/gdbusobject.h
+++ b/
gio/gdbusobject.h
@@
-13,9
+13,7
@@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Public License along with this library; if not, see <http://www.gnu.org/licenses/>.
*
* Author: David Zeuthen <davidz@redhat.com>
*/
*
* Author: David Zeuthen <davidz@redhat.com>
*/
@@
-40,18
+38,11
@@
typedef struct _GDBusObjectIface GDBusObjectIface;
* @get_object_path: Returns the object path. See g_dbus_object_get_object_path().
* @get_interfaces: Returns all interfaces. See g_dbus_object_get_interfaces().
* @get_interface: Returns an interface by name. See g_dbus_object_get_interface().
* @get_object_path: Returns the object path. See g_dbus_object_get_object_path().
* @get_interfaces: Returns all interfaces. See g_dbus_object_get_interfaces().
* @get_interface: Returns an interface by name. See g_dbus_object_get_interface().
- * @lookup_with_typecheck: Like @get_interface but warns on stderr if the returned object, if any,
- * does not conform to @type. Returned object must be freed by the caller.
- * @peek_with_typecheck: Like @lookup_with_typecheck but does not transfer the reference.
* @interface_added: Signal handler for the #GDBusObject::interface-added signal.
* @interface_removed: Signal handler for the #GDBusObject::interface-removed signal.
*
* Base object type for D-Bus objects.
*
* @interface_added: Signal handler for the #GDBusObject::interface-added signal.
* @interface_removed: Signal handler for the #GDBusObject::interface-removed signal.
*
* Base object type for D-Bus objects.
*
- * <note><para>The @lookup_with_typecheck and @peek_with_typecheck
- * virtual functions should only be used by D-Bus interface
- * implementations.</para></note>
- *
* Since: 2.30
*/
struct _GDBusObjectIface
* Since: 2.30
*/
struct _GDBusObjectIface
@@
-64,13
+55,6
@@
struct _GDBusObjectIface
GDBusInterface *(*get_interface) (GDBusObject *object,
const gchar *interface_name);
GDBusInterface *(*get_interface) (GDBusObject *object,
const gchar *interface_name);
- gpointer (*lookup_with_typecheck) (GDBusObject *object,
- const gchar *interface_name,
- GType type);
- gpointer (*peek_with_typecheck) (GDBusObject *object,
- const gchar *interface_name,
- GType type);
-
/* Signals */
void (*interface_added) (GDBusObject *object,
GDBusInterface *interface_);
/* Signals */
void (*interface_added) (GDBusObject *object,
GDBusInterface *interface_);
@@
-79,19
+63,16
@@
struct _GDBusObjectIface
};
};
+GLIB_AVAILABLE_IN_ALL
GType g_dbus_object_get_type (void) G_GNUC_CONST;
GType g_dbus_object_get_type (void) G_GNUC_CONST;
+GLIB_AVAILABLE_IN_ALL
const gchar *g_dbus_object_get_object_path (GDBusObject *object);
const gchar *g_dbus_object_get_object_path (GDBusObject *object);
+GLIB_AVAILABLE_IN_ALL
GList *g_dbus_object_get_interfaces (GDBusObject *object);
GList *g_dbus_object_get_interfaces (GDBusObject *object);
+GLIB_AVAILABLE_IN_ALL
GDBusInterface *g_dbus_object_get_interface (GDBusObject *object,
const gchar *interface_name);
GDBusInterface *g_dbus_object_get_interface (GDBusObject *object,
const gchar *interface_name);
-gpointer g_dbus_object_peek_with_typecheck (GDBusObject *object,
- const gchar *interface_name,
- GType type);
-gpointer g_dbus_object_lookup_with_typecheck (GDBusObject *object,
- const gchar *interface_name,
- GType type);
-
G_END_DECLS
#endif /* __G_DBUS_OBJECT_H__ */
G_END_DECLS
#endif /* __G_DBUS_OBJECT_H__ */