X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gio%2Fgdbusobjectmanager.c;h=25081b12c994ea10525a92bd002056b180d92c11;hb=5bb064e8bb8cf7f6df5fe0bde67b776b3d6d01a7;hp=6b3b29164d36d4689e642f91c8e722b0ddd2a036;hpb=94b907134426e26393a86630dae5ce53baee6ae6;p=platform%2Fupstream%2Fglib.git

diff --git a/gio/gdbusobjectmanager.c b/gio/gdbusobjectmanager.c
index 6b3b291..25081b1 100644
--- a/gio/gdbusobjectmanager.c
+++ b/gio/gdbusobjectmanager.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>
  */
@@ -24,7 +22,6 @@
 
 #include "gdbusobject.h"
 #include "gdbusobjectmanager.h"
-#include "gio-marshal.h"
 #include "gdbusinterface.h"
 #include "gdbusutils.h"
 
@@ -36,20 +33,14 @@
  * @include: gio/gio.h
  *
  * The #GDBusObjectManager type is the base type for service- and
- * client-side implementations of the standardized <ulink
- * url="http://dbus.freedesktop.org/doc/dbus-specification.html#standard-interfaces-objectmanager">org.freedesktop.DBus.ObjectManager</ulink>
+ * client-side implementations of the standardized
+ * [org.freedesktop.DBus.ObjectManager](http://dbus.freedesktop.org/doc/dbus-specification.html#standard-interfaces-objectmanager)
  * interface.
  *
  * See #GDBusObjectManagerClient for the client-side implementation
  * and #GDBusObjectManagerServer for the service-side implementation.
  */
 
-/**
- * GDBusObjectManager:
- *
- * A D-Bus object.
- */
-
 typedef GDBusObjectManagerIface GDBusObjectManagerInterface;
 G_DEFINE_INTERFACE (GDBusObjectManager, g_dbus_object_manager, G_TYPE_OBJECT)
 
@@ -62,6 +53,8 @@ g_dbus_object_manager_default_init (GDBusObjectManagerIface *iface)
    * @object: The #GDBusObject that was added.
    *
    * Emitted when @object is added to @manager.
+   *
+   * Since: 2.30
    */
   g_signal_new ("object-added",
                 G_TYPE_FROM_INTERFACE (iface),
@@ -80,6 +73,8 @@ g_dbus_object_manager_default_init (GDBusObjectManagerIface *iface)
    * @object: The #GDBusObject that was removed.
    *
    * Emitted when @object is removed from @manager.
+   *
+   * Since: 2.30
    */
   g_signal_new ("object-removed",
                 G_TYPE_FROM_INTERFACE (iface),
@@ -102,6 +97,8 @@ g_dbus_object_manager_default_init (GDBusObjectManagerIface *iface)
    *
    * This signal exists purely as a convenience to avoid having to
    * connect signals to all objects managed by @manager.
+   *
+   * Since: 2.30
    */
   g_signal_new ("interface-added",
                 G_TYPE_FROM_INTERFACE (iface),
@@ -109,7 +106,7 @@ g_dbus_object_manager_default_init (GDBusObjectManagerIface *iface)
                 G_STRUCT_OFFSET (GDBusObjectManagerIface, interface_added),
                 NULL,
                 NULL,
-                _gio_marshal_VOID__OBJECT_OBJECT,
+                NULL,
                 G_TYPE_NONE,
                 2,
                 G_TYPE_DBUS_OBJECT,
@@ -125,6 +122,8 @@ g_dbus_object_manager_default_init (GDBusObjectManagerIface *iface)
    *
    * This signal exists purely as a convenience to avoid having to
    * connect signals to all objects managed by @manager.
+   *
+   * Since: 2.30
    */
   g_signal_new ("interface-removed",
                 G_TYPE_FROM_INTERFACE (iface),
@@ -132,7 +131,7 @@ g_dbus_object_manager_default_init (GDBusObjectManagerIface *iface)
                 G_STRUCT_OFFSET (GDBusObjectManagerIface, interface_removed),
                 NULL,
                 NULL,
-                _gio_marshal_VOID__OBJECT_OBJECT,
+                NULL,
                 G_TYPE_NONE,
                 2,
                 G_TYPE_DBUS_OBJECT,
@@ -149,6 +148,8 @@ g_dbus_object_manager_default_init (GDBusObjectManagerIface *iface)
  * Gets the object path that @manager is for.
  *
  * Returns: A string owned by @manager. Do not free.
+ *
+ * Since: 2.30
  */
 const gchar *
 g_dbus_object_manager_get_object_path (GDBusObjectManager *manager)
@@ -167,6 +168,8 @@ g_dbus_object_manager_get_object_path (GDBusObjectManager *manager)
  *   #GDBusObject objects. The returned list should be freed with
  *   g_list_free() after each element has been freed with
  *   g_object_unref().
+ *
+ * Since: 2.30
  */
 GList *
 g_dbus_object_manager_get_objects (GDBusObjectManager *manager)
@@ -182,7 +185,10 @@ g_dbus_object_manager_get_objects (GDBusObjectManager *manager)
  *
  * Gets the #GDBusObjectProxy at @object_path, if any.
  *
- * Returns: A #GDBusObject or %NULL. Free with g_object_unref().
+ * Returns: (transfer full): A #GDBusObject or %NULL. Free with
+ *   g_object_unref().
+ *
+ * Since: 2.30
  */
 GDBusObject *
 g_dbus_object_manager_get_object (GDBusObjectManager *manager,
@@ -202,7 +208,10 @@ g_dbus_object_manager_get_object (GDBusObjectManager *manager,
  * Gets the interface proxy for @interface_name at @object_path, if
  * any.
  *
- * Returns: A #GDBusInterface instance or %NULL. Free with g_object_unref().
+ * Returns: (transfer full): A #GDBusInterface instance or %NULL. Free
+ *   with g_object_unref().
+ *
+ * Since: 2.30
  */
 GDBusInterface *
 g_dbus_object_manager_get_interface (GDBusObjectManager *manager,