Merge branch 'bug_531_fixed_not_visible_parental_control_padlock'
authorghost <andreas.monzner@multimedia-labs.de>
Wed, 6 Oct 2010 09:59:31 +0000 (11:59 +0200)
committerghost <andreas.monzner@multimedia-labs.de>
Wed, 6 Oct 2010 09:59:31 +0000 (11:59 +0200)
data/skin_default/Makefile.am
data/skin_default/icons/Makefile.am
data/skin_default/icons/lock.png
data/skin_default/icons/lockBouquet.png [moved from data/skin_default/lockBouquet.png with 100% similarity]
data/skin_default/icons/unlock.png [moved from data/skin_default/unlock.png with 100% similarity]
data/skin_default/icons/unlockBouquet.png [moved from data/skin_default/unlockBouquet.png with 100% similarity]
data/skin_default/lock.png [deleted file]

index 6038c2e..30b04f9 100755 (executable)
@@ -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 \
index c6cb269..b453aa7 100755 (executable)
@@ -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
 
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/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