Merge lp:~muktupavels/compiz/auto-add-ccp into lp:compiz/0.9.12

[Alberts Muktupāvels]

Stop using ccp_plugin.patch only in ubuntu, apply it to source and remove it from debian/patches.

Stop using ccp_plugin.patch only in ubuntu, apply it to source and remove it from debian/patches.

GNOME Flashback has compiz session. Recently I added compiz as jhbuild module to make it possible to build GNOME Flashback (Compiz) session.

Compiz will start without loading ccp plugin and that is probably almost always something that user does not want.

[MC Return (mc-return)]

LGTM, +1.
As this deals with a Ubuntu distro patch, I will not approve this globally, but I agree 100%.

review: Approve

[Dmitry Shachnev (mitya57)]

This is a no-op for Ubuntu, so +1 from us. Can you top-approve this now?

review: Approve

[MC Return (mc-return)]

> This is a no-op for Ubuntu, so +1 from us. Can you top-approve this now?

+1

=== removed file 'debian/patches/ccp_plugin.patch'
--- debian/patches/ccp_plugin.patch	2013-02-21 17:07:14 +0000
+++ debian/patches/ccp_plugin.patch	1970-01-01 00:00:00 +0000
@@ -1,58 +0,0 @@
-Index: compiz.fix_dist_upgrade/src/main.cpp
-===================================================================
---- compiz.fix_dist_upgrade.orig/src/main.cpp	2013-02-22 01:06:33.342881314 +0800
-+++ compiz.fix_dist_upgrade/src/main.cpp	2013-02-22 01:07:03.283029785 +0800
-@@ -38,6 +38,11 @@
- #include "privatescreen.h"
- #include "privatestackdebugger.h"
- 
-+namespace
-+{
-+bool autoAddCCP = true;
-+}
-+
- void
- CompManager::usage ()
- {
-@@ -52,6 +57,7 @@
-             "  --debug               Enable debug mode\n"
-             "  --version             Show the program version\n"
-             "  --help                Show this summary\n"
-+	    "  --no-auto-add-ccp     Do not automatically load the ccp plugin\n"
-             , programName);
- }
- 
-@@ -116,6 +122,11 @@
- 	    if (i + 1 < argc)
- 		clientId = argv[++i];
- 	}
-+	else if (!strcmp (argv[i], "--no-auto-add-ccp"))
-+	{
-+	    compLogMessage ("core", CompLogLevelInfo, "running without the ccp plugin, no settings will be loaded");
-+	    autoAddCCP = false;
-+	}
- 	else if (*argv[i] == '-')
- 	{
- 	    compLogMessage ("core", CompLogLevelWarn,
-@@ -151,6 +162,9 @@
- 
-     modHandler = new ModifierHandler ();
- 
-+    if (initialPlugins.empty () && autoAddCCP)
-+	initialPlugins.push_back ("ccp");
-+
-     if (!screen->init (displayName))
- 	return false;
- 
-Index: compiz.fix_dist_upgrade/tests/xorg-gtest/src/compiz-xorg-gtest.cpp
-===================================================================
---- compiz.fix_dist_upgrade.orig/tests/xorg-gtest/src/compiz-xorg-gtest.cpp	2013-02-22 01:06:33.342881314 +0800
-+++ compiz.fix_dist_upgrade/tests/xorg-gtest/src/compiz-xorg-gtest.cpp	2013-02-22 01:06:33.342881314 +0800
-@@ -462,6 +462,7 @@
-     if (flags & ct::CompizProcess::ReplaceCurrentWM)
- 	args.push_back ("--replace");
- 
-+    args.push_back ("--no-auto-add-ccp");
-     args.push_back ("--send-startup-message");
- 
-     priv->mProcess.Start (compizBinaryPath, args);

=== modified file 'debian/patches/series'
--- debian/patches/series	2014-11-03 22:47:47 +0000
+++ debian/patches/series	2015-04-23 20:18:28 +0000
@@ -1,6 +1,5 @@
 ubuntu_super_p.patch
 ubuntu-config.patch
-ccp_plugin.patch
 ccsm_remove_redundant_sliders.patch
 ccsm_add_first_run_warning.patch
 ccsm_disable_unity_checkbox.patch

=== modified file 'src/main.cpp'
--- src/main.cpp	2013-02-21 17:05:46 +0000
+++ src/main.cpp	2015-04-23 20:18:28 +0000
@@ -38,6 +38,11 @@
 #include "privatescreen.h"
 #include "privatestackdebugger.h"
 
+namespace
+{
+    bool autoAddCCP = true;
+}
+
 void
 CompManager::usage ()
 {
@@ -48,6 +53,7 @@
             "  --sm-disable          Disable session management\n"
             "  --sm-client-id ID     Session management client ID\n"
             "  --keep-desktop-hints  Retain existing desktop hints\n"
+            "  --no-auto-add-ccp     Do not automatically load the ccp plugin\n"
             "  --sync                Make all X calls synchronous\n"
             "  --debug               Enable debug mode\n"
             "  --version             Show the program version\n"
@@ -99,6 +105,11 @@
 	{
 	    useDesktopHints = true;
 	}
+	else if (!strcmp (argv[i], "--no-auto-add-ccp"))
+	{
+	    compLogMessage ("core", CompLogLevelInfo, "running without the ccp plugin, no settings will be loaded");
+	    autoAddCCP = false;
+	}
 	else if (!strcmp (argv[i], "--replace"))
 	{
 	    replaceCurrentWm = true;
@@ -151,6 +162,9 @@
 
     modHandler = new ModifierHandler ();
 
+    if (initialPlugins.empty () && autoAddCCP)
+        initialPlugins.push_back ("ccp");
+
     if (!screen->init (displayName))
 	return false;
 

=== modified file 'tests/xorg-gtest/src/compiz-xorg-gtest.cpp'
--- tests/xorg-gtest/src/compiz-xorg-gtest.cpp	2013-07-18 13:06:24 +0000
+++ tests/xorg-gtest/src/compiz-xorg-gtest.cpp	2015-04-23 20:18:28 +0000
@@ -778,6 +778,7 @@
     if (flags & ct::CompizProcess::ReplaceCurrentWM)
 	args.push_back ("--replace");
 
+    args.push_back ("--no-auto-add-ccp");
     args.push_back ("--send-startup-message");
 
     /* Copy in plugin list and set environment variables */