Merge lp:~vanvugt/unity/remove-gtkloader into lp:unity

[Daniel van Vugt]

Remove dead code: gtkloader plugin

gtkloader has never been used AFAIK. Instead, in Unity 4.x the GTK init
happened in compiz' main(). And in Unity 5.x, the GTK init happens in
unityshell.cpp: UnityPluginVTable::init(). gtkloader is not even mentioned
in the Unity compizconfig profile. It's dead code, and redundant too.

[Andrea Azzarone (azzar1)]

+1

review: Approve

[Sam Spilsbury (smspillaz)]

We'll need this for sheet style dialogues

review: Disapprove

[Sam Spilsbury (smspillaz)]

To clarify - we can only initialize gtk+ once, and I'd prefer that we don't do it in a distro patch. Because we'll be enabling sheet style dialogues this cycle in a separate plugin, we need to have gtkloader in a plugin that is guarunteed to load once, and before unityshell and unitydialog.

The reason why it existed in unityshell and in a distro patch in compiz was purely historical - there was difficulty in enabling new plugins on upgrades. That reason no longer exists - we have settings upgrades in compizconfig to mantion that.

[Sam Spilsbury (smspillaz)]

*to handle that

[Daniel van Vugt (vanvugt)]

Sheet style dialogs shouldn't relate to gtk at all. That's just a window animation and a change to window management.

[Sam Spilsbury (smspillaz)]

It uses gtksettings to get the window dim color. Have a chat to me before removing it.

Sent from Samsung Mobile

 Daniel van Vugt <email address hidden> wrote:

Sheet style dialogs shouldn't relate to gtk at all. That's just a window animation and a change to window management.
--
https://code.launchpad.net/~vanvugt/unity/remove-gtkloader/+merge/109316
You are reviewing the proposed merge of lp:~vanvugt/unity/remove-gtkloader into lp:unity.

[Sam Spilsbury (smspillaz)]

I'm surpised this was merged in without much consultation. Nevertheless, I'll be happy to reintroduce similar functionality once we get the ball rolling on sheet style dialogues in the coming weeks.

[Daniel van Vugt (vanvugt)]

Wow, I'm surprised this was merged too. It seems no human is to blame. Tarmac did it (!?)

revno: 2396 [merge]
author: Daniel van Vugt <email address hidden>
committer: Tarmac <---

[Daniel van Vugt (vanvugt)]

BTW Sam, it now occurs to me that even if we do introduce any new feature that requires gtk initialization, keeping gtkloader would not make sense in any scenario:

1. The new feature was in lp:unity. In that case, gtk initialization is already done in unityshell and gtkloader is not required.

or

2. The new feature goes outside of lp:unity, like lp:compiz or somewhere else. In that case, gtk initialization should go in the project where the new feature is. And still, there is no reason to keep gtkloader in lp:unity.

[Didier Roche-Tolomelli (didrocks)]

It has been merged because Andrea changed the status:

The proposal to merge lp:~vanvugt/unity/remove-gtkloader into lp:unity has been updated.

    Status: Needs review => Approved

----

then, he rolled it back:

The proposal to merge lp:~vanvugt/unity/remove-gtkloader into lp:unity has been updated.

    Status: Approved => Needs review

But the merger was already building/testing the branch by then.

Aren't you subscribed to the emails of all merge requests? This is pretty clear there.

[Daniel van Vugt (vanvugt)]

Sorry didrocks. My email filter wasn't good enough to pick up your comment. I've now fixed my filters.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2012-05-28 03:19:35 +0000
+++ CMakeLists.txt	2012-06-08 09:15:24 +0000
@@ -138,7 +138,6 @@
 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)

=== removed directory 'plugins/gtkloader'
=== removed file 'plugins/gtkloader/CMakeLists.txt'
--- plugins/gtkloader/CMakeLists.txt	2011-06-24 04:35:33 +0000
+++ plugins/gtkloader/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-find_package (Compiz REQUIRED)
-
-include (CompizPlugin)
-
-compiz_plugin (gtkloader PKGDEPS gtk+-3.0)

=== removed file 'plugins/gtkloader/gtkloader.xml.in'
--- plugins/gtkloader/gtkloader.xml.in	2011-06-24 04:35:33 +0000
+++ plugins/gtkloader/gtkloader.xml.in	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-<compiz>
-	<plugin name="gtkloader" useBcop="true">
-		<_short>GTK Loader</_short>
-		<_long>Initializes GTK once</_long>
-		<category>Utility</category>
-	</plugin>
-</compiz>

=== removed directory 'plugins/gtkloader/src'
=== removed file 'plugins/gtkloader/src/gtkloader.cpp'
--- plugins/gtkloader/src/gtkloader.cpp	2011-07-21 14:59:25 +0000
+++ plugins/gtkloader/src/gtkloader.cpp	1970-01-01 00:00:00 +0000
@@ -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 <[e-mail]>
- */
-
-#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;
-}

=== removed file 'plugins/gtkloader/src/gtkloader.h'
--- plugins/gtkloader/src/gtkloader.h	2011-07-21 14:59:25 +0000
+++ plugins/gtkloader/src/gtkloader.h	1970-01-01 00:00:00 +0000
@@ -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 <[e-mail]>
- */
-
-#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();
-};

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2012-05-07 22:28:17 +0000
+++ po/POTFILES.in	2012-06-08 09:15:24 +0000
@@ -19,7 +19,6 @@
 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

=== modified file 'tools/apply_unity_formatting.sh'
--- tools/apply_unity_formatting.sh	2011-07-21 14:59:25 +0000
+++ tools/apply_unity_formatting.sh	2012-06-08 09:15:24 +0000
@@ -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 \

=== modified file 'tools/unity.cmake'
--- tools/unity.cmake	2012-04-19 11:26:26 +0000
+++ tools/unity.cmake	2012-06-08 09:15:24 +0000
@@ -38,9 +38,6 @@
                          "%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,