summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2014-03-18 18:44:25 +0000
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2014-03-27 15:59:19 +0000
commitc7c93ea042cbe700b4cc9faa0ede712d6231c8c6 (patch)
tree9110ccf91a875ca8cbdfa96da510bae48b84f3d4
parent63e329ee90820f9d75bd9d2ecf3335cdbd4681bc (diff)
Sync other tools from telepathy-glib tools branch
-rw-r--r--tools/telepathy-glib.supp79
-rw-r--r--tools/telepathy.am2
2 files changed, 8 insertions, 73 deletions
diff --git a/tools/telepathy-glib.supp b/tools/telepathy-glib.supp
index 28bd5a06a..2578396ae 100644
--- a/tools/telepathy-glib.supp
+++ b/tools/telepathy-glib.supp
@@ -190,6 +190,13 @@
}
{
+ gobject_init_ctor
+ Memcheck:Leak
+ ...
+ fun:gobject_init_ctor
+}
+
+{
g_type_init_with_debug_flags
Memcheck:Leak
...
@@ -253,44 +260,6 @@
fun:dbus_g_type_specialized_init
}
-{
- libdbus shared connection
- Memcheck:Leak
- ...
- fun:dbus_g_bus_get
-}
-
-{
- dbus-gobject registrations aren't freed unless we fall off the bus
- Memcheck:Leak
- ...
- fun:g_slist_append
- fun:dbus_g_connection_register_g_object
-}
-
-{
- DBusGProxy slots aren't freed unless we fall off the bus
- Memcheck:Leak
- ...
- fun:dbus_connection_allocate_data_slot
- ...
- fun:dbus_g_proxy_constructor
-}
-
-{
- error registrations are for life, not just for Christmas
- Memcheck:Leak
- ...
- fun:dbus_g_error_domain_register
-}
-
-{
- DBusGProxy class init
- Memcheck:Leak
- ...
- fun:dbus_g_proxy_class_init
-}
-
# ============================= telepathy-glib ========================
{
@@ -302,29 +271,6 @@
}
{
- tp_proxy_subclass_add_error_mapping refs the enum
- Memcheck:Leak
- ...
- fun:g_type_class_ref
- fun:tp_proxy_subclass_add_error_mapping
-}
-
-{
- tp_proxy_or_subclass_hook_on_interface_add never frees its list
- Memcheck:Leak
- ...
- fun:tp_proxy_or_subclass_hook_on_interface_add
-}
-
-{
- tp_dbus_daemon_constructor filter not freed til we fall off the bus
- Memcheck:Leak
- ...
- fun:dbus_connection_add_filter
- fun:tp_dbus_daemon_constructor
-}
-
-{
tp_g_socket_address_from_variant reffing GNIO types
Memcheck:Leak
...
@@ -334,17 +280,6 @@
}
{
- creating classes for DBusGProxy
- Memcheck:Leak
- ...
- fun:g_type_class_ref
- ...
- fun:g_object_new
- ...
- fun:tp_proxy_borrow_interface_by_id
-}
-
-{
creating classes for tp_dbus_daemon_new
Memcheck:Leak
...
diff --git a/tools/telepathy.am b/tools/telepathy.am
index 20ff0be13..c919995dc 100644
--- a/tools/telepathy.am
+++ b/tools/telepathy.am
@@ -55,7 +55,7 @@ maintainer-prepare-release:
$(MAKE) all
$(MAKE) distcheck
$(MAKE) release-mail
- git tag -s @PACKAGE@-@VERSION@ -m @PACKAGE@' '@VERSION@
+ cd $(srcdir) && git tag -s @PACKAGE@-@VERSION@ -m @PACKAGE@' '@VERSION@
gpg --detach-sign --armor @PACKAGE@-@VERSION@.tar.gz
release-mail: NEWS