[kdbus] sync with kdbus (kdbus.h - commit: 5ae1ecac44cb)

[platform/upstream/glib.git] / gio / gdbusobject.c

diff --git a/gio/gdbusobject.c b/gio/gdbusobject.c
index 2211d4c..30b2e86 100644 (file)
--- a/gio/gdbusobject.c
+++ b/gio/gdbusobject.c
@@ -13,9 +13,7 @@
  * 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>
  */
@@ -25,7 +23,6 @@
 #include "gdbusobject.h"
 #include "gdbusinterface.h"
 #include "gdbusutils.h"
-#include "gio-marshal.h"
 
 #include "glibintl.h"
 
@@ -35,8 +32,8 @@
  * @include: gio/gio.h
  *
  * The #GDBusObject type is the base type for D-Bus objects on both
- * the service side (see #GDBusObjectStub) and the client side (see
- * #GDBusObjectProxy). It is essentially just a container of
+ * the service side (see #GDBusObjectSkeleton) and the client side
+ * (see #GDBusObjectProxy). It is essentially just a container of
  * interfaces.
  */
 
@@ -52,6 +49,8 @@ g_dbus_object_default_init (GDBusObjectIface *iface)
    * @interface: The #GDBusInterface that was added.
    *
    * Emitted when @interface is added to @object.
+   *
+   * Since: 2.30
    */
   g_signal_new ("interface-added",
                 G_TYPE_FROM_INTERFACE (iface),
@@ -70,6 +69,8 @@ g_dbus_object_default_init (GDBusObjectIface *iface)
    * @interface: The #GDBusInterface that was removed.
    *
    * Emitted when @interface is removed from @object.
+   *
+   * Since: 2.30
    */
   g_signal_new ("interface-removed",
                 G_TYPE_FROM_INTERFACE (iface),
@@ -92,6 +93,8 @@ g_dbus_object_default_init (GDBusObjectIface *iface)
  * Gets the object path for @object.
  *
  * Returns: A string owned by @object. Do not free.
+ *
+ * Since: 2.30
  */
 const gchar *
 g_dbus_object_get_object_path (GDBusObject *object)
@@ -109,6 +112,8 @@ g_dbus_object_get_object_path (GDBusObject *object)
  * Returns: (element-type GDBusInterface) (transfer full) : A list of #GDBusInterface instances.
  *   The returned list must be freed by g_list_free() after each element has been freed
  *   with g_object_unref().
+ *
+ * Since: 2.30
  */
 GList *
 g_dbus_object_get_interfaces (GDBusObject *object)
@@ -125,8 +130,10 @@ g_dbus_object_get_interfaces (GDBusObject *object)
  * Gets the D-Bus interface with name @interface_name associated with
  * @object, if any.
  *
- * Returns: %NULL if not found, otherwise a #GDBusInterface that must
- *   be freed with g_object_unref().
+ * Returns: (transfer full): %NULL if not found, otherwise a
+ *   #GDBusInterface that must be freed with g_object_unref().
+ *
+ * Since: 2.30
  */
 GDBusInterface *
 g_dbus_object_get_interface (GDBusObject *object,
@@ -136,56 +143,3 @@ g_dbus_object_get_interface (GDBusObject *object,
   g_return_val_if_fail (g_dbus_is_interface_name (interface_name), NULL);
   return iface->get_interface (object, interface_name);
 }
-
-
-/**
- * g_dbus_object_peek_with_typecheck:
- * @object: A #GDBusObject.
- * @interface_name: A D-Bus interface name.
- * @type: The #GType that the returned object must conform to.
- *
- * Like g_dbus_object_lookup_with_typecheck() except that the caller
- * does not own a reference to the returned object.
- *
- * <note><para>This function is intended to only be used in type
- * implementations.</para></note>
- *
- * Returns: A #GDBusInterface implementing @type or %NULL if
- * not found. Do not free the returned object, it is owned by
- * @object.
- */
-gpointer
-g_dbus_object_peek_with_typecheck (GDBusObject *object,
-                                   const gchar *interface_name,
-                                   GType        type)
-{
-  GDBusObjectIface *iface = G_DBUS_OBJECT_GET_IFACE (object);
-  g_return_val_if_fail (g_dbus_is_interface_name (interface_name), NULL);
-  return iface->peek_with_typecheck (object, interface_name, type);
-}
-
-/**
- * g_dbus_object_lookup_with_typecheck:
- * @object: A #GDBusObject.
- * @interface_name: A D-Bus interface name.
- * @type: The #GType that the returned object must conform to.
- *
- * Like g_dbus_object_get_interface() but warns on stderr if the
- * returned object, if any, does not conform to @type.
- *
- * <note><para>This function is intended to only be used in type
- * implementations.</para></note>
- *
- * Returns: A #GDBusInterface implementing @type or %NULL if
- * not found. Free with g_object_unref().
- */
-gpointer
-g_dbus_object_lookup_with_typecheck (GDBusObject *object,
-                                     const gchar *interface_name,
-                                     GType        type)
-{
-  GDBusObjectIface *iface = G_DBUS_OBJECT_GET_IFACE (object);
-  g_return_val_if_fail (g_dbus_is_interface_name (interface_name), NULL);
-  return iface->lookup_with_typecheck (object, interface_name, type);
-}
-