aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2009-02-14 23:27:42 +0000
committerThierry Vignaud <tv@mandriva.org>2009-02-14 23:27:42 +0000
commitd3346184f2a301964728ef667397ebea1bc02bbc (patch)
tree0b7167fa35af7ceaf47c9d0b4d2035da3561c2e0
parentedd1a29323a3661839cf791484d325ff5133ac1a (diff)
downloadrpmdrake-d3346184f2a301964728ef667397ebea1bc02bbc.tar
rpmdrake-d3346184f2a301964728ef667397ebea1bc02bbc.tar.gz
rpmdrake-d3346184f2a301964728ef667397ebea1bc02bbc.tar.bz2
rpmdrake-d3346184f2a301964728ef667397ebea1bc02bbc.tar.xz
rpmdrake-d3346184f2a301964728ef667397ebea1bc02bbc.zip
use mcc icon if availlable (#44671)
-rwxr-xr-xMandrivaUpdate2
-rw-r--r--NEWS1
-rw-r--r--Rpmdrake/edit_urpm_sources.pm4
-rwxr-xr-xrpmdrake2
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;