Merge branch 'bug_531_fixed_not_visible_parental_control_padlock'

diff --git a/data/skin_default/Makefile.am b/data/skin_default/Makefile.am
index 6038c2e..30b04f9 100755 (executable)
--- a/data/skin_default/Makefile.am
+++ b/data/skin_default/Makefile.am
@@ -33,8 +33,6 @@ dist_install_DATA = \
        expanded-plugins.png \
        info-bg_mp.png \
        info-bg.png \
-       lock.png \
-       lockBouquet.png \
        mediaplayer_bg.png \
        mute.png \
        nim_active.png \
@@ -55,8 +53,6 @@ dist_install_DATA = \
        timeline-now.png \
        timeline.png \
        unhandled-key.png \
-       unlock.png \
-       unlockBouquet.png \
        verticalline-plugins.png \
        vkey_backspace.png \
        vkey_bg.png \

diff --git a/data/skin_default/icons/Makefile.am b/data/skin_default/icons/Makefile.am
index c6cb269..b453aa7 100755 (executable)
--- a/data/skin_default/icons/Makefile.am
+++ b/data/skin_default/icons/Makefile.am
@@ -40,6 +40,7 @@ dist_install_DATA = \
        lock_off.png \
        lock_on.png \
        lock.png \
+       lockBouquet.png \
        marker.png \
        mp_buttons.png \
        network_wired.png \
@@ -61,5 +62,7 @@ dist_install_DATA = \
        scan-c.png \
        scan-s.png \
        scan-t.png \
-       selectioncross.png
+       selectioncross.png \
+       unlock.png \
+       unlockBouquet.png
 

diff --git a/data/skin_default/icons/lock.png b/data/skin_default/icons/lock.png
index cfee1ba..d0ae7f6 100644 (file)
Binary files a/data/skin_default/icons/lock.png and b/data/skin_default/icons/lock.png differ

diff --git a/data/skin_default/icons/lockBouquet.png b/data/skin_default/icons/lockBouquet.png
new file mode 100644 (file)
index 0000000..d503dd2
Binary files /dev/null and b/data/skin_default/icons/lockBouquet.png differ

diff --git a/data/skin_default/icons/unlock.png b/data/skin_default/icons/unlock.png
new file mode 100644 (file)
index 0000000..bd4486e
Binary files /dev/null and b/data/skin_default/icons/unlock.png differ

diff --git a/data/skin_default/icons/unlockBouquet.png b/data/skin_default/icons/unlockBouquet.png
new file mode 100644 (file)
index 0000000..c5d146d
Binary files /dev/null and b/data/skin_default/icons/unlockBouquet.png differ

diff --git a/data/skin_default/lock.png b/data/skin_default/lock.png
deleted file mode 100644 (file)
index d0ae7f6..0000000
Binary files a/data/skin_default/lock.png and /dev/null differ

diff --git a/data/skin_default/lockBouquet.png b/data/skin_default/lockBouquet.png
deleted file mode 100644 (file)
index d503dd2..0000000
Binary files a/data/skin_default/lockBouquet.png and /dev/null differ

diff --git a/data/skin_default/unlock.png b/data/skin_default/unlock.png
deleted file mode 100644 (file)
index bd4486e..0000000
Binary files a/data/skin_default/unlock.png and /dev/null differ

diff --git a/data/skin_default/unlockBouquet.png b/data/skin_default/unlockBouquet.png
deleted file mode 100644 (file)
index c5d146d..0000000
Binary files a/data/skin_default/unlockBouquet.png and /dev/null differ