File contains conflict markers

[Oscar Fuentes]

This is Kubuntu 13.10 AMD64.

The file /usr/share/kde4/services/muon-knsplasmoids-backend.desktop contains conflict markers. At line 110:

<<<<<<< HEAD
=======
>>>>>>> 2.0
X-KDE-Library=muon-knsbackend

Due to some other (possibly unrelated) problem I was forced to run

kbuildsycoca4 --noincremental

which complained

"KConfigIni: In file /usr/share/kde4/services/muon-knsplasmoids-backend.desktop, line 110: " Invalid entry (missing '=')
"KConfigIni: In file /usr/share/kde4/services/muon-knsplasmoids-backend.desktop, line 111: " Invalid entry (empty key)
"KConfigIni: In file /usr/share/kde4/services/muon-knsplasmoids-backend.desktop, line 112: " Invalid entry (missing '=')

[Logan Rosen (logan)]

Looks like the conflict was introduced in this upstream commit: https://projects.kde.org/projects/extragear/sysadmin/muon/repository/revisions/586f2fb36b1a115c82fbffd2d223c11314379e12

Does the software still launch when you run this command, even though it complains? I'm going to mark this as low importance in that case, as it doesn't really hinder the functionality of the software.

Also, would you mind forwarding this bug to KDE so that it can be fixed upstream? You can do this at https://bugs.kde.org/. Once you have done that, please add it as a bug watch, as described here: https://wiki.ubuntu.com/Bugs/Watches

[Ofv (ofv)]

The file /usr/share/kde4/services/muon-knsplasmoids-backend.desktop contains conflict markers. At line 110:

<<<<<<< HEAD
 =======
 >>>>>>> 2.0
 X-KDE-Library=muon-knsbackend

Due to some other (possibly unrelated) problem I was forced to run

kbuildsycoca4 --noincremental

which complained

"KConfigIni: In file /usr/share/kde4/services/muon-knsplasmoids-backend.desktop, line 110: " Invalid entry (missing '=')
 "KConfigIni: In file /usr/share/kde4/services/muon-knsplasmoids-backend.desktop, line 111: " Invalid entry (empty key)
 "KConfigIni: In file /usr/share/kde4/services/muon-knsplasmoids-backend.desktop, line 112: " Invalid entry (missing '=')

Reproducible: Always

[Oscar Fuentes (oscarfv)]

I discovered the problem while trying to solve an issue with widget styles: when a KDE application started, it ignored the widget style specified on System Settings and defaulted to some ugly style. Re-setting the widget style and applying the change on System Settings made the running applications to obey the setting but upon closing an application and re-launching it ignored the setting again.

Browsing the 'net I discovered some old reports that recommended to delete .config/Trolltech.conf and run

kbuildsycoca4 --noincremental

which pointed to the faulty file. I didn't change it. The command just created a new Trolltech.conf file and the problem with the widget styles is gone but, looking for related problems, just tried Muon Software Center and it crashes a few seconds after opening. The Crash Reporting Assistant pops out but it wants to install the debug info for creating a better backtrace.

I don't care about Muon Software Center and I guess that this crash is specific to my machine (otherwise you would already know about it) so I'm reluctant about going ahead with the crash report and install a ton of debug info, but if you are interested on it, I'll do it.

[Harald Sitter (apachelogger)]

Git commit 5705d05d4fe570e64d8a2843f7f6c8d7faba8029 by Harald Sitter.
Committed on 19/10/2013 at 00:36.
Pushed by sitter into branch 'master'.

drop conflict markers introduced by recent merge

CCMAIL: <email address hidden>

M +1 -3 libmuon/backends/KNSBackend/muon-knsplasmoids-backend.desktop

http://commits.kde.org/muon/5705d05d4fe570e64d8a2843f7f6c8d7faba8029

diff --git a/libmuon/backends/KNSBackend/muon-knsplasmoids-backend.desktop b/libmuon/backends/KNSBackend/muon-knsplasmoids-backend.desktop
index 343b391..9a203d4 100644
--- a/libmuon/backends/KNSBackend/muon-knsplasmoids-backend.desktop
+++ b/libmuon/backends/KNSBackend/muon-knsplasmoids-backend.desktop
@@ -116,9 +116,7 @@ Comment[uk]=Встановіть плазмоїди і зробіть ваш р
 Comment[x-test]=xxInstall plasmoids and raise the power of your workspace!xx
 Comment[zh_CN]=安装 plasmoids，让您的工作区更强大！
 Comment[zh_TW]=安裝小元件，提升您的工作空間的能量！
-<<<<<<< HEAD
-=======
->>>>>>> 2.0
+
 X-KDE-Library=muon-knsbackend
 X-KDE-PluginInfo-Name=muon-knsbackend-plasmoids
 X-KDE-PluginInfo-License=GPL