From 10321adc0b200d126b6246473752e3bacc418d8a Mon Sep 17 00:00:00 2001
From: Felix Geyer <debfx@fobos.de>
Date: Sun, 27 May 2012 12:47:46 +0200
Subject: [PATCH] Fix icons/application/22x22/action folder name.

---
 COPYING                                             |   2 +-
 .../22x22/{action => actions}/dialog-close.png      | Bin
 .../22x22/{action => actions}/dialog-ok.png         | Bin
 .../edit-clear-locationbar-rtl.png                  | Bin
 .../22x22/{action => actions}/entry-delete.png      | Bin
 .../22x22/{action => actions}/entry-edit.png        | Bin
 .../22x22/{action => actions}/entry-new.png         | Bin
 .../22x22/{action => actions}/system-search.png     | Bin
 src/gui/DatabaseWidget.cpp                          |   2 +-
 src/gui/LineEdit.cpp                                |   2 +-
 10 files changed, 3 insertions(+), 3 deletions(-)
 rename share/icons/application/22x22/{action => actions}/dialog-close.png (100%)
 rename share/icons/application/22x22/{action => actions}/dialog-ok.png (100%)
 rename share/icons/application/22x22/{action => actions}/edit-clear-locationbar-rtl.png (100%)
 rename share/icons/application/22x22/{action => actions}/entry-delete.png (100%)
 rename share/icons/application/22x22/{action => actions}/entry-edit.png (100%)
 rename share/icons/application/22x22/{action => actions}/entry-new.png (100%)
 rename share/icons/application/22x22/{action => actions}/system-search.png (100%)

diff --git a/COPYING b/COPYING
index df6064472..0994addb4 100644
--- a/COPYING
+++ b/COPYING
@@ -42,7 +42,7 @@ Copyright: 2003-2004, David Vignoni <david@icon-king.com>
            2012, Felix Geyer <debfx@fobos.de>
 License: LGPL-2.1
 
-Files: share/icons/application/*/action/dialog-close.png, share/icons/application/*/action/dialog-ok.png,
+Files: share/icons/application/*/actions/dialog-close.png, share/icons/application/*/actions/dialog-ok.png,
        share/icons/application/*/status/dialog-error.png, share/icons/application/*/status/dialog-information.png,
        share/icons/application/*/status/dialog-warning.png, share/icons/application/*/actions/system-search.png
 Copyright: 2007, Nuno Pinheiro <nuno@oxygen-icons.org>
diff --git a/share/icons/application/22x22/action/dialog-close.png b/share/icons/application/22x22/actions/dialog-close.png
similarity index 100%
rename from share/icons/application/22x22/action/dialog-close.png
rename to share/icons/application/22x22/actions/dialog-close.png
diff --git a/share/icons/application/22x22/action/dialog-ok.png b/share/icons/application/22x22/actions/dialog-ok.png
similarity index 100%
rename from share/icons/application/22x22/action/dialog-ok.png
rename to share/icons/application/22x22/actions/dialog-ok.png
diff --git a/share/icons/application/22x22/action/edit-clear-locationbar-rtl.png b/share/icons/application/22x22/actions/edit-clear-locationbar-rtl.png
similarity index 100%
rename from share/icons/application/22x22/action/edit-clear-locationbar-rtl.png
rename to share/icons/application/22x22/actions/edit-clear-locationbar-rtl.png
diff --git a/share/icons/application/22x22/action/entry-delete.png b/share/icons/application/22x22/actions/entry-delete.png
similarity index 100%
rename from share/icons/application/22x22/action/entry-delete.png
rename to share/icons/application/22x22/actions/entry-delete.png
diff --git a/share/icons/application/22x22/action/entry-edit.png b/share/icons/application/22x22/actions/entry-edit.png
similarity index 100%
rename from share/icons/application/22x22/action/entry-edit.png
rename to share/icons/application/22x22/actions/entry-edit.png
diff --git a/share/icons/application/22x22/action/entry-new.png b/share/icons/application/22x22/actions/entry-new.png
similarity index 100%
rename from share/icons/application/22x22/action/entry-new.png
rename to share/icons/application/22x22/actions/entry-new.png
diff --git a/share/icons/application/22x22/action/system-search.png b/share/icons/application/22x22/actions/system-search.png
similarity index 100%
rename from share/icons/application/22x22/action/system-search.png
rename to share/icons/application/22x22/actions/system-search.png
diff --git a/src/gui/DatabaseWidget.cpp b/src/gui/DatabaseWidget.cpp
index cac0d1187..38e432a56 100644
--- a/src/gui/DatabaseWidget.cpp
+++ b/src/gui/DatabaseWidget.cpp
@@ -80,7 +80,7 @@ DatabaseWidget::DatabaseWidget(Database* db, QWidget* parent)
     rightHandSideWidget->setSizePolicy(policy);
 
     QAction* closeAction = new QAction(m_searchWidget);
-    QIcon closeIcon = dataPath()->icon("action", "dialog-close");
+    QIcon closeIcon = dataPath()->icon("actions", "dialog-close");
     closeAction->setIcon(closeIcon);
     m_searchUi->closeSearchButton->setDefaultAction(closeAction);
     m_searchWidget->hide();
diff --git a/src/gui/LineEdit.cpp b/src/gui/LineEdit.cpp
index b8aa851eb..e344899c6 100644
--- a/src/gui/LineEdit.cpp
+++ b/src/gui/LineEdit.cpp
@@ -19,7 +19,7 @@ LineEdit::LineEdit(QWidget* parent)
 {
     m_clearButton = new QToolButton(this);
     m_clearButton->setObjectName("clearButton");
-    QIcon icon = dataPath()->icon("action", "edit-clear-locationbar-rtl");
+    QIcon icon = dataPath()->icon("actions", "edit-clear-locationbar-rtl");
     m_clearButton->setIcon(icon);
     m_clearButton->setCursor(Qt::ArrowCursor);
     m_clearButton->setStyleSheet("QToolButton { border: none; padding: 0px; }");