From f59f29576c158faef6c0b3db7005598d1c49ea46 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tvignaud@mandriva.org>
Date: Wed, 17 Mar 2004 09:50:33 +0000
Subject: use new $ugtk2::wm_icon for x11 icon

---
 perl-install/standalone/drakconnect | 3 +--
 perl-install/standalone/drakfont    | 4 ++--
 perl-install/standalone/drakups     | 2 +-
 perl-install/standalone/harddrake2  | 2 +-
 perl-install/standalone/logdrake    | 2 +-
 5 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'perl-install/standalone')

diff --git a/perl-install/standalone/drakconnect b/perl-install/standalone/drakconnect
index 97bbaad0c..3e83aea79 100755
--- a/perl-install/standalone/drakconnect
+++ b/perl-install/standalone/drakconnect
@@ -45,6 +45,7 @@ use POSIX ":sys_wait_h";
 my ($netcnx, $netc, $intf)  = ({}, {}, {});
 #my @conx_type = ('modem', 'isdn_internal', 'isdn_external', 'adsl', 'cable', 'lan');
 
+$ugtk2::wm_icon = "drakconnect";
 my $in = 'interactive'->vnew('su');
 if ($in->isa('interactive::gtk')) {
     require ugtk2;
@@ -79,7 +80,6 @@ unless ($::isEmbedded) {
     $window1->{rwindow}->set_position('center');
     $window1->{rwindow}->set_title(N("Network configuration (%d adapters)", scalar @all_cards));
     $window1->{rwindow}->set_size_request(-1, -1);
-    $window1->{rwindow}->set_icon(gtkcreate_pixbuf("drakconnect"));
 }
 $window1->{rwindow}->set_border_width(10);
 
@@ -195,7 +195,6 @@ sub manage {
     unless ($::isEmbedded) {
         $window->{rwindow}->set_position('center');
         $window->{rwindow}->set_title(N("Manage connections")); # translation availlable in mcc domain => we need merging
-        $window->{rwindow}->set_icon(gtkcreate_pixbuf("drakconnect"));
     }
 
     my $notebook = Gtk2::Notebook->new;
diff --git a/perl-install/standalone/drakfont b/perl-install/standalone/drakfont
index e0a77320a..c34c797f0 100755
--- a/perl-install/standalone/drakfont
+++ b/perl-install/standalone/drakfont
@@ -91,6 +91,8 @@ use common;
 
 require_root_capability();
 
+$ugtk2::wm_icon = "drakfont";
+
 #   global variables needed by each functions
 my $xlsfonts = 0;
 my $windows  = 0;
@@ -470,11 +472,9 @@ sub interactive_mode() {
     $window1 = ugtk2->new('drakfont');
     $window1->{rwindow}->signal_connect(delete_event => sub { ugtk2->exit(0) });
     if ($::isEmbedded) {
-        $::Plug->set_icon(gtkcreate_pixbuf("drakfont"));
     } else {
         $window1->{rwindow}->set_position('center');
         $window1->{rwindow}->set_title(N("DrakFont"));
-        $window1->{window}->set_icon(gtkcreate_pixbuf("drakfont"));
     }
     
     my $button = {};
diff --git a/perl-install/standalone/drakups b/perl-install/standalone/drakups
index 7f8c7a83b..53c4743c7 100755
--- a/perl-install/standalone/drakups
+++ b/perl-install/standalone/drakups
@@ -293,12 +293,12 @@ my @pages = (
 #$in = 'interactive'->vnew('su'); # require_root_capability();
 $in = 'interactive'->vnew;
 
+$ugtk2::wm_icon = "drakups";
 $w = ugtk2->new(N("DrakUPS"));
 if (!$::isEmbedded) {
     $::main_window = $w->{rwindow};
     $w->{window}->set_size_request(500, 550);
     $w->{rwindow}->set_title(N("DrakUPS"));
-    $w->{rwindow}->set_icon(gtkcreate_pixbuf("drakups"));
 }
 
 #------------------------------------------------------------------
diff --git a/perl-install/standalone/harddrake2 b/perl-install/standalone/harddrake2
index 6e0c0dbe9..bd233db79 100755
--- a/perl-install/standalone/harddrake2
+++ b/perl-install/standalone/harddrake2
@@ -128,6 +128,7 @@ my @menu_items =
      ]
     );
 
+$ugtk2::wm_icon = "harddrake";
 $in = 'interactive'->vnew('su'); #require_root_capability();
 
 my $wait = $in->wait_message(N("Please wait"), N("Detection in progress"));
@@ -148,7 +149,6 @@ if ($::isEmbedded) {
     $::main_window = $w->{rwindow};
     ($menubar, $factory) = create_factory_menu($w->{rwindow}, @menu_items);
     $w->{window}->set_size_request(805, 550);
-    $w->{window}->set_icon(gtkcreate_pixbuf("harddrake"));
 }
 
 my $tree_model = Gtk2::TreeStore->new("Gtk2::Gdk::Pixbuf", "Glib::String", "Glib::Int");
diff --git a/perl-install/standalone/logdrake b/perl-install/standalone/logdrake
index 64f4f1562..a78c7000e 100755
--- a/perl-install/standalone/logdrake
+++ b/perl-install/standalone/logdrake
@@ -47,13 +47,13 @@ my $isTail = 1 if $isFile;
 $| = 1 if $isTail;
 my $h = chomp_(`hostname -s`);
 
+$ugtk2::wm_icon = "logdrake";
 my $explain_title = N("Mandrake Tools Logs");
 my $my_win = ugtk2->new($isExplain ? $explain_title : N("Logdrake"));
 
 unless ($::isEmbedded) {
     $my_win->{window}->set_border_width(5);
     #$my_win->{window}->set_default_size(540,460);
-    $my_win->{window}->set_icon(gtkcreate_pixbuf("logdrake"));
 }
 $my_win->{window}->signal_connect(delete_event => \&quit);
 
-- 
cgit v1.2.1