yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use kwin_ instead of libkwin

Browse source 
svn path=/trunk/kdebase/kwin/; revision=137446
This commit is contained in:
Stephan Kulow 2002-02-19 16:56:16 +00:00
parent 1abedf6fb5
commit e3e09f533d
39 changed files with 114 additions and 111 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
clients/b2/Makefile.am
View file

@ -3,11 +3,11 @@ INCLUDES = $(all_includes)
SUBDIRS = . config
kde_module_LTLIBRARIES = libkwinb2.la
kde_module_LTLIBRARIES = kwin_b2.la
libkwinb2_la_SOURCES = b2client.cpp
libkwinb2_la_LIBADD = ../../kwin.la
libkwinb2_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
kwin_b2_la_SOURCES = b2client.cpp
kwin_b2_la_LIBADD = ../../kwin.la
kwin_b2_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
METASOURCES = AUTO
noinst_HEADERS = b2client.h

2
clients/b2/b2.desktop
View file

@ -3,4 +3,4 @@ Encoding=UTF-8
Name=B II
Name[af]=b ii
Name[xx]=xx
X-KDE-Library=libkwinb2
X-KDE-Library=kwin_b2

10
clients/b2/config/Makefile.am
View file

@ -1,10 +1,10 @@
INCLUDES = $(all_includes)
kde_module_LTLIBRARIES = libkwinb2_config.la
kde_module_LTLIBRARIES = kwin_b2_config.la
libkwinb2_config_la_SOURCES = config.cpp
libkwinb2_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
libkwinb2_config_la_LIBADD = $(LIB_KDEUI)
kwin_b2_config_la_SOURCES = config.cpp
kwin_b2_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
kwin_b2_config_la_LIBADD = $(LIB_KDEUI)
METASOURCES = AUTO
noinst_HEADERS = config.h
@ -12,7 +12,7 @@ noinst_HEADERS = config.h
lnkdir = $(kde_datadir)/kwin/
messages:
$(XGETTEXT) *.cpp -o $(podir)/libkwinb2_config.pot
$(XGETTEXT) *.cpp -o $(podir)/kwin_b2_config.pot
###KMAKE-start (don't edit or delete this block)

4
clients/b2/config/config.cpp
View file

@ -1,5 +1,5 @@
/*
* $Id:$
* $Id$
*
* This file contains the B2 configuration widget
*
@ -35,7 +35,7 @@ B2Config::B2Config( KConfig* conf, QWidget* parent )
: QObject( parent )
{
b2Config = new KConfig("kwinb2rc");
KGlobal::locale()->insertCatalogue("libkwinquartz_config");
KGlobal::locale()->insertCatalogue("kwinquartz_config");
gb = new QGroupBox( 1, Qt::Horizontal,
i18n("Decoration Settings"), parent );
cbColorBorder = new QCheckBox(

8
clients/default/Makefile.am
View file

@ -3,11 +3,11 @@ INCLUDES = $(all_includes)
SUBDIRS = . config
kde_module_LTLIBRARIES = libkwindefault.la
kde_module_LTLIBRARIES = kwin_default.la
libkwindefault_la_SOURCES = kdedefault.cpp
libkwindefault_la_LIBADD = ../../kwin.la
libkwindefault_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
kwin_default_la_SOURCES = kdedefault.cpp
kwin_default_la_LIBADD = ../../kwin.la
kwin_default_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
METASOURCES = AUTO
noinst_HEADERS = kdedefault.h

10
clients/default/config/Makefile.am
View file

@ -1,10 +1,10 @@
INCLUDES = $(all_includes)
kde_module_LTLIBRARIES = libkwindefault_config.la
kde_module_LTLIBRARIES = kwin_default_config.la
libkwindefault_config_la_SOURCES = config.cpp
libkwindefault_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
libkwindefault_config_la_LIBADD = $(LIB_KDEUI)
kwin_default_config_la_SOURCES = config.cpp
kwin_default_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
kwin_default_config_la_LIBADD = $(LIB_KDEUI)
METASOURCES = AUTO
noinst_HEADERS = config.h
@ -12,7 +12,7 @@ noinst_HEADERS = config.h
lnkdir = $(kde_datadir)/kwin/
messages:
$(XGETTEXT) *.cpp -o $(podir)/libkwindefault_config.pot
$(XGETTEXT) *.cpp -o $(podir)/kwindefault_config.pot
###KMAKE-start (don't edit or delete this block)

2
clients/default/config/config.cpp
View file

@ -31,7 +31,7 @@ extern "C"
KDEDefaultConfig::KDEDefaultConfig( KConfig* conf, QWidget* parent )
: QObject( parent )
{
KGlobal::locale()->insertCatalogue("libkwindefault_config");
KGlobal::locale()->insertCatalogue("kwin_default_config");
highcolor = QPixmap::defaultDepth() > 8;
gb = new QGroupBox( 1, Qt::Horizontal,
i18n("Decoration Settings"), parent );

8
clients/icewm/Makefile.am
View file

@ -2,11 +2,11 @@ INCLUDES = $(all_includes)
SUBDIRS = . config icewm-themes
kde_module_LTLIBRARIES = libkwinicewm.la
kde_module_LTLIBRARIES = kwin_icewm.la
libkwinicewm_la_SOURCES = icewm.cpp
libkwinicewm_la_LIBADD = ../../kwin.la
libkwinicewm_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
kwin_icewm_la_SOURCES = icewm.cpp
kwin_icewm_la_LIBADD = ../../kwin.la
kwin_icewm_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
METASOURCES = AUTO
noinst_HEADERS = icewm.h

10
clients/icewm/config/Makefile.am
View file

@ -1,10 +1,10 @@
INCLUDES = $(all_includes)
kde_module_LTLIBRARIES = libkwinicewm_config.la
kde_module_LTLIBRARIES = kwin_icewm_config.la
libkwinicewm_config_la_SOURCES = config.cpp
libkwinicewm_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
libkwinicewm_config_la_LIBADD = $(LIB_KDEUI) $(LIB_KFILE)
kwin_icewm_config_la_SOURCES = config.cpp
kwin_icewm_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
kwin_icewm_config_la_LIBADD = $(LIB_KDEUI) $(LIB_KFILE)
METASOURCES = AUTO
noinst_HEADERS = config.h
@ -12,7 +12,7 @@ noinst_HEADERS = config.h
lnkdir = $(kde_datadir)/kwin/
messages:
$(XGETTEXT) *.cpp -o $(podir)/libkwinicewm_config.pot
$(XGETTEXT) *.cpp -o $(podir)/kwinicewm_config.pot
###KMAKE-start (don't edit or delete this block)

2
clients/icewm/config/config.cpp
View file

@ -57,7 +57,7 @@ IceWMConfig::IceWMConfig( KConfig* conf, QWidget* parent )
: QObject( parent )
{
icewmConfig = new KConfig("kwinicewmrc");
KGlobal::locale()->insertCatalogue("libkwinicewm_config");
KGlobal::locale()->insertCatalogue("kwin_icewm_config");
gb1 = new QGroupBox( 1, Qt::Horizontal,
i18n("IceWM Theme Selector"), parent );

2
clients/icewm/icewm.desktop
View file

@ -5,4 +5,4 @@ Name[af]=icewm
Name[xh]=UmkhenkceWM
Name[xx]=xx
Name[zu]=Iqhwa leWM
X-KDE-Library=libkwinicewm
X-KDE-Library=kwin_icewm

8
clients/kde1/Makefile.am
View file

@ -1,11 +1,11 @@
INCLUDES = $(all_includes)
kde_module_LTLIBRARIES = libkwinkde1.la
kde_module_LTLIBRARIES = kwin_kde1.la
libkwinkde1_la_SOURCES = kde1client.cpp
libkwinkde1_la_LIBADD = ../../kwin.la
libkwinkde1_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
kwin_kde1_la_SOURCES = kde1client.cpp
kwin_kde1_la_LIBADD = ../../kwin.la
kwin_kde1_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
METASOURCES = AUTO
noinst_HEADERS = kde1client.h

2
clients/kde1/kde1.desktop
View file

@ -3,4 +3,4 @@ Encoding=UTF-8
Name=KDE 1
Name[af]=kde 1
Name[xx]=xx
X-KDE-Library=libkwinkde1
X-KDE-Library=kwin_kde1

8
clients/kstep/Makefile.am
View file

@ -1,11 +1,11 @@
INCLUDES = $(all_includes)
kde_module_LTLIBRARIES = libkwinkstep.la
kde_module_LTLIBRARIES = kwin_kstep.la
libkwinkstep_la_SOURCES = nextclient.cpp
libkwinkstep_la_LIBADD = ../../kwin.la
libkwinkstep_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
kwin_kstep_la_SOURCES = nextclient.cpp
kwin_kstep_la_LIBADD = ../../kwin.la
kwin_kstep_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
METASOURCES = AUTO
noinst_HEADERS = nextclient.h

3
clients/kstep/kstep.desktop
View file

@ -3,11 +3,10 @@ Encoding=UTF-8
Name=KStep
Name[af]=kstep
Name[eo]=Step
Name[fr]=kStep
Name[mi]=KHïkoi
Name[nb]=KSteg
Name[sv]=Kstep
Name[xh]=Inqwanqwa le K
Name[xx]=xx
Name[zu]=Izinga le K
X-KDE-Library=libkwinkstep
X-KDE-Library=kwin_kstep

8
clients/kwmtheme/Makefile.am
View file

@ -1,11 +1,11 @@
SUBDIRS=cli_installer
INCLUDES = $(all_includes)
kde_module_LTLIBRARIES = libkwinkwmtheme.la
kde_module_LTLIBRARIES = kwin_kwmtheme.la
libkwinkwmtheme_la_SOURCES = kwmthemeclient.cpp
libkwinkwmtheme_la_LIBADD = ../../kwin.la
libkwinkwmtheme_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
kwin_kwmtheme_la_SOURCES = kwmthemeclient.cpp
kwin_kwmtheme_la_LIBADD = ../../kwin.la
kwin_kwmtheme_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
METASOURCES = AUTO
noinst_HEADERS = kwmthemeclient.h

8
clients/kwmtheme/kwmtheme.desktop
View file

@ -4,6 +4,7 @@ Name=KWM Theme
Name[af]=kwm tema
Name[ar]=تيمة KWM
Name[az]=KWM Örtüsü
Name[be]=Тэма KWM
Name[bg]=Тема KWM
Name[br]=Gwiskad KWM
Name[bs]=KWM Tema
@ -17,7 +18,7 @@ Name[es]=Tema de KWM
Name[et]=KWM teema
Name[eu]=KWM Tema
Name[fi]=KWM-teema
Name[fr]=Thème kWM
Name[fr]=Thème KWM
Name[gl]=Tema do KWM
Name[hr]=KWM Tema
Name[hu]=KWM téma
@ -26,7 +27,7 @@ Name[is]=KWM þema
Name[it]=Tema KWM
Name[ja]=KWM テーマ
Name[ko]=KWM 테마
Name[lt]=KWM Tema
Name[lt]=KWM tema
Name[lv]=KWM Tēma
Name[mi]=Kaupapa KWM
Name[mk]=KWM тема
@ -38,6 +39,7 @@ Name[oc]=Tema KWM
Name[pl]=Motyw KWM
Name[pt]=Tema KWM
Name[pt_BR]=Tema KWM
Name[ro]=Tematică KWM
Name[ru]=Стиль KWM
Name[sk]=Téma KWM
Name[sl]=Tema KWM
@ -51,4 +53,4 @@ Name[xx]=xx
Name[zh_CN]=KWM 主题
Name[zh_TW]=KWM 主題
Name[zu]=Isigaba bizo se KWM
X-KDE-Library=libkwinkwmtheme
X-KDE-Library=kwin_kwmtheme

8
clients/laptop/Makefile.am
View file

@ -1,11 +1,11 @@
INCLUDES = $(all_includes)
kde_module_LTLIBRARIES = libkwinlaptop.la
kde_module_LTLIBRARIES = kwin_laptop.la
libkwinlaptop_la_SOURCES = laptopclient.cpp
libkwinlaptop_la_LIBADD = ../../kwin.la
libkwinlaptop_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
kwin_laptop_la_SOURCES = laptopclient.cpp
kwin_laptop_la_LIBADD = ../../kwin.la
kwin_laptop_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
METASOURCES = AUTO
noinst_HEADERS = laptopclient.h

2
clients/laptop/laptop.desktop
View file

@ -33,4 +33,4 @@ Name[xx]=xx
Name[zh_CN]=膝上计算机
Name[zh_TW]=膝上型的電腦
Name[zu]=Ikhomputha elucezu
X-KDE-Library=libkwinlaptop
X-KDE-Library=kwin_laptop

8
clients/modernsystem/Makefile.am
View file

@ -4,11 +4,11 @@ INCLUDES = $(all_includes)
SUBDIRS = config
kde_module_LTLIBRARIES = libkwinmodernsys.la
kde_module_LTLIBRARIES = kwin_modernsys.la
libkwinmodernsys_la_SOURCES = modernsys.cpp
libkwinmodernsys_la_LIBADD = ../../kwin.la
libkwinmodernsys_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
kwin_modernsys_la_SOURCES = modernsys.cpp
kwin_modernsys_la_LIBADD = ../../kwin.la
kwin_modernsys_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
METASOURCES = AUTO
noinst_HEADERS = modernsys.h

10
clients/modernsystem/config/Makefile.am
View file

@ -2,11 +2,11 @@
INCLUDES = $(all_includes)
kde_module_LTLIBRARIES = libkwinmodernsys_config.la
kde_module_LTLIBRARIES = kwin_modernsys_config.la
libkwinmodernsys_config_la_SOURCES = config.cpp
libkwinmodernsys_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
libkwinmodernsys_config_la_LIBADD = $(LIB_KDEUI)
kwin_modernsys_config_la_SOURCES = config.cpp
kwin_modernsys_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
kwin_modernsys_config_la_LIBADD = $(LIB_KDEUI)
METASOURCES = AUTO
noinst_HEADERS = config.h
@ -14,4 +14,4 @@ noinst_HEADERS = config.h
lnkdir = $(kde_datadir)/kwin/
messages:
$(XGETTEXT) *.cpp -o $(podir)/libkwinmodernsys_config.pot
$(XGETTEXT) *.cpp -o $(podir)/kwinmodernsys_config.pot

2
clients/modernsystem/config/config.cpp
View file

@ -26,7 +26,7 @@ extern "C"
ModernSysConfig::ModernSysConfig(KConfig* conf, QWidget* parent) : QObject(parent)
{
clientrc = new KConfig("kwinmodernsysrc");
KGlobal::locale()->insertCatalogue("libkwinmodernsys_config");
KGlobal::locale()->insertCatalogue("kwin_modernsys_config");
mainw = new QWidget(parent);
vbox = new QVBoxLayout(mainw);
vbox->setSpacing(6);

2
clients/modernsystem/modernsystem.desktop
View file

@ -1,4 +1,4 @@
[Desktop Entry]
Encoding=UTF-8
Name=ModSystem
X-KDE-Library=libkwinmodernsys
X-KDE-Library=kwin_modernsys

8
clients/quartz/Makefile.am
View file

@ -3,11 +3,11 @@ INCLUDES = $(all_includes)
SUBDIRS = . config
kde_module_LTLIBRARIES = libkwinquartz.la
kde_module_LTLIBRARIES = kwin_quartz.la
libkwinquartz_la_SOURCES = quartz.cpp
libkwinquartz_la_LIBADD = ../../kwin.la
libkwinquartz_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
kwin_quartz_la_SOURCES = quartz.cpp
kwin_quartz_la_LIBADD = ../../kwin.la
kwin_quartz_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
METASOURCES = AUTO
noinst_HEADERS = quartz.h

10
clients/quartz/config/Makefile.am
View file

@ -1,10 +1,10 @@
INCLUDES = $(all_includes)
kde_module_LTLIBRARIES = libkwinquartz_config.la
kde_module_LTLIBRARIES = kwin_quartz_config.la
libkwinquartz_config_la_SOURCES = config.cpp
libkwinquartz_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
libkwinquartz_config_la_LIBADD = $(LIB_KDEUI)
kwin_quartz_config_la_SOURCES = config.cpp
kwin_quartz_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
kwin_quartz_config_la_LIBADD = $(LIB_KDEUI)
METASOURCES = AUTO
noinst_HEADERS = config.h
@ -12,7 +12,7 @@ noinst_HEADERS = config.h
lnkdir = $(kde_datadir)/kwin/
messages:
$(XGETTEXT) *.cpp -o $(podir)/libkwinquartz_config.pot
$(XGETTEXT) *.cpp -o $(podir)/kwin_quartz_config.pot
###KMAKE-start (don't edit or delete this block)

2
clients/quartz/config/config.cpp
View file

@ -35,7 +35,7 @@ QuartzConfig::QuartzConfig( KConfig* conf, QWidget* parent )
: QObject( parent )
{
quartzConfig = new KConfig("kwinquartzrc");
KGlobal::locale()->insertCatalogue("libkwinquartz_config");
KGlobal::locale()->insertCatalogue("kwin_quartz_config");
gb = new QGroupBox( 1, Qt::Horizontal,
i18n("Decoration Settings"), parent );
cbColorBorder = new QCheckBox(

3
clients/quartz/quartz.desktop
View file

@ -12,6 +12,7 @@ Name[lv]=Kvarcs
Name[mt]=Kwartz
Name[pl]=Kwarc
Name[pt_BR]=Quartzo
Name[ro]=Cuarţ
Name[ru]=Кварц
Name[tr]=Kuartz
Name[uk]=Кварц
@ -20,4 +21,4 @@ Name[xx]=xx
Name[zh_CN]=水晶
Name[zh_TW]=石英
Name[zu]=Iminerali embiwa emayini ephethe isilika
X-KDE-Library=libkwinquartz
X-KDE-Library=kwin_quartz

8
clients/redmond/Makefile.am
View file

@ -1,11 +1,11 @@
INCLUDES = $(all_includes)
kde_module_LTLIBRARIES = libkwinredmond.la
kde_module_LTLIBRARIES = kwin_redmond.la
libkwinredmond_la_SOURCES = redmond.cpp
libkwinredmond_la_LIBADD = ../../kwin.la
libkwinredmond_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
kwin_redmond_la_SOURCES = redmond.cpp
kwin_redmond_la_LIBADD = ../../kwin.la
kwin_redmond_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
METASOURCES = AUTO
noinst_HEADERS = redmond.h

2
clients/redmond/redmond.desktop
View file

@ -9,4 +9,4 @@ Name[pt_BR]=Demônio
Name[xh]=iRedmond
Name[xx]=xx
Name[zu]=I Redmond
X-KDE-Library=libkwinredmond
X-KDE-Library=kwin_redmond

8
clients/riscos/Makefile.am
View file

@ -1,8 +1,8 @@
INCLUDES = $(all_includes)
kde_module_LTLIBRARIES = libkwinriscos.la
kde_module_LTLIBRARIES = kwin_riscos.la
libkwinriscos_la_SOURCES = \
kwin_riscos_la_SOURCES = \
Button.cpp \
CloseButton.cpp \
IconifyButton.cpp \
@ -12,8 +12,8 @@ MaximiseButton.cpp \
StickyButton.cpp \
HelpButton.cpp \
Static.cpp
libkwinriscos_la_LIBADD = ../../kwin.la
libkwinriscos_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
kwin_riscos_la_LIBADD = ../../kwin.la
kwin_riscos_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
METASOURCES = AUTO
noinst_HEADERS = \

3
clients/riscos/riscos.desktop
View file

@ -2,6 +2,7 @@
Encoding=UTF-8
Name=RISC OS
Name[af]=risc os
Name[be]=RISC АС
Name[cs]=Risc OS
Name[da]=Risc OS
Name[de]=RISC-OS
@ -13,4 +14,4 @@ Name[uk]=RISC ОС
Name[xh]=i RISC OS
Name[xx]=xx
Name[zu]=IRISC OS
X-KDE-Library=libkwinriscos
X-KDE-Library=kwin_riscos

8
clients/system/Makefile.am
View file

@ -1,11 +1,11 @@
INCLUDES = $(all_includes)
kde_module_LTLIBRARIES = libkwinsystem.la
kde_module_LTLIBRARIES = kwin_system.la
libkwinsystem_la_SOURCES = systemclient.cpp
libkwinsystem_la_LIBADD = ../../kwin.la
libkwinsystem_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
kwin_system_la_SOURCES = systemclient.cpp
kwin_system_la_LIBADD = ../../kwin.la
kwin_system_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
METASOURCES = AUTO
noinst_HEADERS = systemclient.h

2
clients/system/system.desktop
View file

@ -23,4 +23,4 @@ Name[tr]=Sistem++
Name[xh]=Indlela esetyenziswayo++
Name[xx]=xx
Name[zu]=Indlela esetshenziswayo++
X-KDE-Library=libkwinsystem
X-KDE-Library=kwin_system

8
clients/web/Makefile.am
View file

@ -1,7 +1,7 @@
INCLUDES = -I$(top_srcdir) $(all_includes)
kde_module_LTLIBRARIES = libkwinweb.la
kde_module_LTLIBRARIES = kwin_web.la
libkwinweb_la_SOURCES = \
kwin_web_la_SOURCES = \
Web.cpp \
WebButton.cpp \
WebButtonClose.cpp \
@ -21,8 +21,8 @@ noinst_HEADERS = \
WebButtonMaximize.h \
WebButtonSticky.h
libkwinweb_la_LIBADD = ../../kwin.la
libkwinweb_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
kwin_web_la_LIBADD = ../../kwin.la
kwin_web_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
METASOURCES = AUTO
linkdir = $(kde_datadir)/kwin/

2
clients/web/web.desktop
View file

@ -18,4 +18,4 @@ Name[uk]=Тенета
Name[xh]=iWeb
Name[xx]=xx
Name[zu]=I Web
X-KDE-Library=libkwinweb
X-KDE-Library=kwin_web

8
kcmkwin/kwindecoration/Makefile.am
View file

@ -1,14 +1,14 @@
INCLUDES = $(all_includes)
kde_module_LTLIBRARIES = libkcm_kwindecoration.la
kde_module_LTLIBRARIES = kcm_kwindecoration.la
libkcm_kwindecoration_la_SOURCES = kwindecoration.cpp buttons.cpp kwindecorationIface.skel
kcm_kwindecoration_la_SOURCES = kwindecoration.cpp buttons.cpp kwindecorationIface.skel
noinst_HEADERS = kwindecoration.h kwindecorationIface.h buttons.h
libkcm_kwindecoration_la_LDFLAGS = \
kcm_kwindecoration_la_LDFLAGS = \
-module -avoid-version $(all_libraries) -no-undefined
libkcm_kwindecoration_la_LIBADD = $(LIB_KDEUI)
kcm_kwindecoration_la_LIBADD = $(LIB_KDEUI)
METASOURCES = AUTO

8
kcmkwin/kwindecoration/kwindecoration.cpp
View file

@ -246,7 +246,7 @@ QString KWinDecorationModule::decorationLibName( const QString& name )
}
if (libName.isEmpty())
libName = "libkwindefault";
libName = "kwin_default";
return libName;
}
@ -256,8 +256,8 @@ QString KWinDecorationModule::decorationLibName( const QString& name )
// pluginPage, allowing for dynamic configuration of decorations
void KWinDecorationModule::resetPlugin( KConfig* conf, const QString* currentDecoName )
{
// Config names are "libkwinicewm_config"
// for "libkwinicewm" kwin client
// Config names are "kwin_icewm_config"
// for "kwin_icewm" kwin client
QString oldName = oldLibraryName;
oldName += "_config";
@ -330,7 +330,7 @@ void KWinDecorationModule::readConfig( KConfig* conf )
// the current plugin library name
oldLibraryName = currentLibraryName;
currentLibraryName = conf->readEntry("PluginLib", "libkwindefault");
currentLibraryName = conf->readEntry("PluginLib", "kwin_default");
QString decoName = decorationName( currentLibraryName );
// If we are using the "default" kde client, use the "default" entry.

8
kcmkwin/kwinoptions/Makefile.am
View file

@ -4,11 +4,11 @@
METASOURCES = AUTO
INCLUDES = $(all_includes)
kde_module_LTLIBRARIES = libkcm_kwinoptions.la
kde_module_LTLIBRARIES = kcm_kwinoptions.la
libkcm_kwinoptions_la_SOURCES = windows.cpp mouse.cpp main.cpp
libkcm_kwinoptions_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined
libkcm_kwinoptions_la_LIBADD = $(LIB_KDEUI)
kcm_kwinoptions_la_SOURCES = windows.cpp mouse.cpp main.cpp
kcm_kwinoptions_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined
kcm_kwinoptions_la_LIBADD = $(LIB_KDEUI)
noinst_HEADERS = windows.h mouse.h main.h

2
plugins.cpp
View file

@ -25,7 +25,7 @@ Copyright (C) 1999, 2000 Daniel M. Duley <mosfet@kde.org>
using namespace KWinInternal;
const char* defaultPlugin = "libkwindefault";
const char* defaultPlugin = "kwin_default";
PluginMgr::PluginMgr()