- Support skins in 'archive' and 'markasjunk' plugins

git-svn-id: https://svn.roundcube.net/trunk@2957 208e9e7b-5314-0410-a742-e7e81cd9613c

3 files changed, 5 insertions, 2 deletions

diff --git a/roundcubemail/plugins/markasjunk/markasjunk.php b/roundcubemail/plugins/markasjunk/markasjunk.php
index b269637f4..961a446d8 100644
--- a/roundcubemail/plugins/markasjunk/markasjunk.php
+++ b/roundcubemail/plugins/markasjunk/markasjunk.php
@@ -20,10 +20,13 @@ class markasjunk extends rcube_plugin
     
     $rcmail = rcmail::get_instance();
     if ($rcmail->action == '' || $rcmail->action == 'show') {
+      $skin_path = 'skins/'.$rcmail->output->config['skin'];
       $this->include_script('markasjunk.js');
       $this->add_texts('localization', true);
-      $this->add_button(array('command' => 'plugin.markasjunk', 'imagepas' => 'junk_pas.png',
-        'imageact' => 'junk_act.png', 'title' => 'markasjunk.buttontitle'), 'toolbar');
+      $this->add_button(array('command' => 'plugin.markasjunk',
+        'imagepas' => $skin_path.'/junk_pas.png',
+        'imageact' => $skin_path.'/junk_act.png',
+	'title' => 'markasjunk.buttontitle'), 'toolbar');
     }
   }
 
diff --git a/roundcubemail/plugins/markasjunk/junk_act.png b/roundcubemail/plugins/markasjunk/skins/default/junk_act.png
index b5a84f604..b5a84f604 100644
--- a/roundcubemail/plugins/markasjunk/junk_act.png
+++ b/roundcubemail/plugins/markasjunk/skins/default/junk_act.png
diff --git a/roundcubemail/plugins/markasjunk/junk_pas.png b/roundcubemail/plugins/markasjunk/skins/default/junk_pas.png
index b88a561a4..b88a561a4 100644
--- a/roundcubemail/plugins/markasjunk/junk_pas.png
+++ b/roundcubemail/plugins/markasjunk/skins/default/junk_pas.png