Bring camera icons into XDG compliance

7 files changed, 3 insertions, 3 deletions

diff --git a/kamera/kcontrol/kamera.cpp b/kamera/kcontrol/kamera.cpp
index 53b17545..8a127b8c 100644
--- a/kamera/kcontrol/kamera.cpp
+++ b/kamera/kcontrol/kamera.cpp
@@ -54,7 +54,7 @@ KKameraConfig::KKameraConfig(TQWidget *parent, const char *name, const TQStringL
 	m_devicePopup = new TDEPopupMenu(this);
 	m_actions = new TDEActionCollection(this);
 	m_config = new KSimpleConfig(KProtocolInfo::config("camera"));
-	
+
 	m_context = gp_context_new();
 	if (m_context) {
 
@@ -118,7 +118,7 @@ void KKameraConfig::displayGPSuccessDialogue(void)
 	// create actions
 	TDEAction *act;
 	
-	act = new TDEAction(i18n("Add"), "camera", 0, TQT_TQOBJECT(this), TQT_SLOT(slot_addCamera()), m_actions, "camera_add");
+	act = new TDEAction(i18n("Add"), "camera-photo", 0, TQT_TQOBJECT(this), TQT_SLOT(slot_addCamera()), m_actions, "camera_add");
 	act->setWhatsThis(i18n("Click this button to add a new camera."));
 	act->plug(m_toolbar);
 	m_toolbar->insertLineSeparator();
@@ -147,7 +147,7 @@ void KKameraConfig::populateDeviceListView(void)
 	CameraDevicesMap::Iterator it;
 	for (it = m_devices.begin(); it != m_devices.end(); it++) {
 		if (it.data()) {
-			new TQIconViewItem(m_deviceSel, it.key(), DesktopIcon("camera"));
+			new TQIconViewItem(m_deviceSel, it.key(), DesktopIcon("camera-photo"));
 		}
 	}
 	slot_deviceSelected(m_deviceSel->currentItem());
diff --git a/kamera/pics/cr16-app-camera.png b/kamera/pics/cr16-app-camera-photo.png
index 364167f0..364167f0 100644
--- a/kamera/pics/cr16-app-camera.png
+++ b/kamera/pics/cr16-app-camera-photo.png
diff --git a/kamera/pics/cr16-device-camera.png b/kamera/pics/cr16-device-camera-photo.png
index 364167f0..364167f0 100644
--- a/kamera/pics/cr16-device-camera.png
+++ b/kamera/pics/cr16-device-camera-photo.png
diff --git a/kamera/pics/cr22-device-camera.png b/kamera/pics/cr22-device-camera-photo.png
index 745affe7..745affe7 100644
--- a/kamera/pics/cr22-device-camera.png
+++ b/kamera/pics/cr22-device-camera-photo.png
diff --git a/kamera/pics/cr22-filesys-camera.png b/kamera/pics/cr22-filesys-camera-photo.png
index 745affe7..745affe7 100644
--- a/kamera/pics/cr22-filesys-camera.png
+++ b/kamera/pics/cr22-filesys-camera-photo.png
diff --git a/kamera/pics/cr32-device-camera.png b/kamera/pics/cr32-device-camera-photo.png
index 6876fa90..6876fa90 100644
--- a/kamera/pics/cr32-device-camera.png
+++ b/kamera/pics/cr32-device-camera-photo.png
diff --git a/kamera/pics/cr32-filesys-camera.png b/kamera/pics/cr32-filesys-camera-photo.png
index 6876fa90..6876fa90 100644
--- a/kamera/pics/cr32-filesys-camera.png
+++ b/kamera/pics/cr32-filesys-camera-photo.png