diff --git a/ChangeLog b/ChangeLog
index 7bc3e7fbc..3afa633e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-17  Paolo Borelli  <pborelli@katamail.com>
+
+	* capplets/common/activate-settings-daemon.c: fix leak, patch by
+	Kjartan Maaras. (#153595)
+
 2004-10-17  Sergey V. Udaltsov <svu@gnome.org>
 
 	* configure.in : require libxklavier 1.10 - since API was changed
diff --git a/capplets/common/activate-settings-daemon.c b/capplets/common/activate-settings-daemon.c
index d60f3330d..186eb82a7 100644
--- a/capplets/common/activate-settings-daemon.c
+++ b/capplets/common/activate-settings-daemon.c
@@ -10,7 +10,7 @@
 
 /*#include "GNOME_SettingsDaemon.h"*/
 
-static void popup_error_message ()
+static void popup_error_message (void)
 {
   GtkWidget *dialog;
 
diff --git a/capplets/common/gnome-theme-info.c b/capplets/common/gnome-theme-info.c
index 97b41add4..6f3a5008c 100644
--- a/capplets/common/gnome-theme-info.c
+++ b/capplets/common/gnome-theme-info.c
@@ -418,7 +418,7 @@ handle_change_signal (GnomeThemeType       type,
 		      GnomeThemeChangeType change_type,
 		      GnomeThemeElement    element)
 {
-#if DEBUG
+#ifdef DEBUG
   gchar *type_str = NULL;
   gchar *element_str = NULL;
 #endif
@@ -441,7 +441,7 @@ handle_change_signal (GnomeThemeType       type,
     (* callback_data->func) (uri, callback_data->data);
   }
 
-#if DEBUG
+#ifdef DEBUG
   if (change_type == GNOME_THEME_CHANGE_CREATED)
     type_str = "created";
   else if (change_type == GNOME_THEME_CHANGE_CHANGED)
@@ -1382,6 +1382,8 @@ gnome_theme_icon_info_new (void)
 void
 gnome_theme_icon_info_free (GnomeThemeIconInfo *icon_theme_info)
 {
+  g_free (icon_theme_info->name);
+  g_free (icon_theme_info->path);
   g_free (icon_theme_info);
 }