Hello community,
here is the log from the commit of package kdebase4-workspace for
openSUSE:Factory checked in at 2013-09-09 11:11:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kdebase4-workspace (Old)
and /work/SRC/openSUSE:Factory/.kdebase4-workspace.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdebase4-workspace"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kdebase4-workspace/kdebase4-workspace.changes
2013-08-27 20:49:45.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.kdebase4-workspace.new/kdebase4-workspace.changes
2013-09-09 11:12:43.000000000 +0200
@@ -1,0 +2,51 @@
+Sat Sep 7 23:09:20 UTC 2013 - [email protected]
+
+- Added two patches from upstream master branch, for improving krunner
+ usability:
+ 0001-make-it-possible-to-match-applications-with-fewer-ke.patch and
+ 0002-Add-the-full-name-of-completion-matches-to-history.patch
+
+-------------------------------------------------------------------
+Sat Sep 7 17:17:50 UTC 2013 - [email protected]
+
+- Reduce the amount of KDM settings in sysconfig/displaymanager to
+ purely autologin. This enables that KDM can be configured again
+ through the normal KDE systemsettings module. (bnc#267903)
+
+-------------------------------------------------------------------
+Thu Sep 5 17:24:30 UTC 2013 - [email protected]
+
+- Changed plasma-kickoff-newly-collapsing.diff:
+ * don't remove upstream's duplicates handling code anymore since
+ kde3-applications.diff is dropped now from kdelibs4
+ * don't append " (category)" to collapsed entries' names anymore,
+ not necessary because duplicates are filtered out now anyway
+ * simplify and reformat patch
+
+-------------------------------------------------------------------
+Sun Sep 1 15:26:22 UTC 2013 - [email protected]
+
+- Added add-calculator-hotkey.patch, which adds a default hotkey to
+ launch KCalc on pressing the Calculator button (bnc#726550)
+
+-------------------------------------------------------------------
+Sun Sep 1 09:56:05 UTC 2013 - [email protected]
+
+- Update to 4.11.1
+ * KDE 4.11.1 bugfix release
+ * See http://www.kde.org/announcements/announce-4.11.1.php
+
+-------------------------------------------------------------------
+Sun Sep 1 09:51:22 UTC 2013 - [email protected]
+
+- Drop upstream patches as preparation for the 4.11.1 update
+ * 0001-Add-back-window-ids-to-the-drag-data-payload.patch
+ * 0002-Fix-rare-race-condition-crash.patch
+ * 0003-make-stacking_order-exclusive-during-shutdown.patch
+ * 0004-Don-t-attempt-to-publish-geometry-for-launcher-items.patch
+ * 0005-More-sanity-checking.patch
+ * 0006-c-cannot-invoke-other-constructors.patch
+ * 0007-print-active-screen-strategy-blocking-for-retrace.patch
+ * 0008-align-GUI-object-name-to-kcfg-name.patch
+
+-------------------------------------------------------------------
Old:
----
0001-Add-back-window-ids-to-the-drag-data-payload.patch
0002-Fix-rare-race-condition-crash.patch
0003-make-stacking_order-exclusive-during-shutdown.patch
0004-Don-t-attempt-to-publish-geometry-for-launcher-items.patch
0005-More-sanity-checking.patch
0006-c-cannot-invoke-other-constructors.patch
0007-print-active-screen-strategy-blocking-for-retrace.patch
0008-align-GUI-object-name-to-kcfg-name.patch
kde-workspace-4.11.0.tar.xz
New:
----
0001-make-it-possible-to-match-applications-with-fewer-ke.patch
0002-Add-the-full-name-of-completion-matches-to-history.patch
add-calculator-hotkey.patch
kde-workspace-4.11.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdebase4-workspace.spec ++++++
--- /var/tmp/diff_new_pack.OkRsjg/_old 2013-09-09 11:12:45.000000000 +0200
+++ /var/tmp/diff_new_pack.OkRsjg/_new 2013-09-09 11:12:45.000000000 +0200
@@ -23,7 +23,7 @@
%endif
Name: kdebase4-workspace
-Version: 4.11.0
+Version: 4.11.1
Release: 0
Summary: The KDE Workspace Components
License: GPL-2.0+
@@ -61,6 +61,8 @@
BuildRequires: xcb-util-image-devel
BuildRequires: xcb-util-renderutil-devel
BuildRequires: pkgconfig(xcb-keysyms)
+BuildRequires: pkgconfig(glesv2)
+BuildRequires: pkgconfig(udev)
%if %suse_version > 1220
BuildRequires: pkgconfig(glu)
%endif
@@ -141,24 +143,17 @@
Patch64: klipper.patch
# PATCH-FIX-UPSTREAM kdm-backend-session.patch fix type mismatch in resource
handling kde#323436
Patch65: kdm-backend-session.patch
+# PATCH-FIX-OPENSUSE add-calculator-hotkey.patch -- Adds hotkey for Calculator
button (bnc#726550)
+Patch66: add-calculator-hotkey.patch
# PATCH-FIX-OPENSUSE helper_actions_syspath.patch -- disables
org.kde.powerdevil.backlighthelper.syspath policy, until bnc#825256 gets
resolved
Patch1000: helper_actions_syspath.patch
-# PATCH-FIX-UPSTREAM 0001-Add-back-window-ids-to-the-drag-data-payload.patch
-- this e.g. makes dropping tasks on the pager work again (kde#322567)
-Patch2000: 0001-Add-back-window-ids-to-the-drag-data-payload.patch
-# PATCH-FIX-UPSTREAM 0002-Fix-rare-race-condition-crash.patch (kde#323496)
-Patch2001: 0002-Fix-rare-race-condition-crash.patch
-# PATCH-FIX-UPSTREAM 0003-make-stacking_order-exclusive-during-shutdown.patch
(kde#323383)
-Patch2002: 0003-make-stacking_order-exclusive-during-shutdown.patch
-# PATCH-FIX-UPSTREAM
0004-Don-t-attempt-to-publish-geometry-for-launcher-items.patch
-Patch2003: 0004-Don-t-attempt-to-publish-geometry-for-launcher-items.patch
-# PATCH-FIX-UPSTREAM 0005-More-sanity-checking.patch
-Patch2004: 0005-More-sanity-checking.patch
-# PATCH-FIX-UPSTREAM 0006-c-cannot-invoke-other-constructors.patch
-Patch2005: 0006-c-cannot-invoke-other-constructors.patch
-# PATCH-FIX-UPSTREAM
0007-print-active-screen-strategy-blocking-for-retrace.patch
-Patch2006: 0007-print-active-screen-strategy-blocking-for-retrace.patch
-# PATCH-FIX-UPSTREAM 0008-align-GUI-object-name-to-kcfg-name.patch
-Patch2007: 0008-align-GUI-object-name-to-kcfg-name.patch
+# NOTE -- Following two krunner patches are from kde-workspace master branch!
+# PATCH-FIX-UPSTREAM
0001-make-it-possible-to-match-applications-with-fewer-ke.patch -- makes
possible to find applications and services
+# with a single character (kde#212901)
+Patch1050: 0001-make-it-possible-to-match-applications-with-fewer-ke.patch
+# PATCH-FIX-UPSTREAM
0002-Add-the-full-name-of-completion-matches-to-history.patch -- fill the
history combo box with the actual hit you executed,
+# instead of half-complete strings that don't make sense until you actually
select them.
+Patch1051: 0002-Add-the-full-name-of-completion-matches-to-history.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: %{name}-branding = %{_kde_branding_version}
Requires: %{name}-ksysguardd = %{version}
@@ -372,17 +367,12 @@
%patch63 -p1
%patch64 -p1
%patch65 -p1
+%patch66 -p1
%if 0%{?suse_version} <= 1230
%patch1000 -p1
%endif
-%patch2000 -p1
-%patch2001 -p1
-%patch2002 -p1
-%patch2003 -p1
-%patch2004 -p1
-%patch2005 -p1
-%patch2006 -p1
-%patch2007 -p1
+%patch1050 -p1
+%patch1051 -p1
cp %{SOURCE3} kwin/effects/cube/data/cubecap.png
%build
++++++ 0001-make-it-possible-to-match-applications-with-fewer-ke.patch ++++++
>From e2ebcda23e635eaba4b96e839c05760c975661dd Mon Sep 17 00:00:00 2001
From: Aaron Seigo <[email protected]>
Date: Tue, 30 Jul 2013 16:01:43 +0200
Subject: [PATCH 1/2] make it possible to match applications with fewer
keystrokes
patch by Milo Mordaunt
REVIEW:111795
(cc'ing an extra copy to myself to keep it for backporting to 4.11.1)
CCMAIL:[email protected]
---
plasma/generic/runners/services/servicerunner.cpp | 76 ++++++++++++++---------
1 file changed, 46 insertions(+), 30 deletions(-)
diff --git a/plasma/generic/runners/services/servicerunner.cpp
b/plasma/generic/runners/services/servicerunner.cpp
index 7b292ef..985a09c 100644
--- a/plasma/generic/runners/services/servicerunner.cpp
+++ b/plasma/generic/runners/services/servicerunner.cpp
@@ -46,30 +46,30 @@ ServiceRunner::~ServiceRunner()
void ServiceRunner::match(Plasma::RunnerContext &context)
{
const QString term = context.query();
- if (term.length() < 3) {
- return;
- }
-
- // Search for applications which are executable and case-insensitively
match the search term
- // See
http://techbase.kde.org/Development/Tutorials/Services/Traders#The_KTrader_Query_Language
- // if the following is unclear to you.
- QString query = QString("exist Exec and ('%1' =~ Name)").arg(term);
- KService::List services = KServiceTypeTrader::self()->query("Application",
query);
QList<Plasma::QueryMatch> matches;
-
QSet<QString> seen;
- if (!services.isEmpty()) {
- //kDebug() << service->name() << "is an exact match!" <<
service->storageId() << service->exec();
- foreach (const KService::Ptr &service, services) {
- if (!service->noDisplay() && service->property("NotShowIn",
QVariant::String) != "KDE") {
- Plasma::QueryMatch match(this);
- match.setType(Plasma::QueryMatch::ExactMatch);
- setupMatch(service, match);
- match.setRelevance(1);
- matches << match;
- seen.insert(service->storageId());
- seen.insert(service->exec());
+ QString query;
+
+ if (term.length() > 1) {
+ // Search for applications which are executable and case-insensitively
match the search term
+ // See
http://techbase.kde.org/Development/Tutorials/Services/Traders#The_KTrader_Query_Language
+ // if the following is unclear to you.
+ query = QString("exist Exec and ('%1' =~ Name)").arg(term);
+ KService::List services =
KServiceTypeTrader::self()->query("Application", query);
+
+ if (!services.isEmpty()) {
+ //kDebug() << service->name() << "is an exact match!" <<
service->storageId() << service->exec();
+ foreach (const KService::Ptr &service, services) {
+ if (!service->noDisplay() && service->property("NotShowIn",
QVariant::String) != "KDE") {
+ Plasma::QueryMatch match(this);
+ match.setType(Plasma::QueryMatch::ExactMatch);
+ setupMatch(service, match);
+ match.setRelevance(1);
+ matches << match;
+ seen.insert(service->storageId());
+ seen.insert(service->exec());
+ }
}
}
}
@@ -78,14 +78,20 @@ void ServiceRunner::match(Plasma::RunnerContext &context)
return;
}
- // Search for applications which are executable and the term
case-insensitive matches any of
- // * a substring of one of the keywords
- // * a substring of the GenericName field
- // * a substring of the Name field
- // Note that before asking for the content of e.g. Keywords and
GenericName we need to ask if
- // they exist to prevent a tree evaluation error if they are not defined.
- query = QString("exist Exec and ( (exist Keywords and '%1' ~subin
Keywords) or (exist GenericName and '%1' ~~ GenericName) or (exist Name and
'%1' ~~ Name) or ('%1' ~~ Exec) )").arg(term);
- services = KServiceTypeTrader::self()->query("Application", query);
+ // If the term length is < 3, no real point searching the Keywords and
GenericName
+ if (term.length() < 3) {
+ query = QString("exist Exec and ( (exist Name and '%1' ~~ Name) or
('%1' ~~ Exec) )").arg(term);
+ } else {
+ // Search for applications which are executable and the term
case-insensitive matches any of
+ // * a substring of one of the keywords
+ // * a substring of the GenericName field
+ // * a substring of the Name field
+ // Note that before asking for the content of e.g. Keywords and
GenericName we need to ask if
+ // they exist to prevent a tree evaluation error if they are not
defined.
+ query = QString("exist Exec and ( (exist Keywords and '%1' ~subin
Keywords) or (exist GenericName and '%1' ~~ GenericName) or (exist Name and
'%1' ~~ Name) or ('%1' ~~ Exec) )").arg(term);
+ }
+
+ KService::List services = KServiceTypeTrader::self()->query("Application",
query);
services += KServiceTypeTrader::self()->query("KCModule", query);
//kDebug() << "got " << services.count() << " services from " << query;
@@ -99,7 +105,9 @@ void ServiceRunner::match(Plasma::RunnerContext &context)
}
const QString id = service->storageId();
+ const QString name = service->desktopEntryName();
const QString exec = service->exec();
+
if (seen.contains(id) || seen.contains(exec)) {
//kDebug() << "already seen" << id << exec;
continue;
@@ -114,7 +122,15 @@ void ServiceRunner::match(Plasma::RunnerContext &context)
setupMatch(service, match);
qreal relevance(0.6);
- if (service->name().contains(term, Qt::CaseInsensitive)) {
+ // If the term was < 3 chars and NOT at the beginning of the App's
name or Exec, then
+ // chances are the user doesn't want that app.
+ if (term.length() < 3) {
+ if (name.startsWith(term) || exec.startsWith(term)) {
+ relevance = 0.9;
+ } else {
+ continue;
+ }
+ } else if (service->name().contains(term, Qt::CaseInsensitive)) {
relevance = 0.8;
if (service->name().startsWith(term, Qt::CaseInsensitive)) {
--
1.8.4
++++++ 0002-Add-the-full-name-of-completion-matches-to-history.patch ++++++
>From f7d773c246156a1bd1613d9a9ba6691f5b43dfab Mon Sep 17 00:00:00 2001
From: Harald Hvaal <[email protected]>
Date: Sat, 24 Aug 2013 10:48:00 +0200
Subject: [PATCH 2/2] Add the full name of completion matches to history
This will fill the history combo box with the actual hit you executed, instead
of half-complete strings that don't make sense until you actually select them.
---
krunner/interfaces/default/interface.cpp | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/krunner/interfaces/default/interface.cpp
b/krunner/interfaces/default/interface.cpp
index 505e0aa..b8e4e17 100644
--- a/krunner/interfaces/default/interface.cpp
+++ b/krunner/interfaces/default/interface.cpp
@@ -496,7 +496,12 @@ void Interface::run(ResultItem *item)
}
//TODO: check if run is succesful before adding the term to history
- m_searchTerm->addToHistory(m_searchTerm->currentText().trimmed());
+ if ((item->group() == Plasma::QueryMatch::CompletionMatch) ||
+ (item->group() == Plasma::QueryMatch::PossibleMatch)) {
+ m_searchTerm->addToHistory(item->name());
+ } else {
+ m_searchTerm->addToHistory(m_searchTerm->currentText().trimmed());
+ }
m_running = true;
// must run the result first before clearing the interface
--
1.8.4
++++++ add-calculator-hotkey.patch ++++++
diff -uNrp kde-workspace-4.11.1/khotkeys/data/defaults.khotkeys
kde-workspace-4.11.1_new/khotkeys/data/defaults.khotkeys
--- kde-workspace-4.11.1/khotkeys/data/defaults.khotkeys 2013-08-28
10:59:38.071530567 -0600
+++ kde-workspace-4.11.1_new/khotkeys/data/defaults.khotkeys 2013-09-01
09:22:09.465161689 -0600
@@ -73,7 +73,7 @@ Comment[wa]=Rawete
Comment[x-test]=xxCommentxx
Comment[zh_CN]=注释
Comment[zh_TW]=註解
-DataCount=1
+DataCount=2
Enabled=true
Name=KMenuEdit
Name[ar]=محرّر قوائم كدي
@@ -395,6 +395,32 @@ Key=Search
Type=SHORTCUT
Uuid={d03619b6-9b3c-48cc-9d9c-a2aadb485550}
+[Data_1_2]
+Comment=Launches KCalc when Calculator key (if present) is pressed.
+Enabled=true
+Name=Calculator
+Type=SIMPLE_ACTION_DATA
+
+[Data_1_2Actions]
+ActionsCount=1
+
+[Data_1_2Actions0]
+CommandURL=kcalc
+Type=COMMAND_URL
+
+[Data_1_2Conditions]
+Comment=
+ConditionsCount=0
+
+[Data_1_2Triggers]
+Comment=Simple_action
+TriggersCount=1
+
+[Data_1_2Triggers0]
+Key=Launch (1)
+Type=SHORTCUT
+Uuid={c8faefad-8d09-4389-8f36-09865d2bb0c2}
+
[Main]
Version=2
ImportId=defaults
++++++ kde-workspace-4.11.0.tar.xz -> kde-workspace-4.11.1.tar.xz ++++++
/work/SRC/openSUSE:Factory/kdebase4-workspace/kde-workspace-4.11.0.tar.xz
/work/SRC/openSUSE:Factory/.kdebase4-workspace.new/kde-workspace-4.11.1.tar.xz
differ: char 26, line 1
++++++ kdm-sysconfig-values.diff ++++++
--- /var/tmp/diff_new_pack.OkRsjg/_old 2013-09-09 11:12:45.000000000 +0200
+++ /var/tmp/diff_new_pack.OkRsjg/_new 2013-09-09 11:12:45.000000000 +0200
@@ -1,7 +1,5 @@
-Index: kdm/config.def
-===================================================================
---- kdm/config.def.orig
-+++ kdm/config.def
+--- kdm/config.def 2013-09-02 21:03:58.571922383 +0200
++++ kdm/config.def 2013-09-03 21:25:59.043485577 +0200
@@ -171,6 +171,9 @@
Core config for 1st local display
[X-:0-Core]
@@ -12,7 +10,7 @@
Greeter config for 1st local display
[X-:0-Greeter]
</kdmrc>
-@@ -794,6 +797,21 @@ Description:
+@@ -794,6 +797,21 @@
<emphasis>Do not</emphasis> change it, you may interfere with future
upgrades and this could result in &kdm; failing to run.
@@ -34,7 +32,7 @@
Key: PAMService
If: defined(USE_PAM)
Type: string
-@@ -876,10 +894,10 @@ Description:
+@@ -876,10 +894,10 @@
Key: PidFile
Type: string
@@ -48,7 +46,7 @@
Comment:
Where &kdm; should store its PID (do not store if empty).
Description:
-@@ -903,10 +921,10 @@ Description:
+@@ -903,10 +921,10 @@
Key: AuthDir
Type: path
# differs from XDM
@@ -62,7 +60,7 @@
Comment:
Where to store authorization files.
Description:
-@@ -932,7 +950,7 @@ Description:
+@@ -932,7 +950,7 @@
Key: ExportList
Type: list
@@ -71,7 +69,7 @@
User: core
Instance: #"LD_LIBRARY_PATH,ANOTHER_IMPORTANT_VAR"
Merge: xdm(P_list)
-@@ -1076,9 +1094,10 @@ Description:
+@@ -1076,9 +1094,10 @@
Key: Enable
Type: bool
@@ -83,7 +81,7 @@
Comment: &
Description:
Whether &kdm; should listen to incoming &XDMCP; requests.
-@@ -1099,7 +1118,7 @@ Description:
+@@ -1099,7 +1118,7 @@
Key: KeyFile
Type: string
@@ -92,7 +90,7 @@
User: core
Instance: #KDMCONF "/kdmkeys"
Update: cp_keyfile
-@@ -1115,11 +1134,10 @@ Description:
+@@ -1115,11 +1134,10 @@
Key: Xaccess
Type: string
# differs from xdm
@@ -107,7 +105,7 @@
Comment:
&XDMCP; access control file in the usual XDM-Xaccess format.
Description:
-@@ -1177,13 +1195,11 @@ Description:
+@@ -1177,13 +1195,11 @@
Key: Willing
Type: string
@@ -123,7 +121,7 @@
Comment:
The program which is invoked to dynamically generate replies to &XDMCP;
DirectQuery or BroadcastQuery requests.
-@@ -1259,7 +1275,7 @@ Type: enum
+@@ -1259,7 +1275,7 @@
Grub2/BO_GRUB2: Grub2 boot manager
Burg/BO_BURG: Burg boot manager
Lilo/BO_LILO: Lilo boot manager (Linux on i386 & x86-64 only)
@@ -132,7 +130,7 @@
User: core
User: greeter
Instance: #Grub
-@@ -1361,7 +1377,7 @@ Type: string
+@@ -1361,7 +1377,7 @@
Default: DEF_SERVER_CMD
DDefault: -
User: core
@@ -141,7 +139,7 @@
Update: upd_servercmd
Comment:
The command line to start the &X-Server;, without display number and VT spec.
-@@ -1374,13 +1390,13 @@ Description:
+@@ -1374,13 +1390,13 @@
This string is subject to word splitting.
</para><para>
The default is something reasonable for the system on which &kdm; was built,
@@ -157,7 +155,7 @@
Comment: &
Description:
Additional arguments for the &X-Server;s for local sessions.
-@@ -1479,6 +1495,8 @@ Type: bool
+@@ -1479,6 +1495,8 @@
Default: false
User: core
Instance: #:*/!
@@ -166,7 +164,7 @@
Merge: xdm
Comment:
Restart instead of resetting the local &X-Server; after session exit.
-@@ -1553,11 +1571,10 @@ Description:
+@@ -1553,11 +1571,10 @@
Key: Resources
# XXX strictly speaking this is supposed to be a string list, i think.
Type: string
@@ -180,7 +178,7 @@
Comment:
Specify a file with X-resources for the greeter, chooser and background.
The KDE frontend does not use this file, so you do not need it unless you
-@@ -1585,12 +1602,11 @@ Description:
+@@ -1585,12 +1602,11 @@
Key: Setup
Type: string
@@ -195,7 +193,7 @@
Comment:
A program to run before the greeter is shown. Can be used to start an
xconsole or an alternative background generator. Subject to word splitting.
-@@ -1606,12 +1622,11 @@ Description:
+@@ -1606,12 +1622,11 @@
Key: Startup
Type: string
@@ -210,7 +208,7 @@
Comment:
A program to run before a user session starts. Subject to word splitting.
Description:
-@@ -1624,12 +1639,11 @@ Description:
+@@ -1624,12 +1639,11 @@
Key: Reset
Type: string
@@ -225,7 +223,7 @@
Comment:
A program to run after a user session exits. Subject to word splitting.
Description:
-@@ -1642,12 +1656,12 @@ Description:
+@@ -1642,12 +1656,12 @@
Key: Session
Type: string
@@ -240,7 +238,7 @@
Comment:
The program which is run as the user which logs in. It is supposed to
interpret the session argument (see SessionsDirs) and start an appropriate
-@@ -1759,10 +1773,11 @@ Description:
+@@ -1759,10 +1773,11 @@
Key: AllowRootLogin
Type: bool
@@ -254,7 +252,7 @@
Merge: xdm
Comment:
Allow root logins?
-@@ -1777,6 +1792,7 @@ User: core
+@@ -1777,6 +1792,7 @@
# sensible?
Instance: */false
Instance: :*/true
@@ -262,7 +260,7 @@
Merge: xdm
Comment:
Allow to log in, when user has set an empty password?
-@@ -1788,12 +1804,13 @@ Type: enum
+@@ -1788,12 +1804,13 @@
None/SHUT_NONE: no <guilabel>Shutdown...</guilabel> menu entry is shown at
all
Root/SHUT_ROOT: the <systemitem class="username">root</systemitem> password
must be entered to shut down
All/SHUT_ALL: everybody can shut down the machine
@@ -279,7 +277,7 @@
Comment: &
Description:
Who is allowed to shut down the system. This applies both to the
-@@ -1883,6 +1900,7 @@ Type: bool
+@@ -1870,6 +1887,7 @@
Default: false
User: dep
Instance: #:0/true
@@ -287,7 +285,7 @@
Comment: &
Description:
Enable automatic login. <emphasis>Use with extreme care!</emphasis>
-@@ -1916,7 +1934,7 @@ Default: ""
+@@ -1903,7 +1921,7 @@
PostProc: PautoLoginX
User: core(autoUser)
User: greeter
@@ -296,7 +294,7 @@
Merge: xdm:autoUser(P_autoUser)
Comment: &
Description:
-@@ -1947,10 +1965,10 @@ Description:
+@@ -1934,10 +1952,10 @@
Key: SessionsDirs
Type: list
@@ -309,7 +307,7 @@
Update: upd_sessionsdirs
Comment:
The directories containing session type definitions in .desktop format,
-@@ -2019,7 +2037,7 @@ Description:
+@@ -2006,7 +2024,7 @@
Key: UseSessReg
Type: bool
@@ -318,7 +316,7 @@
User: core
Instance: #*/!
Comment:
-@@ -2065,7 +2083,8 @@ Type: enum
+@@ -2052,7 +2070,8 @@
Clock/LOGO_CLOCK: a neat analog clock
Default: Clock
User: greeter
@@ -328,7 +326,7 @@
Comment:
What should be shown in the greeter's logo are:
Description:
-@@ -2281,7 +2300,7 @@ Description:
+@@ -2268,7 +2287,7 @@
Key: HiddenUsers
Type: list
@@ -337,7 +335,7 @@
User: greeter-c(noUsers)
Instance: #*/"root"
# depends on {Min,Max}ShowUID
-@@ -2427,7 +2446,7 @@ Description:
+@@ -2414,7 +2433,7 @@
Key: UseBackground
Type: bool
@@ -346,7 +344,7 @@
User: greeter
Instance: #*/!
Comment:
-@@ -2587,6 +2606,7 @@ Type: bool
+@@ -2574,6 +2593,7 @@
Default: false
User: greeter
Instance: :0/true
@@ -354,7 +352,7 @@
Comment:
Enable &kdm;'s built-in xconsole. Note that this can be enabled for only
one display at a time.
-@@ -2675,9 +2695,9 @@ Description:
+@@ -2662,9 +2682,9 @@
Key: Preloader
Type: string
@@ -366,7 +364,7 @@
Update: upd_preloader
Comment: &
Description:
-@@ -2687,7 +2707,7 @@ Description:
+@@ -2674,7 +2694,7 @@
Key: UseTheme
Type: bool
@@ -375,34 +373,17 @@
User: greeter
Instance: */true
Comment:
-@@ -2700,9 +2720,10 @@ Description:
-
- Key: Theme
- Type: string
--Default: ""
-+Default: KDMDATA "/themes/SUSE"
- User: greeter
--Instance: */KDMDATA "/themes/elarun"
-+Instance: */""
-+Update: reset_sec_0_1
- Comment: &
- Description:
- The theme to use for the greeter. Can point to either a directory or an XML
-Index: kdm/kfrontend/CMakeLists.txt
-===================================================================
---- kdm/kfrontend/CMakeLists.txt.orig
-+++ kdm/kfrontend/CMakeLists.txt
-@@ -118,3 +118,5 @@ install(TARGETS kdmctl ${INSTALL_TARGETS
+--- kdm/kfrontend/CMakeLists.txt 2013-09-02 21:03:58.633922387 +0200
++++ kdm/kfrontend/CMakeLists.txt 2013-09-03 21:25:59.043485577 +0200
+@@ -114,3 +114,5 @@
install(CODE "
exec_program(\"${CMAKE_CURRENT_BINARY_DIR}/genkdmconf\" ARGS --in
\\\"\\\$DESTDIR${CONFIG_INSTALL_DIR}/kdm\\\" --no-in-notice --face-src
\\\"${CMAKE_CURRENT_SOURCE_DIR}/pics\\\" \\\$GENKDMCONF_FLAGS)
")
+
+install( PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/read_sysconfig.sh DESTINATION
${DATA_INSTALL_DIR}/kdm )
-Index: kdm/kfrontend/genkdmconf.c
-===================================================================
---- kdm/kfrontend/genkdmconf.c.orig
-+++ kdm/kfrontend/genkdmconf.c
-@@ -62,6 +62,7 @@ Foundation, Inc., 51 Franklin Street, Fi
+--- kdm/kfrontend/genkdmconf.c 2013-09-02 21:03:58.660922389 +0200
++++ kdm/kfrontend/genkdmconf.c 2013-09-03 21:25:59.044485577 +0200
+@@ -62,6 +62,7 @@
#include <config.ci>
#define RCVERSTR stringify(RCVERMAJOR) "." stringify(RCVERMINOR)
@@ -410,7 +391,7 @@
static int old_scripts, no_old_scripts, old_confs, no_old,
no_backup, no_in_notice, use_destdir, mixed_scripts;
-@@ -69,7 +70,7 @@ static const char *newdir = KDMCONF, *fa
+@@ -69,7 +70,7 @@
*oldxdm, *oldkde, *oldkdepfx;
static int oldver;
@@ -419,7 +400,7 @@
typedef struct StrList {
struct StrList *next;
-@@ -551,6 +552,7 @@ writeKdmrc(FILE *f)
+@@ -551,6 +552,7 @@
const char *cmt;
putFqVal("General", "ConfigVersion", RCVERSTR);
@@ -427,7 +408,7 @@
for (cs = config; cs; cs = cs->next) {
fprintf_(f, "%s[%s]\n",
cs->comment ? cs->comment : "\n", cs->name);
-@@ -1646,6 +1648,26 @@ upd_servercmd(Entry *ce, Section *cs ATT
+@@ -1646,6 +1648,26 @@
ce->written = True;
}
@@ -454,7 +435,7 @@
#ifdef XDMCP
static void
cp_keyfile(Entry *ce, Section *cs ATTR_UNUSED)
-@@ -2638,7 +2660,7 @@ static int
+@@ -2637,7 +2659,7 @@
mergeKdmRcNewer(const char *path, int obsRet)
{
char *p;
@@ -463,7 +444,7 @@
RSection *rootsect, *cs;
REntry *ce;
int i, j, ma, mi;
-@@ -2664,6 +2686,9 @@ mergeKdmRcNewer(const char *path, int ob
+@@ -2663,6 +2685,9 @@
p, ma, mi);
free(p);
@@ -473,7 +454,7 @@
for (cs = rootsect; cs; cs = cs->next) {
cp = strrchr(cs->name, '-');
if (!cp)
-@@ -2709,7 +2734,7 @@ mergeKdmRcNewer(const char *path, int ob
+@@ -2708,7 +2733,7 @@
;
}
@@ -482,11 +463,9 @@
return True;
}
-Index: kdm/kfrontend/kdm_config.c
-===================================================================
---- kdm/kfrontend/kdm_config.c.orig
-+++ kdm/kfrontend/kdm_config.c
-@@ -396,7 +396,7 @@ static const char *kdmrc = KDMCONF "/kdm
+--- kdm/kfrontend/kdm_config.c 2013-09-02 21:03:58.662922389 +0200
++++ kdm/kfrontend/kdm_config.c 2013-09-03 21:46:50.011117247 +0200
+@@ -396,7 +396,7 @@
static Section *rootsec;
static void
@@ -495,7 +474,7 @@
{
const char *nstr, *dstr, *cstr, *dhost, *dnum, *dclass;
char *s, *e, *st, *en, *ek, *sl, *pt;
-@@ -406,14 +406,9 @@ readConfig()
+@@ -406,14 +406,9 @@
int nlen, dlen, clen, dhostl, dnuml, dclassl;
int i, line, sectmoan, restl;
File file;
@@ -512,7 +491,7 @@
return;
for (s = file.buf, line = 0, cursec = 0, sectmoan = 1; s < file.eof; s++)
{
-@@ -439,7 +434,7 @@ readConfig()
+@@ -439,7 +434,7 @@
e--;
if (*e != ']') {
cursec = 0;
@@ -521,7 +500,7 @@
continue;
}
nstr = sl + 1;
-@@ -449,7 +444,7 @@ readConfig()
+@@ -449,7 +444,7 @@
!memcmp(nstr, cursec->name, nlen))
{
logInfo("Multiple occurrences of section [%.*s] in %s. "
@@ -530,7 +509,7 @@
goto secfnd;
}
if (nstr[0] == 'X' && nstr[1] == '-') {
-@@ -505,7 +500,7 @@ readConfig()
+@@ -505,7 +500,7 @@
illsec:
cursec = 0;
logError("Unrecognized section name [%.*s] at %s:%d\n",
@@ -539,7 +518,7 @@
continue;
newsec:
if (!(cursec = Malloc(sizeof(*cursec))))
-@@ -533,7 +528,7 @@ readConfig()
+@@ -533,7 +528,7 @@
if (!cursec) {
if (sectmoan) {
sectmoan = False;
@@ -548,7 +527,7 @@
}
goto sktoeol;
}
-@@ -541,13 +536,13 @@ readConfig()
+@@ -541,13 +536,13 @@
for (; (s < file.eof) && (*s != '\n'); s++)
if (*s == '=')
goto haveeq;
@@ -564,7 +543,7 @@
goto sktoeol;
}
if (!isspace(*ek))
-@@ -561,7 +556,7 @@ readConfig()
+@@ -561,7 +556,7 @@
if (*s == '\\') {
s++;
if (s >= file.eof || *s == '\n') {
@@ -573,7 +552,7 @@
break;
}
switch (*s) {
-@@ -590,13 +585,13 @@ readConfig()
+@@ -590,13 +585,13 @@
goto keyok;
}
logError("Unrecognized key '%.*s' in section [%.*s] at %s:%d\n",
@@ -589,7 +568,7 @@
goto keyfnd;
}
if (!(curent = Malloc(sizeof(*curent))))
-@@ -612,6 +607,20 @@ readConfig()
+@@ -612,6 +607,20 @@
}
}
@@ -610,11 +589,9 @@
static Entry *
findGEnt(int id)
{
-Index: kdm/kfrontend/read_sysconfig.sh
-===================================================================
---- /dev/null
-+++ kdm/kfrontend/read_sysconfig.sh
-@@ -0,0 +1,160 @@
+--- kdm/kfrontend/read_sysconfig.sh 1970-01-01 01:00:00.000000000 +0100
++++ kdm/kfrontend/read_sysconfig.sh 2013-09-03 21:28:38.522493296 +0200
+@@ -0,0 +1,145 @@
+#!/bin/bash
+#
+# Copyright (c) 2006 SUSE Linux Products GmbH Nuernberg, Germany.
@@ -684,13 +661,6 @@
+
+(
+echo "[X-*-Greeter]"
-+if [ -n "$KDM_USERS" ]; then
-+ echo "ShowUsers=Selected"
-+ echo -n "SelectedUsers="
-+ echo ${KDM_USERS}|sed -e 's@ [ ]*@ @g' -e 's@ @,@g'
-+else
-+ echo "ShowUsers=NotHidden"
-+fi
+if [ "$DISPLAYMANAGER_AD_INTEGRATION" = "yes" ]; then
+ echo "PluginsLogin=winbind"
+else
@@ -698,14 +668,6 @@
+ echo "PluginsLogin=generic"
+ fi
+fi
-+if [ -n "$DISPLAYMANAGER_KDM_THEME" -a -d
"/usr/share/kde4/apps/kdm/themes/$DISPLAYMANAGER_KDM_THEME" ]; then
-+ echo "Theme=/usr/share/kde4/apps/kdm/themes/$DISPLAYMANAGER_KDM_THEME"
-+ echo "UseTheme=true"
-+ echo "UseBackground=false"
-+else
-+ echo "UseTheme=false"
-+ echo "UseBackground=true"
-+fi
+# kdm has en_US as default instead of simply reading LC_LANG :(
+echo "Language="
+
++++++ plasma-kickoff-newly-collapsing.diff ++++++
--- /var/tmp/diff_new_pack.OkRsjg/_old 2013-09-09 11:12:45.000000000 +0200
+++ /var/tmp/diff_new_pack.OkRsjg/_new 2013-09-09 11:12:45.000000000 +0200
@@ -85,16 +85,7 @@
{
systemApplications = Kickoff::systemApplicationList();
reloadTimer = new QTimer(qq);
-@@ -125,6 +126,8 @@ public:
- }
-
- void fillNode(const QString &relPath, AppNode *node);
-+ void addAppNode(const QString &icon, const QString &appName, const
QString &genericName,
-+ const QString& relPath, const QString &desktopEntry, bool isDir, bool
isSeparator, AppNode *parent);
- static QHash<QString, QString> iconNameMap();
-
- ApplicationModel *q;
-@@ -137,12 +140,42 @@ public:
+@@ -137,12 +138,42 @@ public:
DisplayOrder displayOrder;
bool allowSeparators;
bool showRecentlyInstalled;
@@ -137,7 +128,7 @@
void ApplicationModelPrivate::fillNode(const QString &_relPath, AppNode *node)
{
if (_relPath=="new/") {
-@@ -170,69 +203,81 @@ void ApplicationModelPrivate::fillNode(const QString
&_relPath, AppNode *node)
+@@ -170,17 +201,59 @@ void ApplicationModelPrivate::fillNode(const QString
&_relPath, AppNode *node)
return;
}
@@ -149,223 +140,74 @@
primaryNamePolicy ==
ApplicationModel::GenericNamePrimary /* sort by generic name */);
// application name <-> service map for detecting duplicate entries
-- QHash<QString, KService::Ptr> existingServices;
+ QHash<QString, KService::Ptr> existingServices;
+ KSortableList<KSharedPtr<KSycocaEntry>,QByteArray> slist;
+ KSortableList<KSharedPtr<KSycocaEntry>,QByteArray> glist;
-+ QMap<KService::Ptr,QString> specialTitle;
// generic name <-> node mapping to determinate duplicate generic names
QHash<QString,QList<AppNode*> > genericNames;
- for (KServiceGroup::List::ConstIterator it = list.constBegin(); it !=
list.constEnd(); ++it) {
-- QString icon;
-- QString appName;
-- QString genericName;
-- QString relPath = _relPath;
-- QString desktopEntry;
-- bool isDir = false;
-- bool isSeparator = false;
- const KSycocaEntry::Ptr p = (*it);
-
- if (p->isType(KST_KService)) {
- const KService::Ptr service = KService::Ptr::staticCast(p);
-
++ for (KServiceGroup::List::ConstIterator it = list.constBegin(); it !=
list.constEnd(); ++it) {
++ const KSycocaEntry::Ptr p = (*it);
++
++ if (p->isType(KST_KService)) {
++ const KService::Ptr service = KService::Ptr::staticCast(p);
++
+ if( primaryNamePolicy == ApplicationModel::GenericNamePrimary )
+ slist.insert( nameToKey( service->genericName() +
QLatin1Char(' ') + service->name() ), p);
+ else slist.insert( nameToKey( service->name() + QLatin1Char(' ')
+ service->genericName() ), p);
-+ }
-+ else if (p->isType(KST_KServiceGroup))
-+ {
-+ KServiceGroup::Ptr serviceGroup =
KServiceGroup::Ptr::staticCast(p);
-+ if ( reduceMenuDepth && serviceGroup->SuSEshortMenu() ){
-+ KServiceGroup::List l = serviceGroup->entries(true, true
/*excludeNoDisplay_*/, false );
-+ if ( l.count() == 1 ) {
-+
-+ // the special case, we want to short the menu.
-+ // TOFIX? : this works only for one level
-+ KServiceGroup::List::ConstIterator _it=l.begin();
-+ const KSycocaEntry::Ptr _e = (*_it);
-+ if (_e->isType(KST_KService)) {
-+ const KService::Ptr s = KService::Ptr::staticCast(_e);
-+ QString key;
-+ if ( serviceGroup->SuSEgeneralDescription() )
-+ key = s->name();
-+ else {
-+ // we use the normal menu description
-+ key = s->name();
-+ if( !s->genericName().isEmpty() &&
serviceGroup->caption()!=s->genericName())
-+ key = s->name() + " (" + serviceGroup->caption() +
")";
-+ }
-+ specialTitle.insert( s, key );
-+ if( primaryNamePolicy ==
ApplicationModel::GenericNamePrimary )
-+ slist.insert( nameToKey( s->genericName() +
QLatin1Char(' ') + key ), _e );
-+ else slist.insert( nameToKey( key + QLatin1Char(' ') +
s->genericName() ), _e );
-+ // and escape from here
-+ continue;
-+ }
-+ }
-+ }
++ }
++ else if (p->isType(KST_KServiceGroup))
++ {
++ KServiceGroup::Ptr serviceGroup =
KServiceGroup::Ptr::staticCast(p);
++ if ( reduceMenuDepth && serviceGroup->SuSEshortMenu() ){
++ KServiceGroup::List l = serviceGroup->entries(true, true
/*excludeNoDisplay_*/, false );
++ if ( l.count() == 1 ) {
++
++ // the special case, we want to short the menu.
++ // TOFIX? : this works only for one level
++ KServiceGroup::List::ConstIterator _it=l.begin();
++ const KSycocaEntry::Ptr _e = (*_it);
++ if (_e->isType(KST_KService)) {
++ const KService::Ptr s = KService::Ptr::staticCast(_e);
++ if( primaryNamePolicy ==
ApplicationModel::GenericNamePrimary )
++ slist.insert( nameToKey( s->genericName() +
QLatin1Char(' ') + s->name() ), _e );
++ else slist.insert( nameToKey( s->name() +
QLatin1Char(' ') + s->genericName() ), _e );
++ // and escape from here
++ continue;
++ }
++ }
++ }
+ glist.insert( nameToKey( serviceGroup->caption() ), p );
-+ }
-+ else
-+ slist.insert( nameToKey( p->name() ), p);
-+ }
-+
-+ if (reduceMenuDepth) root->addSortOrderEntry(":F"); // add ":F" to the
sortOrder list if it isn't included (bnc#356553)
-+ list = root->SuSEsortEntries( slist, glist, true /*excludeNoDisplay_*/,
allowSeparators );
++ }
++ else
++ slist.insert( nameToKey( p->name() ), p);
++ }
+
-+ for( KServiceGroup::List::ConstIterator it = list.begin();
-+ it != list.end(); ++it)
-+ {
-+ const KSycocaEntry::Ptr p = (*it);
-+ if (p->isType(KST_KService))
-+ {
-+ const KService::Ptr service = KService::Ptr::staticCast(p);
++ if (reduceMenuDepth) root->addSortOrderEntry(":F"); // add ":F" to the
sortOrder list if it isn't included (bnc#356553)
++ list = root->SuSEsortEntries( slist, glist, true /*excludeNoDisplay_*/,
allowSeparators );
+
- if (service->noDisplay()) {
- continue;
- }
-
-- icon = service->icon();
-- appName = service->name();
-- genericName = service->genericName();
-- desktopEntry = service->entryPath();
--
-- // check for duplicates (eg. KDE 3 and KDE 4 versions of
application
-- // both present)
-- if (duplicatePolicy == ApplicationModel::ShowLatestOnlyPolicy &&
-- existingServices.contains(appName)) {
-- if (Kickoff::isLaterVersion(existingServices[appName],
service)) {
-- continue;
-- } else {
-- // find and remove the existing entry with the same name
-- for (int i = node->children.count() - 1; i >= 0; --i) {
-- AppNode *app = node->children.at(i);
-- if (app->appName == appName &&
-- app->genericName == genericName &&
-- app->iconName == icon) {
-- app = node->children.takeAt(i);
-- const QString s = app->genericName.toLower();
-- if (genericNames.contains(s)) {
-- QList<AppNode*> list = genericNames[s];
-- for (int j = list.count() - 1; j >= 0; --j) {
-- if(list.at(j) == app) {
-- list.takeAt(j);
-- }
-- }
-- genericNames[s] = list;
-- }
-- delete app;
-- }
-- }
-- }
-- }
--
- if (systemApplicationPolicy ==
ApplicationModel::ShowSystemOnlyPolicy &&
- systemApplications.contains(service->desktopEntryName())) {
- // don't duplicate applications that are configured to appear
in the System tab
-@@ -240,9 +285,25 @@ void ApplicationModelPrivate::fillNode(const QString
&_relPath, AppNode *node)
- continue;
- }
+ for (KServiceGroup::List::ConstIterator it = list.constBegin(); it !=
list.constEnd(); ++it) {
+ QString icon;
+ QString appName;
+@@ -238,7 +251,15 @@ void ApplicationModelPrivate::fillNode(const QString
&_relPath, AppNode *node)
-- existingServices[appName] = service;
-+ QString icon = service->icon();
-+
-+ QString name = specialTitle[service];
-+ if (name.isEmpty())
-+ name = service->name();
-+
-+ QString genericName = service->genericName();
-+
-+ addAppNode(icon, name, genericName, _relPath, service->entryPath(),
false, false, node);
+ existingServices[appName] = service;
} else if (p->isType(KST_KServiceGroup)) {
- const KServiceGroup::Ptr serviceGroup =
KServiceGroup::Ptr::staticCast(p);
-+ KServiceGroup::Ptr serviceGroup = KServiceGroup::Ptr::staticCast(p);
++ KServiceGroup::Ptr serviceGroup =
KServiceGroup::Ptr::staticCast(p);
+
-+ if ( reduceMenuDepth && serviceGroup->SuSEshortMenu() ){
-+ KServiceGroup::List l = serviceGroup->entries(true, true
/*excludeNoDisplay_*/ );
++ if ( reduceMenuDepth && serviceGroup->SuSEshortMenu() ) {
++ KServiceGroup::List l = serviceGroup->entries(true, true
/*excludeNoDisplay_*/ );
+ if ( l.count() == 1 )
-+ continue;
-+ }
-+ // standard sub menu
++ continue;
++ }
+
++ // standard sub menu
if (serviceGroup->noDisplay() || serviceGroup->childCount() == 0)
{
continue;
-@@ -251,42 +312,29 @@ void ApplicationModelPrivate::fillNode(const QString
&_relPath, AppNode *node)
- kDebug(250) << "Service group" << serviceGroup->entryPath() <<
serviceGroup->icon()
- << serviceGroup->relPath() << serviceGroup->directoryEntryPath();
-
-- icon = serviceGroup->icon();
-+ QString icon = serviceGroup->icon();
- if (iconNameMap().contains(icon)) {
- icon = iconNameMap().value(icon);
- }
-
-- desktopEntry = serviceGroup->entryPath();
-- genericName = serviceGroup->caption();
-- relPath = serviceGroup->relPath();
-- appName = serviceGroup->comment();
-- isDir = true;
-+ addAppNode(icon, serviceGroup->comment(),
serviceGroup->caption(), serviceGroup->relPath(), QString(), true, false, node);
-+
- } else if (p->isType(KST_KServiceSeparator)) {
-- isSeparator = true;
-+ addAppNode(QString(), QString(), QString(), _relPath, QString(),
false, true /*isSeparator*/, node);
- } else {
- kWarning(250) << "KServiceGroup: Unexpected object in list!";
- continue;
- }
-
-- AppNode *newnode = new AppNode();
-- newnode->iconName = icon;
-- newnode->icon = KIcon(icon);
-- newnode->appName = appName;
-- newnode->genericName = genericName;
-- newnode->relPath = relPath;
-- newnode->desktopEntry = desktopEntry;
-- newnode->isDir = isDir;
-- newnode->isSeparator = isSeparator;
-- newnode->parent = node;
-- node->children.append(newnode);
--
-+#if 0
- if (p->isType(KST_KService)) {
- const QString s = genericName.toLower();
- QList<AppNode*> list = genericNames.value(s);
- list.append(newnode);
- genericNames[s] = list;
- }
-- }
-+#endif
-+ }
-
- if (showRecentlyInstalled && _relPath.isEmpty() &&
!newInstalledPrograms.isEmpty()) {
- AppNode *newnode = new AppNode();
-@@ -310,6 +358,22 @@ void ApplicationModelPrivate::fillNode(const QString
&_relPath, AppNode *node)
- }
- }
-
-+void ApplicationModelPrivate::addAppNode(const QString &icon, const QString
&appName, const QString &genericName,
-+ const QString& relPath, const QString &desktopEntry, bool isDir, bool
isSeparator, AppNode *parent )
-+{
-+ AppNode *newnode = new AppNode();
-+ newnode->iconName = icon;
-+ newnode->icon = KIcon(icon);
-+ newnode->appName = appName;
-+ newnode->genericName = genericName;
-+ newnode->relPath = relPath;
-+ newnode->desktopEntry = desktopEntry;
-+ newnode->isDir = isDir;
-+ newnode->isSeparator = isSeparator;
-+ newnode->parent = parent;
-+ parent->children.append(newnode);
-+}
-+
- ApplicationModel::ApplicationModel(QObject *parent, bool allowSeparators)
- : KickoffAbstractModel(parent),
- d(new ApplicationModelPrivate(this, allowSeparators))
-@@ -358,6 +422,19 @@ bool ApplicationModel::showRecentlyInstalled() const
+@@ -358,6 +391,19 @@ bool ApplicationModel::showRecentlyInstalled() const
return d->showRecentlyInstalled;
}
++++++ sysconfig.displaymanager-kdm ++++++
--- /var/tmp/diff_new_pack.OkRsjg/_old 2013-09-09 11:12:45.000000000 +0200
+++ /var/tmp/diff_new_pack.OkRsjg/_new 2013-09-09 11:12:45.000000000 +0200
@@ -1,37 +1,14 @@
## Path: Desktop/Display manager
## Description: settings to generate a proper displaymanager config
-## Config: kdm3
-
-## Type: string
-## Default:
-#
-# space separated list of users for which icons should be shown in KDM
-# if empty, then take system defaults
-#
-KDM_USERS=""
-
-## Type: string
-## Default:
-#
-# Special greeting words in kdm
-#
-KDM_GREETSTRING=""
+## Config: kdm
## Type: string
-## Default:
+## Default:
#
# Defines extra Server Arguments given to the kdm display manager when
# starting a local display. Useful to override e.g. the -dpi setting.
-#
-DISPLAYMANAGER_KDM_LOCALARGS=""
-
-## Type: string
-## Default: SUSE
#
-# Define the theme to be used by kdm. If empty, the traditional login
-# window is used (which lacks some features)
-#
-DISPLAYMANAGER_KDM_THEME="elarun"
+DISPLAYMANAGER_KDM_LOCALARGS=""
## Type: yesno
## Default: yes
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
