diff --git a/capplets/common/ChangeLog b/capplets/common/ChangeLog
index 6d4544307..346f0c2f3 100644
--- a/capplets/common/ChangeLog
+++ b/capplets/common/ChangeLog
@@ -1,3 +1,12 @@
+2005-01-27  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* gnome-theme-info.c: (top_theme_dir_changed),
+	(top_icon_theme_dir_changed), (real_add_top_theme_dir_monitor):
+	Try to fix bug #149236 by not freeing stuff already being free'd
+	by the hash destroy_func. It will leak a bit more, but that can
+	be fixed later. Please test this and report success in the report
+	mentioned above.
+
 2005-01-02  Thomas Cataldo  <thomas.cataldo@aliacom.fr>
 
 	* gconf-property-editor.c: (gconf_property_editor_finalize): plug
diff --git a/capplets/common/gnome-theme-info.c b/capplets/common/gnome-theme-info.c
index 6f3a5008c..c179ed62f 100644
--- a/capplets/common/gnome-theme-info.c
+++ b/capplets/common/gnome-theme-info.c
@@ -953,7 +953,6 @@ top_theme_dir_changed (GnomeVFSMonitorHandle *handle,
 	  g_hash_table_remove (handle_hash, name);
 	  g_free (monitor_data);
 	}
-      g_free (name);
     }
   gnome_vfs_uri_unref (common_theme_dir_uri);
 }
@@ -1005,7 +1004,6 @@ top_icon_theme_dir_changed (GnomeVFSMonitorHandle    *handle,
 	  g_hash_table_remove (handle_hash, name);
 	  g_free (monitor_data);
 	}
-      g_free (name);
     }
   gnome_vfs_uri_unref (common_icon_theme_dir_uri);
 }
@@ -1187,7 +1185,7 @@ real_add_top_theme_dir_monitor (GnomeVFSURI  *uri,
    * use it to remove the monitor handles when a dir is removed.
    */
   tuple = g_new0 (CallbackTuple, 1);
-  tuple->handle_hash = g_hash_table_new_full (g_str_hash, g_str_equal, (GDestroyNotify)g_free, NULL);
+  tuple->handle_hash = g_hash_table_new_full (g_str_hash, g_str_equal, (GDestroyNotify)g_free, (GDestroyNotify)g_free);
   tuple->priority = priority;
 
   /* Check the URI */