From 1a2f871729a65c3be1e31ea041188fe76ae346d5 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 26 Mar 2015 13:02:33 -0500
Subject: [PATCH] Bring printer1 icon into XDG compliance (cherry picked from
 commit 61f6eb5a1e6d7094d993d6e26f4c02c94b3fa1c3)

---
 ...device-printer1.png => cr128-device-printer.png} | Bin
 ...-device-printer1.png => cr16-device-printer.png} | Bin
 ...-device-printer1.png => cr22-device-printer.png} | Bin
 ...-device-printer1.png => cr32-device-printer.png} | Bin
 ...-device-printer1.png => cr48-device-printer.png} | Bin
 ...-device-printer1.png => cr64-device-printer.png} | Bin
 tdecore/tdehw/tdehardwaredevices.cpp                |   2 +-
 tdeprint/management/kmmainview.cpp                  |   2 +-
 8 files changed, 2 insertions(+), 2 deletions(-)
 rename pics/crystalsvg/{cr128-device-printer1.png => cr128-device-printer.png} (100%)
 rename pics/crystalsvg/{cr16-device-printer1.png => cr16-device-printer.png} (100%)
 rename pics/crystalsvg/{cr22-device-printer1.png => cr22-device-printer.png} (100%)
 rename pics/crystalsvg/{cr32-device-printer1.png => cr32-device-printer.png} (100%)
 rename pics/crystalsvg/{cr48-device-printer1.png => cr48-device-printer.png} (100%)
 rename pics/crystalsvg/{cr64-device-printer1.png => cr64-device-printer.png} (100%)

diff --git a/pics/crystalsvg/cr128-device-printer1.png b/pics/crystalsvg/cr128-device-printer.png
similarity index 100%
rename from pics/crystalsvg/cr128-device-printer1.png
rename to pics/crystalsvg/cr128-device-printer.png
diff --git a/pics/crystalsvg/cr16-device-printer1.png b/pics/crystalsvg/cr16-device-printer.png
similarity index 100%
rename from pics/crystalsvg/cr16-device-printer1.png
rename to pics/crystalsvg/cr16-device-printer.png
diff --git a/pics/crystalsvg/cr22-device-printer1.png b/pics/crystalsvg/cr22-device-printer.png
similarity index 100%
rename from pics/crystalsvg/cr22-device-printer1.png
rename to pics/crystalsvg/cr22-device-printer.png
diff --git a/pics/crystalsvg/cr32-device-printer1.png b/pics/crystalsvg/cr32-device-printer.png
similarity index 100%
rename from pics/crystalsvg/cr32-device-printer1.png
rename to pics/crystalsvg/cr32-device-printer.png
diff --git a/pics/crystalsvg/cr48-device-printer1.png b/pics/crystalsvg/cr48-device-printer.png
similarity index 100%
rename from pics/crystalsvg/cr48-device-printer1.png
rename to pics/crystalsvg/cr48-device-printer.png
diff --git a/pics/crystalsvg/cr64-device-printer1.png b/pics/crystalsvg/cr64-device-printer.png
similarity index 100%
rename from pics/crystalsvg/cr64-device-printer1.png
rename to pics/crystalsvg/cr64-device-printer.png
diff --git a/tdecore/tdehw/tdehardwaredevices.cpp b/tdecore/tdehw/tdehardwaredevices.cpp
index 4fec70e9b..475f47014 100644
--- a/tdecore/tdehw/tdehardwaredevices.cpp
+++ b/tdecore/tdehw/tdehardwaredevices.cpp
@@ -4167,7 +4167,7 @@ TQPixmap TDEHardwareDevices::getDeviceTypeIconFromType(TDEGenericDeviceType::TDE
 		ret = DesktopIcon("kcmpci", size);
 	}
 	else if (query == TDEGenericDeviceType::Printer) {
-		ret = DesktopIcon("printer1", size);
+		ret = DesktopIcon("printer", size);
 	}
 	else if (query == TDEGenericDeviceType::Scanner) {
 		ret = DesktopIcon("scanner", size);
diff --git a/tdeprint/management/kmmainview.cpp b/tdeprint/management/kmmainview.cpp
index 879c00e2b..ce3f356d8 100644
--- a/tdeprint/management/kmmainview.cpp
+++ b/tdeprint/management/kmmainview.cpp
@@ -286,7 +286,7 @@ void KMMainView::initActions()
 	m_actions->action("printer_tool")->plug( menu );
 	menu->insertSeparator();
 	//m_menubar->insertItem( i18n( "Printer" ), menu );
-	m_menubar->insertButton( "printer1", 1, true, i18n( "Printer" ) );
+	m_menubar->insertButton( "printer", 1, true, i18n( "Printer" ) );
 	m_menubar->getButton( 1 )->setPopup( menu, true );
 	menu = new TQPopupMenu( this );
 	m_actions->action("server_restart")->plug( menu );