Branch: master

a3ac8eda 2014-10-22 14:24:09 Timothy Pearson
Fix exec icon location and bring it into XDG compliance
M konversation/src/dcctransferpanel.cpp
M konversation/src/konvisettingsdialog.cpp
diff --git a/konversation/src/dcctransferpanel.cpp b/konversation/src/dcctransferpanel.cpp
index 3853e17..b1be854 100644
--- a/konversation/src/dcctransferpanel.cpp
+++ b/konversation/src/dcctransferpanel.cpp
@@ -114,7 +114,7 @@
     m_buttonAccept = new TQPushButton(icon("media-playback-start"), i18n("Accept"), buttonsBox, "start_dcc");
     m_buttonAbort  = new TQPushButton(icon("process-stop"),        i18n("Abort"),  buttonsBox, "abort_dcc");
     m_buttonClear  = new TQPushButton(icon("edit-delete"),  i18n("Clear"),  buttonsBox, "clear_dcc");
-    m_buttonOpen   = new TQPushButton(icon("exec"),        i18n("Open File"),   buttonsBox, "open_dcc_file");
+    m_buttonOpen   = new TQPushButton(icon("application-x-executable"),        i18n("Open File"),   buttonsBox, "open_dcc_file");
     m_buttonDetail = new TQPushButton(icon("view_text"),   i18n("Details"), buttonsBox, "detail_dcc");
     m_buttonDetail->setToggleButton( true );
 
@@ -145,7 +145,7 @@
     m_popup->insertItem(icon("edit-redo"),       i18n("Resend"),                      Popup::Resend);
     m_popup->insertItem(icon("edit-delete"),      i18n("&Clear"),                      Popup::Clear);
     m_popup->insertSeparator();                   // -----
-    m_popup->insertItem(icon("exec"),            i18n("&Open File"),                  Popup::Open);
+    m_popup->insertItem(icon("application-x-executable"),            i18n("&Open File"),                  Popup::Open);
     m_popup->insertItem(icon("messagebox_info"), i18n("File &Information"),           Popup::Info);
 
     #undef icon
diff --git a/konversation/src/konvisettingsdialog.cpp b/konversation/src/konvisettingsdialog.cpp
index ca5c71b..6975eaa 100644
--- a/konversation/src/konvisettingsdialog.cpp
+++ b/konversation/src/konvisettingsdialog.cpp
@@ -115,7 +115,7 @@
   m_confGeneralBehaviorWdg = new GeneralBehavior_Config( this, "GeneralBehavior" );
   pagePath.clear();
   pagePath << i18n("Behavior") << i18n("General");
-  addPage ( m_confGeneralBehaviorWdg, pagePath, "exec", i18n("General") );
+  addPage ( m_confGeneralBehaviorWdg, pagePath, "application-x-executable", i18n("General") );
 
   //Behavior/Connection
   m_confConnectionBehaviorWdg = new ConnectionBehavior_Config( this, "ConnectionBehavior" );