8 files changed, 0 insertions, 107 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 101597ea6..f0991c145 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -138,7 +138,6 @@ add_subdirectory(launcher)
 add_subdirectory(shortcuts)
 add_subdirectory(unity-standalone)
 add_subdirectory(plugins/unityshell)
-add_subdirectory(plugins/gtkloader)
 add_subdirectory(plugins/networkarearegion)
 add_subdirectory(plugins/unitydialog)
 add_subdirectory(plugins/unity-mt-grab-handles)
diff --git a/plugins/gtkloader/CMakeLists.txt b/plugins/gtkloader/CMakeLists.txt
deleted file mode 100644
index 916668989..000000000
--- a/plugins/gtkloader/CMakeLists.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-find_package (Compiz REQUIRED)
-
-include (CompizPlugin)
-
-compiz_plugin (gtkloader PKGDEPS gtk+-3.0)
diff --git a/plugins/gtkloader/gtkloader.xml.in b/plugins/gtkloader/gtkloader.xml.in
deleted file mode 100644
index 1ee501bdd..000000000
--- a/plugins/gtkloader/gtkloader.xml.in
+++ /dev/null
@@ -1,7 +0,0 @@
-<compiz>
-	<plugin name="gtkloader" useBcop="true">
-	<_short>GTK Loader</_short>
-	<_long>Initializes GTK once</_long>
-	<category>Utility</category>
-	</plugin>
-</compiz>
diff --git a/plugins/gtkloader/src/gtkloader.cpp b/plugins/gtkloader/src/gtkloader.cpp
deleted file mode 100644
index 6f87f850b..000000000
--- a/plugins/gtkloader/src/gtkloader.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2010 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Sam Spilsbury <sam.spilsbury@canonical.com>
- */
-
-#include "gtkloader.h"
-
-COMPIZ_PLUGIN_20090315(gtkloader, GTKLoaderPluginVTable);
-
-GTKLoaderScreen::GTKLoaderScreen(CompScreen* screen) :
- PluginClassHandler <GTKLoaderScreen, CompScreen> (screen)
-{
-}
-
-bool
-GTKLoaderPluginVTable::init()
-{
- int (*old_handler)(Display*, XErrorEvent*);
- old_handler = XSetErrorHandler(NULL);
-
- XSetErrorHandler(old_handler);
-
- if (!CompPlugin::checkPluginABI("core", CORE_ABIVERSION))
- return false;
-
- if (!gtk_init_check(&programArgc, &programArgv))
- {
- compLogMessage("gtkloader", CompLogLevelError, "Couldn't initialize gtk");
- return false;
- }
-
- return true;
-}
diff --git a/plugins/gtkloader/src/gtkloader.h b/plugins/gtkloader/src/gtkloader.h
deleted file mode 100644
index 81a0c9780..000000000
--- a/plugins/gtkloader/src/gtkloader.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2010 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Sam Spilsbury <sam.spilsbury@canonical.com>
- */
-
-#include <gtk/gtk.h>
-#include <core/core.h>
-#include <X11/Xatom.h>
-#include <X11/Xproto.h>
-#include <core/pluginclasshandler.h>
-
-#include "gtkloader_options.h"
-
-class GTKLoaderScreen :
- public PluginClassHandler <GTKLoaderScreen, CompScreen>,
- public GtkloaderOptions
-{
-public:
-
- GTKLoaderScreen(CompScreen*);
-};
-
-class GTKLoaderPluginVTable :
- public CompPlugin::VTableForScreen <GTKLoaderScreen>
-{
-public:
-
- bool init();
-};
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 67f8f6679..273ff4f1c 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -19,7 +19,6 @@ launcher/SoftwareCenterLauncherIcon.cpp
 launcher/SpacerLauncherIcon.cpp
 launcher/TrashLauncherIcon.cpp
 panel/PanelMenuView.cpp
-plugins/gtkloader/gtkloader.xml.in
 plugins/networkarearegion/networkarearegion.xml.in
 plugins/unity-mt-grab-handles/unitymtgrabhandles.xml.in
 plugins/unitydialog/unitydialog.xml.in
diff --git a/tools/apply_unity_formatting.sh b/tools/apply_unity_formatting.sh
index 1b9775052..a2b7a9fb6 100755
--- a/tools/apply_unity_formatting.sh
+++ b/tools/apply_unity_formatting.sh
@@ -1,8 +1,6 @@
 astyle --options=astyle-formatter \
 ../UnityCore/*.cpp \
 ../UnityCore/*.h \
- ../plugins/gtkloader/src/*.cpp \
- ../plugins/gtkloader/src/*.h \
 ../plugins/networkarearegion/src/*.cpp \
 ../plugins/networkarearegion/src/*.h \
 ../plugins/unitydialog/src/*.cpp \
diff --git a/tools/unity.cmake b/tools/unity.cmake
index 3b7767d16..f4897a55f 100755
--- a/tools/unity.cmake
+++ b/tools/unity.cmake
@@ -38,9 +38,6 @@ well_known_local_path = ("%s/share/locale/*/LC_MESSAGES/*unity*" % supported_pre
 "%s/bin/*unity*" % supported_prefix,
 "%s/include/Unity*" % supported_prefix,
 "%s/lib/pkgconfig/unity*" % supported_prefix,
- "%s/.compiz-1/*/*gtkloader*" % home_dir,
- "%s/.config/compiz-1/gsettings/schemas/*gtkloader*" % home_dir,
- "%s/.gconf/schemas/*gtkloader*" % home_dir,
 "%s/.compiz-1/*/*networkarearegion*" % home_dir,
 "%s/.config/compiz-1/gsettings/schemas/*networkarearegion*" % home_dir,
 "%s/.gconf/schemas/*networkarearegion*" % home_dir,