[maemo-commits] [maemo-commits] r9837 - in projects/haf/trunk/dbus-glib/debian: . patches

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2007-02-14 08:55:09 +0200 (Wed, 14 Feb 2007)
New Revision: 9837

Removed:
   projects/haf/trunk/dbus-glib/debian/patches/04-dbus-gproxy-crash-and-leak-fix.patch
Modified:
   projects/haf/trunk/dbus-glib/debian/changelog
Log:
removed a patch that is now in the tarball


Modified: projects/haf/trunk/dbus-glib/debian/changelog
===================================================================
--- projects/haf/trunk/dbus-glib/debian/changelog	2007-02-14 06:47:19 UTC (rev 9836)
+++ projects/haf/trunk/dbus-glib/debian/changelog	2007-02-14 06:55:09 UTC (rev 9837)
@@ -2,6 +2,8 @@
 
   * UNRELEASED
   * Upgraded the upstream tarball to v0.73.
+  * Removed 04-dbus-gproxy-crash-and-leak-fix.patch because it's included
+    in the tarball.
 
  -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Wed, 14 Feb 2007 08:45:45 +0200
 

Deleted: projects/haf/trunk/dbus-glib/debian/patches/04-dbus-gproxy-crash-and-leak-fix.patch
===================================================================
--- projects/haf/trunk/dbus-glib/debian/patches/04-dbus-gproxy-crash-and-leak-fix.patch	2007-02-14 06:47:19 UTC (rev 9836)
+++ projects/haf/trunk/dbus-glib/debian/patches/04-dbus-gproxy-crash-and-leak-fix.patch	2007-02-14 06:55:09 UTC (rev 9837)
@@ -1,50 +0,0 @@
-diff -pur dbus-glib-0.72/dbus/dbus-gproxy.c dbus-glib-0.72.new/dbus/dbus-gproxy.c
---- dbus-glib-0.72/dbus/dbus-gproxy.c	2006-10-25 22:59:07.000000000 +0300
-+++ dbus-glib-0.72.new/dbus/dbus-gproxy.c	2006-11-14 16:15:11.082313384 +0200
-@@ -717,18 +717,21 @@ dbus_g_proxy_manager_replace_name_owner 
- 
-       names = g_hash_table_lookup (manager->owner_names, prev_owner);
- 
--      link = g_slist_find_custom (names, name, find_name_in_info);
--
-       info = NULL;
--      if (link != NULL)
--	{
--	  info = link->data;
-+      if (names != NULL)
-+        {
-+	  link = g_slist_find_custom (names, name, find_name_in_info);
-+
-+	  if (link != NULL)
-+	    {
-+	      info = link->data;
- 	  
--	  names = g_slist_delete_link (names, link);
-+	      names = g_slist_delete_link (names, link);
- 
--	  if (names == NULL)
--	    g_hash_table_remove (manager->owner_names, prev_owner);
--	}
-+	      if (names == NULL)
-+	        g_hash_table_remove (manager->owner_names, prev_owner);
-+	    }
-+        }
- 
-       if (new_owner[0] == '\0')
- 	{
-@@ -757,8 +760,14 @@ dbus_g_proxy_manager_replace_name_owner 
- 	  g_slist_free (data.destroyed);
- 
- 	  LOCK_MANAGER (manager);
-+
-+	  if (info)
-+	    {
-+	      g_free (info->name);
-+	      g_free (info);
-+	    }
- 	}
--      else
-+      else if (info)
- 	{
- 	  insert_nameinfo (manager, new_owner, info);
- 	}