From: Matthias Clasen <mclasen@redhat.com>
Date: Sat, 2 Mar 2013 00:13:30 +0000 (-0500)
Subject: Revert "Fix gtkprintbackendcups crash"
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;ds=sidebyside;h=9d36dbb44ba14adeb29135de01a936eb623375f2;p=~andy%2Fgtk

Revert "Fix gtkprintbackendcups crash"

This reverts commit 54ffc982e96bc4b2484a2611c7dc5cf24c4c4a1a.

I've undone the GList behaviour change instead.
---

diff --git a/modules/printbackends/cups/gtkprintbackendcups.c b/modules/printbackends/cups/gtkprintbackendcups.c
index 8dbc78bf8..96f4be410 100644
--- a/modules/printbackends/cups/gtkprintbackendcups.c
+++ b/modules/printbackends/cups/gtkprintbackendcups.c
@@ -2067,15 +2067,11 @@ cups_request_printer_list_cb (GtkPrintBackendCups *cups_backend,
         }
 
       /* remove name from checklist if it was found */
-      if (removed_printer_checklist != NULL)
-      {
-	   if (node = g_list_find_custom (removed_printer_checklist,
-					  info->printer_name,
-					  (GCompareFunc) find_printer))
-		removed_printer_checklist =
-		     g_list_delete_link (removed_printer_checklist,
-					 node);
-      }
+      node = g_list_find_custom (removed_printer_checklist,
+				 info->printer_name,
+				 (GCompareFunc) find_printer);
+      removed_printer_checklist = g_list_delete_link (removed_printer_checklist,
+						      node);
 
       printer = gtk_print_backend_find_printer (backend, info->printer_name);
       if (!printer)