diff --git a/ChangeLog b/ChangeLog
index 7d26bd828a..d61355eb01 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-06-30  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtkprinter.c (gtk_enumerate_printers): Always call the
+	destroy notify.  (#346027, Christian Persch)
+
 	* gtk/gtkprintsettings.c (gtk_print_settings_get_page_ranges):
 	Documentation updates.
 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 7d26bd828a..d61355eb01 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 2006-06-30  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtkprinter.c (gtk_enumerate_printers): Always call the
+	destroy notify.  (#346027, Christian Persch)
+
 	* gtk/gtkprintsettings.c (gtk_print_settings_get_page_ranges):
 	Documentation updates.
 
diff --git a/gtk/gtkprinter.c b/gtk/gtkprinter.c
index c0230472aa..60c06523e8 100644
--- a/gtk/gtkprinter.c
+++ b/gtk/gtkprinter.c
@@ -985,6 +985,12 @@ gtk_enumerate_printers (GtkPrinterFunc func,
 
   if (g_module_supported ())
     printer_list->backends = gtk_print_backend_load_modules ();
+  
+  if (printer_list->backends == NULL)
+    {
+      free_printer_list (printer_list);
+      return;
+    }
 
   for (node = printer_list->backends; node != NULL; node = next)
     {