projects
/
platform
/
upstream
/
glib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
improve bloom filter on send
[platform/upstream/glib.git]
/
gio
/
gdbusobjectmanager.c
diff --git
a/gio/gdbusobjectmanager.c
b/gio/gdbusobjectmanager.c
index
6b3b291
..
25081b1
100644
(file)
--- 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
* 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>
*/
@@
-24,7
+22,6
@@
#include "gdbusobject.h"
#include "gdbusobjectmanager.h"
#include "gdbusobject.h"
#include "gdbusobjectmanager.h"
-#include "gio-marshal.h"
#include "gdbusinterface.h"
#include "gdbusutils.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
* @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.
*/
* 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)
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.
* @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),
*/
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.
* @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),
*/
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.
*
* 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),
*/
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,
G_STRUCT_OFFSET (GDBusObjectManagerIface, interface_added),
NULL,
NULL,
-
_gio_marshal_VOID__OBJECT_OBJECT
,
+
NULL
,
G_TYPE_NONE,
2,
G_TYPE_DBUS_OBJECT,
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.
*
* 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),
*/
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,
G_STRUCT_OFFSET (GDBusObjectManagerIface, interface_removed),
NULL,
NULL,
-
_gio_marshal_VOID__OBJECT_OBJECT
,
+
NULL
,
G_TYPE_NONE,
2,
G_TYPE_DBUS_OBJECT,
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.
* 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)
*/
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().
* #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)
*/
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.
*
*
* 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,
*/
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.
*
* 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,
*/
GDBusInterface *
g_dbus_object_manager_get_interface (GDBusObjectManager *manager,