Attachment 10474 Details for Bug 11396 – Change every occurrence of g_hash_table_destroy() to g_hash_table_unref()

[patch] Change every occurrence of g_hash_table_destroy() to g_hash_table_unref()

dbus-glib-unref-all.patch (text/plain), 3.32 KB, created by Marco Barisione on 2007-06-27 08:11:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marco Barisione

Created: 2007-06-27 08:11:01 UTC

Size: 3.32 KB

patch

obsolete

>diff --git a/dbus/dbus-binding-tool-glib.c b/dbus/dbus-binding-tool-glib.c
>index adede27..ce979e4 100644
>--- a/dbus/dbus-binding-tool-glib.c
>+++ b/dbus/dbus-binding-tool-glib.c
>@@ -867,7 +867,7 @@ dbus_binding_tool_output_glib_server (BaseInfo *info, GIOChannel *channel, const
>     g_io_channel_unref (genmarshal_stdout);
>   if (data.channel)
>     g_io_channel_unref (data.channel);
>-  g_hash_table_destroy (data.generated);
>+  g_hash_table_unref (data.generated);
> 
>   return ret;
>  io_lose:
>diff --git a/dbus/dbus-gidl.c b/dbus/dbus-gidl.c
>index 7906d26..a03fdb7 100644
>--- a/dbus/dbus-gidl.c
>+++ b/dbus/dbus-gidl.c
>@@ -367,7 +367,7 @@ interface_info_unref (InterfaceInfo *info)
>   info->base.refcount -= 1;
>   if (info->base.refcount == 0)
>     {
>-      g_hash_table_destroy (info->annotations);
>+      g_hash_table_unref (info->annotations);
>       free_method_list (&info->methods);
>       free_signal_list (&info->signals);
>       free_property_list (&info->properties);
>@@ -492,7 +492,7 @@ method_info_unref (MethodInfo *info)
>   info->base.refcount -= 1;
>   if (info->base.refcount == 0)
>     {
>-      g_hash_table_destroy (info->annotations);
>+      g_hash_table_unref (info->annotations);
>       free_arg_list (&info->args);
>       base_info_free (info);
>     }
>@@ -721,7 +721,7 @@ arg_info_unref (ArgInfo *info)
>   info->base.refcount -= 1;
>   if (info->base.refcount == 0)
>     {
>-      g_hash_table_destroy (info->annotations);
>+      g_hash_table_unref (info->annotations);
>       g_free (info->type);
>       base_info_free (info);
>     }
>diff --git a/dbus/dbus-gobject.c b/dbus/dbus-gobject.c
>index da451a5..8e7b326 100644
>--- a/dbus/dbus-gobject.c
>+++ b/dbus/dbus-gobject.c
>@@ -580,7 +580,7 @@ introspect_interfaces (GObject *object, GString *xml)
>       data.object_info = info;
> 
>       g_hash_table_foreach (interfaces, write_interface, &data);
>-      g_hash_table_destroy (interfaces);
>+      g_hash_table_unref (interfaces);
>     }
> 
>   g_list_free (info_list);
>diff --git a/dbus/dbus-gproxy.c b/dbus/dbus-gproxy.c
>index 3d5a0c5..feb796d 100644
>--- a/dbus/dbus-gproxy.c
>+++ b/dbus/dbus-gproxy.c
>@@ -253,7 +253,7 @@ dbus_g_proxy_manager_unref (DBusGProxyManager *manager)
>            */
>           g_assert (g_hash_table_size (manager->proxy_lists) == 0);
>           
>-          g_hash_table_destroy (manager->proxy_lists);
>+          g_hash_table_unref (manager->proxy_lists);
>           manager->proxy_lists = NULL;
> 
>         }
>@@ -265,7 +265,7 @@ dbus_g_proxy_manager_unref (DBusGProxyManager *manager)
> 	   */
>           g_assert (g_hash_table_size (manager->owner_names) == 0);
> 
>-	  g_hash_table_destroy (manager->owner_names);
>+	  g_hash_table_unref (manager->owner_names);
> 	  manager->owner_names = NULL;
> 	}
> 
>@@ -1057,7 +1057,7 @@ dbus_g_proxy_manager_unregister (DBusGProxyManager *manager,
>   
>   if (g_hash_table_size (manager->proxy_lists) == 0)
>     {
>-      g_hash_table_destroy (manager->proxy_lists);
>+      g_hash_table_unref (manager->proxy_lists);
>       manager->proxy_lists = NULL;
>     }
> 
>@@ -1441,7 +1441,7 @@ dbus_g_proxy_dispose (GObject *object)
> 
>   /* Cancel outgoing pending calls */
>   g_hash_table_foreach (priv->pending_calls, cancel_pending_call, proxy);
>-  g_hash_table_destroy (priv->pending_calls);
>+  g_hash_table_unref (priv->pending_calls);
>   priv->pending_calls = NULL;
> 
>   if (priv->manager && proxy != priv->manager->bus_proxy)

Actions: View | Splinter Review

Attachments on bug 11396: 10472 | 10473 | 10474

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.