summaryrefslogtreecommitdiffstats
path: root/kicker/kicker/ui
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-01-11 13:08:27 -0600
committerSlávek Banko <slavek.banko@axis.cz>2012-06-03 03:26:38 +0200
commit41b2f3397abc121c9fa8cec51406f7f05cd2c5f7 (patch)
treeb2be4a8de83db3845d24ed58b57bed48df4a49b9 /kicker/kicker/ui
parentd3571d15fa29f6dddd57db7f65a3fbdbedceee4d (diff)
downloadtdebase-41b2f3397abc121c9fa8cec51406f7f05cd2c5f7.tar.gz
tdebase-41b2f3397abc121c9fa8cec51406f7f05cd2c5f7.zip
Fix kickoff crashing and remove additional OpenSUSE branding
This closes Bug 508 (cherry picked from commit 6f32bfd96c038c8ddec90f6ab6e88629e709991f)
Diffstat (limited to 'kicker/kicker/ui')
-rw-r--r--kicker/kicker/ui/k_new_mnu.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp
index 513181a32..8526cd212 100644
--- a/kicker/kicker/ui/k_new_mnu.cpp
+++ b/kicker/kicker/ui/k_new_mnu.cpp
@@ -1700,8 +1700,6 @@ void KMenu::setOrientation(MenuOrientation orientation)
TQPixmap pix( 64, footer->height() );
TQPainter p( &pix );
p.fillRect( 0, 0, 64, footer->height(), m_branding->colorGroup().brush( TQColorGroup::Base ) );
- p.fillRect( 0, m_orientation == BottomUp ? footer->height() - 2 : 0,
- 64, 3, KNewButton::self()->borderColor() );
p.end();
footer->setPaletteBackgroundPixmap( pix );
}
@@ -3500,7 +3498,8 @@ void KMenu::updateMedia()
}
m_systemView->insertItem( iconName, userLabel.isEmpty() ? label : userLabel,
descr, "system:/media/" + name, nId++, -1 );
-
+ ++it;
+ ++it;
++it; // skip separator
}
}