do not hardcode icon extension and path

5 files changed, 12 insertions, 12 deletions

diff --git a/bin/drakconnect b/bin/drakconnect
index ece74c5..8318bcc 100755
--- a/bin/drakconnect
+++ b/bin/drakconnect
@@ -59,7 +59,7 @@ network::network::read_net_conf($net);
 my $modules_conf = modules::any_conf->read;
 
 $::Wizard_title = N("Network & Internet Configuration");
-$::Wizard_pix_up = "drakconnect.png";
+$::Wizard_pix_up = "drakconnect";
 
 local $_ = join '', @ARGV;
 /--skip-wizard/ and manage();
@@ -710,7 +710,7 @@ sub del_intf() {
     require wizards;
     my $wiz = wizards->new(
       {
-       defaultimage => "drakconnect.png",
+       defaultimage => "drakconnect",
        name => N("Remove a network interface"),
        pages => {
                  welcome => {
@@ -786,7 +786,7 @@ sub update_list {
     }
     foreach my $interface (@new_intf) {
         my ($ip, $state) = get_intf_ip($interface);
-        $tree_model->set($intf{$interface}, map_index { $::i => $_ } (gtkcreate_pixbuf("eth_card_mini2.png"), $interface, $ip , $net->{ifcfg}{$interface}{BOOTPROTO}, $new_intf{$interface}, $state));
+        $tree_model->set($intf{$interface}, map_index { $::i => $_ } (gtkcreate_pixbuf("eth_card_mini2"), $interface, $ip , $net->{ifcfg}{$interface}{BOOTPROTO}, $new_intf{$interface}, $state));
     }
     foreach my $i (difference2([ keys %intf ], \@new_intf)) {
         $tree_model->remove($intf{$i});
diff --git a/bin/drakgw b/bin/drakgw
index 965665c..85c9d03 100755
--- a/bin/drakgw
+++ b/bin/drakgw
@@ -67,7 +67,7 @@ my $dhcpd_conf = network::dhcpd::read_dhcpd_conf();
 require wizards;
 my $wiz = wizards->new(
   {
-   defaultimage => "drakgw.png",
+   defaultimage => "drakgw",
    name => N("Internet Connection Sharing"),
    pages => {
 	     welcome =>
diff --git a/bin/drakids b/bin/drakids
index 933a94e..dd3259e 100644
--- a/bin/drakids
+++ b/bin/drakids
@@ -37,7 +37,7 @@ my $services_log = create_service_list('status');
 my $allowed_services = create_service_list();
 my $blocked_services = create_service_list();
 
-$ugtk2::wm_icon = "/usr/lib/libDrakX/icons/drakfirewall.png";
+$ugtk2::wm_icon = "drakfirewall";
 my $w = ugtk2->new(N("Interactive Firewall"));
 
 my $ifw;
diff --git a/bin/drakvpn-old b/bin/drakvpn-old
index b658325..de096a2 100755
--- a/bin/drakvpn-old
+++ b/bin/drakvpn-old
@@ -42,7 +42,7 @@ $::isInstall and die "Not supported during install.\n";
 
 local $_ = join '', @ARGV;
 
-$::Wizard_pix_up = "drakvpn.png";
+$::Wizard_pix_up = "drakvpn";
 $ugtk2::wm_icon = "drakvpn";
 
 my $direct = /-direct/;
diff --git a/bin/net_applet b/bin/net_applet
index 5e8a348..a1055fb 100644
--- a/bin/net_applet
+++ b/bin/net_applet
@@ -41,14 +41,14 @@ my $watched_interface;
 
 my %pixbufs =
   (
-      firewall => gtknew('Pixbuf', file => 'drakfirewall.png'),
-      firewall_icon => gtknew('Pixbuf', file => 'drakfirewall.png')->scale_simple(24, 24, 'hyper'),
+      firewall => gtknew('Pixbuf', file => 'drakfirewall'),
+      firewall_icon => gtknew('Pixbuf', file => 'drakfirewall')->scale_simple(24, 24, 'hyper'),
       state => { map { $_ => gtknew('Pixbuf', file => $_) } qw(connected disconnected) },
       link_level => { map {
-          $_ => gtknew('Pixbuf', file => 'wifi-' . sprintf('%03d', $_) . '.png')->scale_simple(24, 24, 'hyper');
+          $_ => gtknew('Pixbuf', file => 'wifi-' . sprintf('%03d', $_))->scale_simple(24, 24, 'hyper');
       } qw(20 40 60 80 100) },
       encryption => { map {
-          $_ => gtknew('Pixbuf', file => "encryption-$_-24.png");
+          $_ => gtknew('Pixbuf', file => "encryption-$_-24");
       } qw(open weak strong) },
   );
 my %wireless_networks;
@@ -563,7 +563,7 @@ sub ask_attack_verdict {
     my ($attack) = @_;
 
     my $w = ugtk2->new(N("Interactive Firewall: intrusion detected"),
-                       icon => "drakfirewall.png");
+                       icon => "drakfirewall");
     my ($blacklist, $whitelist, $ignore, $auto);
 
     my $update_automatic_mode = sub { $auto->get_active and $interactive_cb->set_active(1) };
@@ -648,7 +648,7 @@ sub handle_ifw_listen {
 sub ask_listen_verdict {
     my ($listen) = @_;
 
-    my $w = ugtk2->new(N("Interactive Firewall: new service"), icon => "drakfirewall.png");
+    my $w = ugtk2->new(N("Interactive Firewall: new service"), icon => "drakfirewall");
     my $set_verdict = sub {
         $bubble_queue->process_next;
     };