[Pkg-kde-commits] rev 2195 - trunk/packages/kdebase/debian/patches
Christopher Martin
chrsmrtn at costa.debian.org
Fri Nov 11 15:59:52 UTC 2005
Author: chrsmrtn
Date: 2005-11-11 15:59:51 +0000 (Fri, 11 Nov 2005)
New Revision: 2195
Modified:
trunk/packages/kdebase/debian/patches/10_kdmrc_defaults.diff
trunk/packages/kdebase/debian/patches/11_genkdmconf.diff
trunk/packages/kdebase/debian/patches/14_kdm_no_custom.diff
trunk/packages/kdebase/debian/patches/18_default_fonts.diff
trunk/packages/kdebase/debian/patches/19_kcontrol_only_in_kde.diff
trunk/packages/kdebase/debian/patches/20_applications_menu_move.diff
trunk/packages/kdebase/debian/patches/22_default_backgrounds.diff
trunk/packages/kdebase/debian/patches/23_startkde_kpersonalizer.diff
trunk/packages/kdebase/debian/patches/24_knotify_arts.diff
trunk/packages/kdebase/debian/patches/25_khelp_htdig.diff
trunk/packages/kdebase/debian/patches/28_kdebase_rubberband.diff
Log:
Re-sync patches for kdebase 3.5.0-rc1.
Modified: trunk/packages/kdebase/debian/patches/10_kdmrc_defaults.diff
===================================================================
--- trunk/packages/kdebase/debian/patches/10_kdmrc_defaults.diff 2005-11-11 15:58:53 UTC (rev 2194)
+++ trunk/packages/kdebase/debian/patches/10_kdmrc_defaults.diff 2005-11-11 15:59:51 UTC (rev 2195)
@@ -1,6 +1,6 @@
--- kde.orig/kcontrol/kdm/kdm-appear.cpp
+++ kde.patched/kcontrol/kdm/kdm-appear.cpp
-@@ -484,7 +484,7 @@
+@@ -440,7 +440,7 @@
config->setGroup("X-*-Greeter");
// Read the greeting string
@@ -9,7 +9,7 @@
// Regular logo or clock
QString logoArea = config->readEntry("LogoArea", "Logo" );
-@@ -533,7 +533,7 @@
+@@ -483,7 +483,7 @@
void KDMAppearanceWidget::defaults()
{
@@ -20,7 +20,7 @@
setLogo( "" );
--- kde.orig/kdm/config.def
+++ kde.patched/kdm/config.def
-@@ -1874,10 +1874,10 @@
+@@ -1921,10 +1921,10 @@
Key: SessionsDirs
Type: list
@@ -33,7 +33,7 @@
Comment:
The directories containing session type definitions in .desktop format.
Description:
-@@ -1901,7 +1901,7 @@
+@@ -1948,7 +1948,7 @@
Key: UseSessReg
Type: bool
@@ -42,7 +42,7 @@
User: core
Instance: #*/!
Comment:
-@@ -1997,9 +1997,9 @@
+@@ -2044,9 +2044,9 @@
Key: GreetString
Type: string
@@ -54,7 +54,7 @@
Comment:
The headline in the greeter. The following character pairs are replaced:
- %d -> current display
-@@ -2434,7 +2434,6 @@
+@@ -2482,7 +2482,6 @@
Default: 0
User: greeter
Instance: #*/
Modified: trunk/packages/kdebase/debian/patches/11_genkdmconf.diff
===================================================================
--- trunk/packages/kdebase/debian/patches/11_genkdmconf.diff 2005-11-11 15:58:53 UTC (rev 2194)
+++ trunk/packages/kdebase/debian/patches/11_genkdmconf.diff 2005-11-11 15:59:51 UTC (rev 2195)
@@ -18,7 +18,7 @@
"\n"
"#\n"
"# If you'd prefer to configure the set of hosts each terminal sees,\n"
-@@ -555,34 +555,25 @@
+@@ -555,35 +555,25 @@
"#! /bin/sh\n"
"# Xstartup - run as root before session starts\n"
"\n"
@@ -50,7 +50,8 @@
-" -x " KDMCONF "/Xservers"
-# endif
-#endif /* _AIX */
--" $USER\n";
+-" $USER\n"
+-"\n# NOTE: The session is aborted if the last command returns non-zero.\n";
+"if [ -e /etc/nologin ]; then\n"
+" # always display the nologin message, if possible\n"
+" if [ -s /etc/nologin ] && which xmessage > /dev/null 2>&1; then\n"
@@ -71,7 +72,7 @@
static const char def_reset[] =
"#! /bin/sh\n"
-@@ -598,12 +589,13 @@
+@@ -599,12 +589,13 @@
"#devname=`echo $DISPLAY | cut -c1-8`\n"
"#exec sessreg -d -l xdm/$devname -h \"`echo $DISPLAY | cut -d: -f1`\""
#else
@@ -90,7 +91,7 @@
static const char def_session[] =
"#! /bin/sh\n"
-@@ -635,6 +627,7 @@
+@@ -636,6 +627,7 @@
" [ -f $zhome/.zprofile ] && . $zhome/.zprofile\n"
" [ -f $zdir/zlogin ] && . $zdir/zlogin\n"
" [ -f $zhome/.zlogin ] && . $zhome/.zlogin\n"
@@ -98,7 +99,7 @@
" ;;\n"
" */csh|*/tcsh)\n"
" # [t]cshrc is always sourced automatically.\n"
-@@ -646,28 +639,8 @@
+@@ -647,28 +639,8 @@
" [ -f $HOME/.profile ] && . $HOME/.profile\n"
" ;;\n"
"esac\n"
@@ -129,7 +130,7 @@
static const char def_background[] =
"[Desktop0]\n"
-@@ -942,29 +915,6 @@
+@@ -943,29 +915,6 @@
if (maxTTY)
return;
Modified: trunk/packages/kdebase/debian/patches/14_kdm_no_custom.diff
===================================================================
--- trunk/packages/kdebase/debian/patches/14_kdm_no_custom.diff 2005-11-11 15:58:53 UTC (rev 2194)
+++ trunk/packages/kdebase/debian/patches/14_kdm_no_custom.diff 2005-11-11 15:59:51 UTC (rev 2195)
@@ -1,6 +1,6 @@
--- kdebase.orig/kdm/kfrontend/kgreeter.cpp
+++ kdebase/kdm/kfrontend/kgreeter.cpp
-@@ -318,7 +318,6 @@
+@@ -324,7 +324,6 @@
KGreeter::putSession( const QString &type, const QString &name, bool hid, const char *exe )
{
int prio = exe ? (!strcmp( exe, "default" ) ? 0 :
@@ -8,7 +8,7 @@
!strcmp( exe, "failsafe" ) ? 3 : 2) : 2;
for (uint i = 0; i < sessionTypes.size(); i++)
if (sessionTypes[i].type == type) {
-@@ -346,7 +345,6 @@
+@@ -352,7 +351,6 @@
}
}
putSession( "default", i18n("Default"), false, "default" );
Modified: trunk/packages/kdebase/debian/patches/18_default_fonts.diff
===================================================================
--- trunk/packages/kdebase/debian/patches/18_default_fonts.diff 2005-11-11 15:58:53 UTC (rev 2194)
+++ trunk/packages/kdebase/debian/patches/18_default_fonts.diff 2005-11-11 15:59:51 UTC (rev 2195)
@@ -1,6 +1,6 @@
--- kde.orig/kcontrol/fonts/fonts.cpp
+++ kde.patched/kcontrol/fonts/fonts.cpp
-@@ -401,7 +401,7 @@
+@@ -385,7 +385,7 @@
void FontAASettings::defaults()
{
@@ -9,42 +9,22 @@
excludeFrom->setValue(8.0);
excludeTo->setValue(15.0);
useSubPixel->setChecked(false);
-@@ -524,17 +524,17 @@
-
- // Keep in sync with kdelibs/kdecore/kglobalsettings.cpp
-
-- QFont f0("helvetica", 12);
-- QFont f1("courier", 12);
-- QFont f2("helvetica", 10);
-- QFont f3("helvetica", 12, QFont::Bold);
-- QFont f4("helvetica", 11);
-+ QFont f0("Sans Serif", 10);
-+ QFont f1("Monospace", 10);
-+ QFont f2("Sans Serif", 10);
+@@ -511,13 +511,13 @@
+ QFont f0("Sans Serif", 10);
+ QFont f1("Monospace", 10);
+ QFont f2("Sans Serif", 10);
+- QFont f3("Sans Serif", 9, QFont::Bold);
+ QFont f3("Sans Serif", 10, QFont::Bold);
-+ QFont f4("Sans Serif", 10);
+ QFont f4("Sans Serif", 10);
-- f0.setPointSize(12);
-- f1.setPointSize(12);
-+ f0.setPointSize(10);
-+ f1.setPointSize(10);
+ f0.setPointSize(10);
+ f1.setPointSize(10);
f2.setPointSize(10);
-- f3.setPointSize(12);
-- f4.setPointSize(11);
+- f3.setPointSize(9);
+ f3.setPointSize(10);
-+ f4.setPointSize(10);
+ f4.setPointSize(10);
defaultFontList << f0 << f1 << f2 << f0 << f3 << f4 << f0;
-
-@@ -656,7 +656,7 @@
- for ( int i = 0; i < (int) fontUseList.count(); i++ )
- fontUseList.at( i )->setDefault();
-
-- useAA = false;
-+ useAA = true;
- cbAA->setChecked(useAA);
- aaSettings->defaults();
- emit changed(true);
--- kde.orig/kcontrol/krdb/themes/Plastik/Plastik.xml
+++ kde.patched/kcontrol/krdb/themes/Plastik/Plastik.xml
@@ -113,12 +113,12 @@
@@ -68,14 +48,11 @@
</ktheme>
--- kde.orig/kcontrol/kdm/kdm-font.cpp
+++ kde.patched/kcontrol/kdm/kdm-font.cpp
-@@ -90,9 +90,9 @@
-
- void KDMFontWidget::set_def()
+@@ -92,7 +92,7 @@
{
-- stdFontChooser->setFont(QFont("helvetica", 12));
-+ stdFontChooser->setFont(QFont("Sans Serif", 10));
- failFontChooser->setFont(QFont("helvetica", 12, QFont::Bold));
-- greetingFontChooser->setFont(QFont("charter", 24));
+ stdFontChooser->setFont(QFont("Sans Serif", 10));
+ failFontChooser->setFont(QFont("Sans Serif", 10, QFont::Bold));
+- greetingFontChooser->setFont(QFont("Serif", 20));
+ greetingFontChooser->setFont(QFont("Sans Serif", 22));
}
@@ -89,53 +66,9 @@
}
#include "kdm-font.moc"
---- kde.orig/kpersonalizer/keyecandypage.cpp
-+++ kde.patched/kpersonalizer/keyecandypage.cpp
-@@ -594,20 +594,9 @@
- void KEyeCandyPage::enableAntialiasingFonts(bool enable, bool reset){
- if (!reset){
- if ( ( (sys->isXfromXFreeInc() && (sys->getXRelease() > 40000000)) || sys->isXfromXOrg() )
-- && sys->getRenderSupport()
-- && (*userFonts.at(1)).contains("elvetica")) {
-+ && sys->getRenderSupport() ) {
- QSettings().writeEntry("/qt/useXft", enable);
- QSettings().writeEntry("/qt/enableXft", enable);
-- if (enable) {
-- KGlobal::config()->setGroup("General");
-- KGlobal::config()->writeEntry("fixed", sys->getFixedWidthFont().toString(), true, true);
-- KGlobal::config()->writeEntry("font", sys->getNormalFont().toString(), true, true);
-- KGlobal::config()->writeEntry("menuFont", sys->getNormalFont().toString(), true, true);
-- KGlobal::config()->writeEntry("taskbarFont", sys->getSmallFont().toString(), true, true);
-- KGlobal::config()->writeEntry("toolBarFont", sys->getNormalFont().toString(), true, true);
-- KGlobal::config()->setGroup("WM");
-- KGlobal::config()->writeEntry("activeFont", sys->getBoldFont().toString(), true, true);
-- }
- }
- } else {
- QSettings().writeEntry("/qt/useXft", b_useXft);
-@@ -717,13 +706,13 @@
- b_useXft=QSettings().readBoolEntry("/qt/useXft");
- b_enableXft=QSettings().readBoolEntry("/qt/enableXft");
- KGlobal::config()->setGroup("General");
-- userFonts.append(KGlobal::config()->readEntry("fixed", "courier,10,-1,5,50,0,0,0,0,0"));
-- userFonts.append(KGlobal::config()->readEntry("font", "helvetica,12,-1,5,50,0,0,0,0,0"));
-- userFonts.append(KGlobal::config()->readEntry("menuFont", "helvetica,12,-1,5,50,0,0,0,0,0"));
-- userFonts.append(KGlobal::config()->readEntry("taskbarFont", "helvetica,11,-1,5,50,0,0,0,0,0"));
-- userFonts.append(KGlobal::config()->readEntry("toolBarFont", "helvetica,12,-1,5,50,0,0,0,0,0"));
-+ userFonts.append(KGlobal::config()->readEntry("fixed", "Monospace,10,-1,5,50,0,0,0,0,0"));
-+ userFonts.append(KGlobal::config()->readEntry("font", "Sans Serif,10,-1,5,50,0,0,0,0,0"));
-+ userFonts.append(KGlobal::config()->readEntry("menuFont", "Sans Serif,10,-1,5,50,0,0,0,0,0"));
-+ userFonts.append(KGlobal::config()->readEntry("taskbarFont", "Sans Serif,10,-1,5,50,0,0,0,0,0"));
-+ userFonts.append(KGlobal::config()->readEntry("toolBarFont", "Sans Serif,10,-1,5,50,0,0,0,0,0"));
- KGlobal::config()->setGroup("WM");
-- userFonts.append(KGlobal::config()->readEntry("activeFont", "helvetica,12,-1,5,75,0,0,0,0,0"));
-+ userFonts.append(KGlobal::config()->readEntry("activeFont", "Sans Serif,10,-1,5,75,0,0,0,0,0"));
-
- KGlobal::config()->setGroup("PanelIcons");
- st_UserGamma.EffectPanel=KGlobal::config()->readEntry("ActiveEffect", "none");
--- kde.orig/kdm/config.def
+++ kde.patched/kdm/config.def
-@@ -2049,29 +2049,29 @@
+@@ -2096,19 +2096,19 @@
# This needs to come _in front_ of the font settings to be effective!
Key: AntiAliasing
Type: bool
@@ -150,24 +83,12 @@
Key: GreetFont
Type: string
--Default: "charter,24,5,0,50,0"
+-Default: "Serif,20,5,0,50,0"
+Default: "Sans Serif,22,5,0,50,0"
- CDefault: "charter,24,bold"
+ CDefault: "Serif,20,bold"
User: greeter:font
--Instance: #*/"charter,20,5,0,50,0"
+-Instance: #*/"Serif,20,5,0,50,0"
+Instance: #*/"Sans Serif,22,5,0,50,0"
Comment: &
Description:
The font for the greeter headline.
-
- Key: StdFont
- Type: string
--Default: "helvetica,12,5,0,50,0"
-+Default: "Sans Serif,10,5,0,50,0"
- CDefault: "helvetica,12"
- User: greeter(normalFont):font
--Instance: #*/"helvetica,10,5,0,50,0"
-+Instance: #*/"Sans Serif,10,5,0,50,0"
- Comment: &
- Description:
- The normal font used in the greeter.
Modified: trunk/packages/kdebase/debian/patches/19_kcontrol_only_in_kde.diff
===================================================================
--- trunk/packages/kdebase/debian/patches/19_kcontrol_only_in_kde.diff 2005-11-11 15:58:53 UTC (rev 2194)
+++ trunk/packages/kdebase/debian/patches/19_kcontrol_only_in_kde.diff 2005-11-11 15:59:51 UTC (rev 2195)
@@ -1,13 +1,13 @@
--- kde.orig/kcontrol/kcontrol/KControl.desktop
+++ kde.patched/kcontrol/kcontrol/KControl.desktop
-@@ -83,3 +83,4 @@
+@@ -86,3 +86,4 @@
X-DCOP-ServiceType=Unique
Categories=Qt;KDE;Core;
+OnlyShowIn=KDE;
--- kde.orig/kcontrol/kcontrol/kinfocenter.desktop
+++ kde.patched/kcontrol/kcontrol/kinfocenter.desktop
-@@ -57,3 +57,4 @@
+@@ -82,3 +82,4 @@
X-DCOP-ServiceType=Unique
Categories=Qt;KDE;System;
Modified: trunk/packages/kdebase/debian/patches/20_applications_menu_move.diff
===================================================================
--- trunk/packages/kdebase/debian/patches/20_applications_menu_move.diff 2005-11-11 15:58:53 UTC (rev 2194)
+++ trunk/packages/kdebase/debian/patches/20_applications_menu_move.diff 2005-11-11 15:59:51 UTC (rev 2195)
@@ -11,7 +11,7 @@
kde-main.directory \
--- kde.orig/doc/userguide/kde-for-admins.docbook
+++ kde.patched/doc/userguide/kde-for-admins.docbook
-@@ -1614,7 +1614,7 @@
+@@ -1650,7 +1650,7 @@
</para>
<informalexample>
@@ -20,7 +20,7 @@
<programlisting>
<markup>
<Menu>
-@@ -1688,7 +1688,7 @@
+@@ -1724,7 +1724,7 @@
information, see <ulink url="http://www.freedesktop.org/Standards/basedir-spec">http://www.freedesktop.org/Standards/basedir-spec</ulink></para>
<informalexample>
@@ -29,7 +29,7 @@
<programlisting>
<markup>
<Menu>
-@@ -1740,7 +1740,7 @@
+@@ -1776,7 +1776,7 @@
<title>Essential Menus</title>
<para><filename
Modified: trunk/packages/kdebase/debian/patches/22_default_backgrounds.diff
===================================================================
--- trunk/packages/kdebase/debian/patches/22_default_backgrounds.diff 2005-11-11 15:58:53 UTC (rev 2194)
+++ trunk/packages/kdebase/debian/patches/22_default_backgrounds.diff 2005-11-11 15:59:51 UTC (rev 2195)
@@ -28,7 +28,7 @@
kdesktopconf->writeEntry("WallpaperMode", "Scaled");
//here we change the kdesktop font color to white as it fits better
// to the KDE34png.png gray background
-@@ -697,7 +697,7 @@
+@@ -689,7 +689,7 @@
st_UserWallpaper.MultiWallpaperMode = kdesktopconf->readEntry("MultiWallpaperMode", "NoMulti");
st_UserWallpaper.WallpaperMode = kdesktopconf->readEntry("WallpaperMode", "Scaled");
st_UserWallpaper.Wallpaper = kdesktopconf->readPathEntry("Wallpaper", "NoWallpaper");
Modified: trunk/packages/kdebase/debian/patches/23_startkde_kpersonalizer.diff
===================================================================
--- trunk/packages/kdebase/debian/patches/23_startkde_kpersonalizer.diff 2005-11-11 15:58:53 UTC (rev 2194)
+++ trunk/packages/kdebase/debian/patches/23_startkde_kpersonalizer.diff 2005-11-11 15:59:51 UTC (rev 2195)
@@ -1,9 +1,9 @@
--- kde.orig/startkde
+++ kde.patched/startkde
-@@ -181,17 +181,21 @@
+@@ -259,17 +259,21 @@
# run KPersonalizer before the session, if this is the first login
- if kreadconfig --file kpersonalizerrc --group General --key FirstLogin --default true --type bool; then
+ if test "$kpersonalizerrc_general_firstlogin" = "true"; then
- # start only dcopserver, don't start whole kdeinit (takes too long)
- echo 'startkde: Running kpersonalizer...' 1>&2
- dcopserver
Modified: trunk/packages/kdebase/debian/patches/24_knotify_arts.diff
===================================================================
--- trunk/packages/kdebase/debian/patches/24_knotify_arts.diff 2005-11-11 15:58:53 UTC (rev 2194)
+++ trunk/packages/kdebase/debian/patches/24_knotify_arts.diff 2005-11-11 15:59:51 UTC (rev 2195)
@@ -1,6 +1,6 @@
--- kde.orig/kcontrol/arts/arts.cpp
+++ kde.patched/kcontrol/arts/arts.cpp
-@@ -383,6 +383,12 @@
+@@ -385,6 +385,12 @@
delete midiConfig;
Modified: trunk/packages/kdebase/debian/patches/25_khelp_htdig.diff
===================================================================
--- trunk/packages/kdebase/debian/patches/25_khelp_htdig.diff 2005-11-11 15:58:53 UTC (rev 2194)
+++ trunk/packages/kdebase/debian/patches/25_khelp_htdig.diff 2005-11-11 15:59:51 UTC (rev 2195)
@@ -1,9 +1,9 @@
---- kde.orig/khelpcenter/searchhandlers/khc_docbookdig.pl
-+++ kde.patched/khelpcenter/searchhandlers/khc_docbookdig.pl
+--- kde.orig/khelpcenter/searchhandlers/khc_docbookdig.pl.in
++++ kde.patched/khelpcenter/searchhandlers/khc_docbookdig.pl.in
@@ -29,7 +29,9 @@
my $htdigdata = "/srv/www/htdig/common/";
my $htdigbin = "/usr/bin";
- my $kdeprefix = `kde-config --prefix`;
+ my $kdeprefix = "@prefix@";
+my $kdehtmldir = `kde-config --expandvars --install html`;
chomp $kdeprefix;
+chomp $kdehtmldir;
Modified: trunk/packages/kdebase/debian/patches/28_kdebase_rubberband.diff
===================================================================
--- trunk/packages/kdebase/debian/patches/28_kdebase_rubberband.diff 2005-11-11 15:58:53 UTC (rev 2194)
+++ trunk/packages/kdebase/debian/patches/28_kdebase_rubberband.diff 2005-11-11 15:59:51 UTC (rev 2195)
@@ -118,7 +118,7 @@
QLabel* lblMenuHandle;
--- kde.orig/konqueror/listview/konq_listviewwidget.cc
+++ kde.patched/konqueror/listview/konq_listviewwidget.cc
-@@ -415,9 +415,11 @@
+@@ -405,9 +405,11 @@
{
if ( m_rubber )
{
@@ -133,7 +133,7 @@
}
delete m_selected;
-@@ -427,14 +429,15 @@
+@@ -417,14 +419,15 @@
KonqBaseListViewItem* item = isExecuteArea( vp ) ?
static_cast<KonqBaseListViewItem*>( itemAt( vp ) ) : 0L;
@@ -152,7 +152,7 @@
m_fileTip->setItem( 0 );
}
if ( e->button() != RightButton )
-@@ -450,9 +453,11 @@
+@@ -440,9 +443,11 @@
{
if ( m_rubber )
{
@@ -165,7 +165,7 @@
}
if ( m_scrollTimer )
-@@ -541,23 +546,21 @@
+@@ -534,23 +539,21 @@
KListView::leaveEvent( e );
}
@@ -195,7 +195,7 @@
}
void KonqBaseListViewWidget::slotAutoScroll()
-@@ -573,10 +576,12 @@
+@@ -566,10 +569,12 @@
if ( vc == m_rubber->bottomRight() )
return;
@@ -209,7 +209,7 @@
m_rubber->setBottomRight( vc );
QListViewItem *cur = itemAt( QPoint(0,0) );
-@@ -584,12 +589,20 @@
+@@ -577,12 +582,20 @@
bool block = signalsBlocked();
blockSignals( true );
@@ -232,7 +232,7 @@
rect = QRect( viewportToContents( rect.topLeft() ),
viewportToContents( rect.bottomRight() ) );
-@@ -613,9 +626,26 @@
+@@ -606,9 +619,26 @@
if ( rect.intersects( nr ) )
{
if ( !cur->isSelected() && cur->isSelectable() )
@@ -261,7 +261,7 @@
cur = cur->itemBelow();
if (cur && !allColumnsShowFocus())
-@@ -632,9 +662,26 @@
+@@ -625,9 +655,26 @@
if ( rect.intersects( nr ) )
{
if ( !cur->isSelected() && cur->isSelectable() )
@@ -290,7 +290,7 @@
cur = cur->itemAbove();
if (cur && !allColumnsShowFocus())
-@@ -646,7 +693,31 @@
+@@ -639,7 +686,31 @@
blockSignals( block );
emit selectionChanged();
@@ -323,7 +323,7 @@
const int scroll_margin = 40;
ensureVisible( vc.x(), vc.y(), scroll_margin, scroll_margin );
-@@ -676,9 +747,12 @@
+@@ -669,9 +740,12 @@
void KonqBaseListViewWidget::viewportPaintEvent( QPaintEvent *e )
{
@@ -340,7 +340,7 @@
void KonqBaseListViewWidget::viewportResizeEvent(QResizeEvent * e)
--- kde.orig/konqueror/listview/konq_listviewwidget.h
+++ kde.patched/konqueror/listview/konq_listviewwidget.h
-@@ -205,7 +205,7 @@
+@@ -206,7 +206,7 @@
virtual void viewportPaintEvent( QPaintEvent *e );
virtual void viewportResizeEvent( QResizeEvent *e );
@@ -349,7 +349,7 @@
virtual void contentsMousePressEvent( QMouseEvent *e );
virtual void contentsMouseReleaseEvent( QMouseEvent *e );
virtual void contentsMouseMoveEvent( QMouseEvent *e );
-@@ -245,7 +245,8 @@
+@@ -246,7 +246,8 @@
QColor m_itemColor;
QRect *m_rubber;
More information about the pkg-kde-commits
mailing list