rpms/kdebase-workspace/F-9 kdebase-workspace-4.1.0-kdm-appsdir.patch, NONE, 1.1 kdebase-workspace.spec, 1.96, 1.97

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase-workspace/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32633/F-9

Modified Files:
    kdebase-workspace.spec 
Added Files:
    kdebase-workspace-4.1.0-kdm-appsdir.patch 
Log Message:
* Fri Aug 01 2008 Kevin Kofler  4.1.0-4
- fix KDM configuration using the wrong appsdir for themes (#455623)

kdebase-workspace-4.1.0-kdm-appsdir.patch:

--- NEW FILE kdebase-workspace-4.1.0-kdm-appsdir.patch ---
diff -ur kdebase-workspace-4.1.0/kcontrol/kdm/kdm-theme.cpp kdebase-workspace-4.1.0-kdm-appsdir/kcontrol/kdm/kdm-theme.cpp
--- kdebase-workspace-4.1.0/kcontrol/kdm/kdm-theme.cpp	2008-07-08 11:26:12.000000000 +0200
+++ kdebase-workspace-4.1.0-kdm-appsdir/kcontrol/kdm/kdm-theme.cpp	2008-08-01 02:49:33.000000000 +0200
@@ -115,7 +115,7 @@
    connect( bRemoveTheme, SIGNAL(clicked()), SLOT(removeSelectedThemes()) );
    connect( bGetNewThemes, SIGNAL(clicked()), SLOT(getNewStuff()) );

-	themeDir = KGlobal::dirs()->resourceDirs( "data" ).last() + "kdm/themes/";
+	themeDir = KStandardDirs::installPath( "data" ) + "kdm/themes/";
    defaultTheme = 0;
    QDir testDir( themeDir );
    if (!testDir.exists() && !testDir.mkdir( testDir.absolutePath() ) && !geteuid())
diff -ur kdebase-workspace-4.1.0/kcontrol/kdm/kdm-users.cpp kdebase-workspace-4.1.0-kdm-appsdir/kcontrol/kdm/kdm-users.cpp
--- kdebase-workspace-4.1.0/kcontrol/kdm/kdm-users.cpp	2008-07-03 07:05:24.000000000 +0200
+++ kdebase-workspace-4.1.0-kdm-appsdir/kcontrol/kdm/kdm-users.cpp	2008-08-01 02:49:19.000000000 +0200
@@ -87,7 +87,7 @@

// We assume that $kde_datadir/kdm exists, but better check for pics/ and pics/users,
    // and create them if necessary.
-	m_userPixDir = config->group( "X-*-Greeter" ).readEntry( "FaceDir", KGlobal::dirs()->resourceDirs( "data" ).last() + "kdm/faces" ) + '/';
+	m_userPixDir = config->group( "X-*-Greeter" ).readEntry( "FaceDir", KStandardDirs::installPath( "data" ) + "kdm/faces" ) + '/';
    QDir testDir( m_userPixDir );
    if (!testDir.exists() && !testDir.mkdir( testDir.absolutePath() ) && !geteuid())
    	KMessageBox::sorry( this, i18n("Unable to create folder %1", testDir.absolutePath() ) );
@@ -364,7 +364,7 @@
 void KDMUsersWidget::slotUserButtonClicked()
 {
    KIconDialog dlg;
-	dlg.setCustomLocation( KGlobal::dirs()->resourceDirs( "data" ).last() + "kdm/pics/users" );
+	dlg.setCustomLocation( KStandardDirs::installPath( "data" ) + "kdm/pics/users" );
    dlg.setup( KIconLoader::NoGroup, KIconLoader::Any, false, 48, true, true, false );
    QString ic = dlg.openDialog();
    if (ic.isEmpty())

Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-9/kdebase-workspace.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- kdebase-workspace.spec	28 Jul 2008 19:04:32 -0000	1.96
+++ kdebase-workspace.spec	1 Aug 2008 00:54:16 -0000	1.97
@@ -4,7 +4,7 @@
 Name: kdebase-workspace
 Version: 4.1.0

-Release: 3%{?dist}
+Release: 4%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -24,6 +24,8 @@
 Patch10: kdebase-workspace-4.0.72-klipper-url.patch
 # allows to define a default wallpaper via plasmarc:wallpaper
 Patch11: kdebase-workspace-4.0.85-plasma-default-wallpaper.patch
+# 455623: Cannot install KDM Themes (KDM KCM uses wrong appsdir)
+Patch12: kdebase-workspace-4.1.0-kdm-appsdir.patch

# upstream patches:
 # backport Plasma tooltip manager from KDE 4.2 (fixes regression from 4.0)
@@ -158,6 +160,7 @@
 %patch8 -p0 -b .krdb
 %patch10 -p1 -b .klipper-url
 %patch11 -p1 -b .plasma-default-wallpaper
+%patch12 -p1 -b .kdm-appsdir

# upstream patches
 %patch100 -p1 -b .plasma-tooltips
@@ -301,6 +304,9 @@

%changelog
+* Fri Aug 01 2008 Kevin Kofler  4.1.0-4
+- fix KDM configuration using the wrong appsdir for themes (#455623)
+
 * Mon Jul 28 2008 Rex Dieter  4.1.0-3
 - respun tarball