--- eggcups-0.19/ec-driver-prompt-dialog.c.xml-parsing	2006-12-12 16:46:41.000000000 +0000
+++ eggcups-0.19/ec-driver-prompt-dialog.c	2006-12-12 16:47:23.000000000 +0000
@@ -305,19 +305,6 @@
 	return g_object_new (EC_TYPE_DRIVER_PROMPT_DIALOG, NULL);
 }
 
-/*
-* Some makes in the Foomatic database are in abreviated form
-* and must be translated back to a more readable name
-*/
-static gchar *
-translate_make (gchar *make)
-{
-	if (strcmp (make, "HP") == 0)
-		return g_strdup ("Hewlett-Packard");
-	else
-		return g_strdup (make);
-}
-
 static gint
 default_tree_sort_on_first_col_func (GtkTreeModel *model,
                                      GtkTreeIter *a,
@@ -613,14 +600,13 @@
 
 	switch (dlg->priv->parse_state) {
 	case PARSE_STATE_MAKE:
-		g_free (dlg->priv->current_driver.make);
-		dlg->priv->current_driver.make = translate_make (text);
-		g_free (text);
+		if (!dlg->priv->current_driver.make)
+			dlg->priv->current_driver.make = text;
 		break;
 	case PARSE_STATE_MODEL:
-		g_free (dlg->priv->current_driver.model);
-		dlg->priv->current_driver.model = text;
+		if (!dlg->priv->current_driver.model)
+			dlg->priv->current_driver.model = text;
 		break;
 	case PARSE_STATE_DRIVER:
 		g_free (dlg->priv->current_driver.driver);