From 40348a760c3b1d07924db2c7feefa14e2cc5bfae Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.com>
Date: Mon, 10 Sep 2007 10:09:10 +0000
Subject: do not hardcode icon extension and path

---
 lib/network/connection.pm                    | 2 +-
 lib/network/connection/cable.pm              | 2 +-
 lib/network/connection/cellular_bluetooth.pm | 2 +-
 lib/network/connection/cellular_card.pm      | 2 +-
 lib/network/connection/dvb.pm                | 2 +-
 lib/network/connection/ethernet.pm           | 2 +-
 lib/network/connection/isdn.pm               | 2 +-
 lib/network/connection/pots.pm               | 2 +-
 lib/network/connection/wireless.pm           | 2 +-
 lib/network/connection/xdsl.pm               | 2 +-
 lib/network/connection_manager.pm            | 4 ++--
 lib/network/signal_strength.pm               | 2 +-
 12 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'lib/network')

diff --git a/lib/network/connection.pm b/lib/network/connection.pm
index a641691..fbe29dc 100644
--- a/lib/network/connection.pm
+++ b/lib/network/connection.pm
@@ -25,7 +25,7 @@ Get the connection type icon path
 
 =cut
 
-sub get_type_icon() { '/usr/share/mcc/themes/default/drakconnect-mdk.png' }
+sub get_type_icon() { '/usr/share/mcc/themes/default/drakconnect-mdk' }
 
 =item get_devices()
 
diff --git a/lib/network/connection/cable.pm b/lib/network/connection/cable.pm
index e74ac6a..8d4fe07 100644
--- a/lib/network/connection/cable.pm
+++ b/lib/network/connection/cable.pm
@@ -12,7 +12,7 @@ use detect_devices;
 
 sub get_type_name() { N("Cable") }
 sub get_type_description() { N("Cable modem") }
-sub get_type_icon() { 'cablemodem-24.png' }
+sub get_type_icon() { 'cablemodem-24' }
 sub get_metric { 20 }
 
 sub handles_ifcfg {
diff --git a/lib/network/connection/cellular_bluetooth.pm b/lib/network/connection/cellular_bluetooth.pm
index 1457795..0b16ba1 100644
--- a/lib/network/connection/cellular_bluetooth.pm
+++ b/lib/network/connection/cellular_bluetooth.pm
@@ -9,7 +9,7 @@ my $rfcomm_dev_prefix = "/dev/rfcomm";
 
 sub get_type_name { N("Bluetooth") }
 sub get_type_description { N("Bluetooth Dial Up Networking") }
-sub get_type_icon { 'bluetooth-24.png' }
+sub get_type_icon { 'bluetooth-24' }
 sub get_devices { search_services('DUN') }
 sub get_metric { 45 }
 sub get_interface { "ppp0" }
diff --git a/lib/network/connection/cellular_card.pm b/lib/network/connection/cellular_card.pm
index 9132f49..6ed31b6 100644
--- a/lib/network/connection/cellular_card.pm
+++ b/lib/network/connection/cellular_card.pm
@@ -6,7 +6,7 @@ use strict;
 use common;
 
 sub get_type_name() { N("GPRS/Edge/3G") }
-sub get_type_icon() { 'cellular-24.png' }
+sub get_type_icon() { 'cellular-24' }
 sub get_devices() {
        require detect_devices;
        my @maybe_usbserial_modules = ('usbserial_generic', 'unknown');
diff --git a/lib/network/connection/dvb.pm b/lib/network/connection/dvb.pm
index 3364886..ec085b3 100644
--- a/lib/network/connection/dvb.pm
+++ b/lib/network/connection/dvb.pm
@@ -11,7 +11,7 @@ use modules;
 
 sub get_type_name() { N("DVB") }
 sub get_type_description() { N("Satellite (DVB)") }
-sub get_type_icon() { 'dvb-24.png' }
+sub get_type_icon() { 'dvb-24' }
 
 sub get_devices() {
     require detect_devices;
diff --git a/lib/network/connection/ethernet.pm b/lib/network/connection/ethernet.pm
index 39752f5..e7aff7c 100644
--- a/lib/network/connection/ethernet.pm
+++ b/lib/network/connection/ethernet.pm
@@ -8,7 +8,7 @@ use common;
 our @dhcp_clients = qw(dhclient dhcpcd pump dhcpxd);
 
 sub get_type_name() { N("Ethernet") }
-sub get_type_icon() { 'ethernet-24.png' }
+sub get_type_icon() { 'ethernet-24' }
 
 sub get_devices() {
     #require list_modules;
diff --git a/lib/network/connection/isdn.pm b/lib/network/connection/isdn.pm
index 4b85d1d..84c2d10 100644
--- a/lib/network/connection/isdn.pm
+++ b/lib/network/connection/isdn.pm
@@ -6,7 +6,7 @@ use strict;
 use common;
 
 sub get_type_name { N("ISDN") }
-sub get_type_icon { 'isdn-24.png' }
+sub get_type_icon { 'isdn-24' }
 
 sub get_devices {
     require modules;
diff --git a/lib/network/connection/pots.pm b/lib/network/connection/pots.pm
index be7bf9f..449d58d 100644
--- a/lib/network/connection/pots.pm
+++ b/lib/network/connection/pots.pm
@@ -15,7 +15,7 @@ sub get_type_description {
     #-PO: for example, in French, it can be translated as "RTC"
     N("Analog telephone modem (POTS)");
 }
-sub get_type_icon { 'potsmodem-24.png' }
+sub get_type_icon { 'potsmodem-24' }
 sub get_metric { 50 }
 
 sub handles_ifcfg {
diff --git a/lib/network/connection/wireless.pm b/lib/network/connection/wireless.pm
index 59f8747..fd0c82b 100644
--- a/lib/network/connection/wireless.pm
+++ b/lib/network/connection/wireless.pm
@@ -9,7 +9,7 @@ use strict;
 use common;
 
 sub get_type_name() { N("Wireless") }
-sub get_type_icon() { 'wireless-24.png' }
+sub get_type_icon() { 'wireless-24' }
 sub get_devices {
     my ($_class, %options) = @_;
     require detect_devices;
diff --git a/lib/network/connection/xdsl.pm b/lib/network/connection/xdsl.pm
index 337d4f7..f810ba5 100644
--- a/lib/network/connection/xdsl.pm
+++ b/lib/network/connection/xdsl.pm
@@ -6,7 +6,7 @@ use strict;
 use common;
 
 sub get_type_name() { N("DSL") }
-sub get_type_icon() { 'xdsl-24.png' }
+sub get_type_icon() { 'xdsl-24' }
 
 sub get_devices() {
     require detect_devices;
diff --git a/lib/network/connection_manager.pm b/lib/network/connection_manager.pm
index 83def2d..f5d539d 100644
--- a/lib/network/connection_manager.pm
+++ b/lib/network/connection_manager.pm
@@ -20,10 +20,10 @@ sub create_pixbufs() {
     {
         state => { map { $_ => gtkcreate_pixbuf($_) } qw(connected disconnected refresh) },
         link_level => { map {
-            $_ => gtkcreate_pixbuf('wifi-' . sprintf('%03d', $_) . '.png')->scale_simple(24, 24, 'hyper');
+            $_ => gtkcreate_pixbuf('wifi-' . sprintf('%03d', $_))->scale_simple(24, 24, 'hyper');
         } qw(20 40 60 80 100) },
         encryption => { map {
-            $_ => gtkcreate_pixbuf("encryption-$_-24.png");
+            $_ => gtkcreate_pixbuf("encryption-$_-24");
         } qw(open weak strong) },
     };
 }
diff --git a/lib/network/signal_strength.pm b/lib/network/signal_strength.pm
index 0fa891d..19e119c 100644
--- a/lib/network/signal_strength.pm
+++ b/lib/network/signal_strength.pm
@@ -8,7 +8,7 @@ my %pixbufs;
 sub get_strength_icon {
     my ($network) = @_;
     my $approx = 20 + min(80, int($network->{signal_strength}/20)*20);
-    return $pixbufs{$approx} ||= ugtk2::gtkcreate_pixbuf('wifi-' . sprintf('%03d', $approx) . '.png');
+    return $pixbufs{$approx} ||= ugtk2::gtkcreate_pixbuf('wifi-' . sprintf('%03d', $approx));
 }
 
 1;
-- 
cgit v1.2.1