From d3346184f2a301964728ef667397ebea1bc02bbc Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Sat, 14 Feb 2009 23:27:42 +0000 Subject: use mcc icon if availlable (#44671) --- MandrivaUpdate | 2 +- NEWS | 1 + Rpmdrake/edit_urpm_sources.pm | 4 ++-- rpmdrake | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/MandrivaUpdate b/MandrivaUpdate index 680bc857..a2bb95fa 100755 --- a/MandrivaUpdate +++ b/MandrivaUpdate @@ -53,7 +53,7 @@ use Gtk2::SimpleList; importance => 7, ); -$ugtk2::wm_icon = "title-$MODE"; +$ugtk2::wm_icon = get_icon('MandrivaUpdate', "title-$MODE"); our $w; my $treeview_dialog_run = 0; diff --git a/NEWS b/NEWS index 3eda9058..bfe07866 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,6 @@ - fix crashing on uninstalling packages (#47751) - prevent crashing in URPM when using --env with relative paths +- use mcc icon if availlable (#44671) - edit-urpm-sources: o do not use the same shortcut for "Add a specific "media mirror" and "_Add a custom medium" menu entries (#46027) diff --git a/Rpmdrake/edit_urpm_sources.pm b/Rpmdrake/edit_urpm_sources.pm index 36766f34..b888c54f 100644 --- a/Rpmdrake/edit_urpm_sources.pm +++ b/Rpmdrake/edit_urpm_sources.pm @@ -1111,7 +1111,7 @@ sub mainwindow() { gtkpack_( gtknew('VBox', spacing => 5), 0, $menu, - ($0 =~ /rpm-edit-media|edit-urpm-sources/ ? (0, Gtk2::Banner->new('title-install', N("Configure media"))) : ()), + ($0 =~ /rpm-edit-media|edit-urpm-sources/ ? (0, Gtk2::Banner->new($ugtk2::wm_icon, N("Configure media"))) : ()), 1, gtkpack_( gtknew('HBox', spacing => 10), 1, gtknew('ScrolledWindow', child => $list_tv), @@ -1154,7 +1154,7 @@ sub mainwindow() { sub run() { - local $ugtk2::wm_icon = "title-install"; + local $ugtk2::wm_icon = get_icon('rpmdrake-mdk', 'title-install'); my $lock; { $urpm = fast_open_urpmi_db(); diff --git a/rpmdrake b/rpmdrake index 65d46195..e5937c64 100755 --- a/rpmdrake +++ b/rpmdrake @@ -47,7 +47,7 @@ use Rpmdrake::widgets; use feature 'state'; use Gtk2::Sexy; -$ugtk2::wm_icon = "title-$MODE"; +$ugtk2::wm_icon = get_icon('installremoverpm', "title-$MODE"); our $w; our $statusbar; -- cgit v1.2.1