summaryrefslogtreecommitdiff
path: root/plugins/ini
diff options
context:
space:
mode:
authorDennis Kasprzyk <onestone@compiz-fusion.org>2009-03-15 06:11:33 +0100
committerDennis kasprzyk <onestone@compiz-fusion.org>2009-03-15 06:11:33 +0100
commited8f8dbb6da323eac58cdefaf07cbc0e6dd5ba69 (patch)
treebca329556da883782f6ee12dbb17eb4e080f3888 /plugins/ini
parent163f6b6f3c3b7764987cbdf8e03cc355edeaa499 (diff)
parent47d457aef6456c12072a6b89101398c0993e3afd (diff)
downloadcompiz-with-glib-mainloop-ed8f8dbb6da323eac58cdefaf07cbc0e6dd5ba69.tar.gz
compiz-with-glib-mainloop-ed8f8dbb6da323eac58cdefaf07cbc0e6dd5ba69.tar.bz2
Merge branch 'master' of git+ssh://git.compiz-fusion.org/git/compiz/core
Diffstat (limited to 'plugins/ini')
-rw-r--r--plugins/ini/src/ini.cpp2
-rw-r--r--plugins/ini/src/ini.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/plugins/ini/src/ini.cpp b/plugins/ini/src/ini.cpp
index a7a610d..4d7f010 100644
--- a/plugins/ini/src/ini.cpp
+++ b/plugins/ini/src/ini.cpp
@@ -565,7 +565,7 @@ IniScreen::initPluginForScreen (CompPlugin *p)
}
IniScreen::IniScreen (CompScreen *screen) :
- PrivateHandler<IniScreen, CompScreen> (screen),
+ PluginClassHandler<IniScreen, CompScreen> (screen),
directoryWatchHandle (0),
blockWrites (false)
{
diff --git a/plugins/ini/src/ini.h b/plugins/ini/src/ini.h
index 0790072..f64e7d9 100644
--- a/plugins/ini/src/ini.h
+++ b/plugins/ini/src/ini.h
@@ -31,7 +31,7 @@
#include <fstream>
#include <core/core.h>
-#include <core/privatehandler.h>
+#include <core/pluginclasshandler.h>
#define HOME_OPTIONDIR ".compiz/options"
#define CORE_NAME "general"
@@ -39,7 +39,7 @@
class IniScreen :
public ScreenInterface,
- public PrivateHandler<IniScreen, CompScreen>
+ public PluginClassHandler<IniScreen, CompScreen>
{
public:
IniScreen (CompScreen *screen);