Merge lp:~mc-return/compiz/compiz.merge-fix1115128-expose-unmaximize_or_minimize_key-in-g-c-c into lp:compiz/0.9.9

[MC Return]

Expose unmaximize_or_minimize_window_key instead of unmaximize_window_key
in Gnome Control Center.

(LP: #1115128)

[What has been done already]

1. Added new key and functionality to Compiz, the new key unmaximize_or_minimize_window is disabled by default:
https://code.launchpad.net/~mc-return/unity/unity.merge-fix966099-shortcut-fails-to-minimize-just-restores/+merge/145474

2. Modified the quilt patch ubuntu-config.patch to use the new unmaximize_or_minimize_key, when Ctrl+Alt+Down is pressed:
https://code.launchpad.net/~mc-return/compiz/compiz.merge-fix966099-refresh-quilt-patch.0/+merge/146203

3. Unity now shows the unmaximize_or_minimize_window_key in the Help Overlay Shortcut and I also changed the gconf key Unity converts from Compiz, without having added this key in Compiz before, which was wrong - see here:
https://code.launchpad.net/~mc-return/unity/unity.merge-fix966099-shortcut-fails-to-minimize-just-restores/+merge/145474

[Didier Roche-Tolomelli (didrocks)]

79 +unmaximize-or-minimize-window-key = /apps/compizconfig-1/profiles/Default/plugins/core/screen0/options/unmaximize_or_minimize_window_key
-> should be rather unmaximize_window_key for the gconf part, as the other key didn't exist at the time.

Same change than in unity :)

review: Needs Fixing

[MC Return (mc-return)]

Sam, I've requested a review from you here, because I want to make sure to get it right.
For easier reference I will add all links of related MPs and merges to the description, see above.

[MC Return (mc-return)]

> 79 +unmaximize-or-minimize-window-key = /apps/compizconfig-1/profiles/Def
> ault/plugins/core/screen0/options/unmaximize_or_minimize_window_key
> -> should be rather unmaximize_window_key for the gconf part, as the other key
> didn't exist at the time.
>
> Same change than in unity :)

Done as requested.

Here the Unity MP:
https://code.launchpad.net/~mc-return/unity/unity.merge-fix1115128-gconf-problems/+merge/146419

review: Needs Resubmitting

[MC Return (mc-return)]

didrocks, as far as I can tell everything should work...

Changes look reasonable, no other relevant references to 'unmaximize' are to be found in the code.
It compiles without warnings.
When I run it and reset to default settings and set to gsettings backend using CCSM and open g-c-c keyboard settings the 'Restore window' setting is there and shows 'Ctrl+Super+Down'.
Unfortunately I cannot test changes to those settings as all g-c-c settings seem to be ignored here locally, so I cannot 100% guarantee that it works, although I tried hard.

I would be happy if someone else could test this also to make sure everything is 100% correct.

[Didier Roche-Tolomelli (didrocks)]

Ok, let's get that in, nobody has time to effectively to test the g-c-c part it but the shortcut is already not exposed, so this will only be able to potentially fix the exposure that MC Return confirmed :)

review: Approve

[MC Return (mc-return)]

> Ok, let's get that in, nobody has time to effectively to test the g-c-c part
> it but the shortcut is already not exposed, so this will only be able to
> potentially fix the exposure that MC Return confirmed :)

didrocks, I think this is a good decision. Once this is in trunk, I'll make sure
it gets tested properly.
If there are problems unsolved regarding this new shortcut, I'll make sure to
propose further MPs to fix those also.

The only thing I am currently not 100% sure about is the Unity part here:
https://code.launchpad.net/~mc-return/unity/unity.merge-fix1115128-gconf-problems/+merge/146419

This (tools/convert-files/compiz-profile-active-unity.convert):
+unmaximize-window-key = /apps/compiz-1/plugins/core/screen0/options/unmaximize_window_key
should maybe be:
+unmaximize-window-key = /apps/compiz-1/plugins/core/screen0/options/unmaximize_or_minimize_window_key

while (tools/convert-files/compiz-profile-unity.convert):
+unmaximize-window-key = /apps/compizconfig-1/profiles/unity/plugins/core/screen0/options/unmaximize_window_key
should maybe be:
+unmaximize-window-key = /apps/compizconfig-1/profiles/unity/plugins/core/screen0/options/unmaximize_or_minimize_window_key

If that is the case, which we'll find out soon, I'll propose a fix soonish.

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/compiz-mbs-autolanding/1/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-x86-mbs-autolanding/./build=pbuilder,distribution=raring,flavor=amd64/1/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-x86-mbs-autolanding/./build=pbuilder,distribution=raring,flavor=i386/1/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
Approved revid is not set in launchpad (maybe a permission problem?).
http://jenkins.qa.ubuntu.com/job/compiz-mbs-autolanding/3/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/compiz-dput-mbs-pt/138//console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-x86-mbs-autolanding/./build=pbuilder,distribution=raring,flavor=amd64/3/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-x86-mbs-autolanding/./build=pbuilder,distribution=raring,flavor=i386/3/console

review: Needs Fixing (continuous-integration)

[MC Return (mc-return)]

FAILED: Autolanding.
Approved revid is not set in launchpad (maybe a permission problem?).
http://jenkins.qa.ubuntu.com/job/compiz-mbs-autolanding/3/

[Sam Spilsbury (smspillaz)]

I still can't believe nobody has time to test the g-c-c part.

review: Approve

[Sam Spilsbury (smspillaz)]

Apologies for the delay, marking for merging again.

See https://lists.launchpad.net/unity-dev/msg00598.html

=== modified file 'compizconfig/integration/gnome/include/ccs_gnome_integration_constants.h'
--- compizconfig/integration/gnome/include/ccs_gnome_integration_constants.h	2012-09-25 01:26:54 +0000
+++ compizconfig/integration/gnome/include/ccs_gnome_integration_constants.h	2013-02-06 13:07:22 +0000
@@ -131,7 +131,7 @@
     CCSSettingIntegratedSettingPair CORE_RAISE_WINDOW_KEY;
     CCSSettingIntegratedSettingPair CORE_MAXIMIZE_WINDOW_VERTICALLY_KEY;
     CCSSettingIntegratedSettingPair CORE_MAXIMIZE_WINDOW_HORIZONTALLY_KEY;
-    CCSSettingIntegratedSettingPair CORE_UNMAXIMIZE_WINDOW_KEY;
+    CCSSettingIntegratedSettingPair CORE_UNMAXIMIZE_OR_MINIMIZE_WINDOW_KEY;
     CCSSettingIntegratedSettingPair CORE_MAXIMIZE_WINDOW_KEY;
     CCSSettingIntegratedSettingPair CORE_MINIMIZE_WINDOW_KEY;
     CCSSettingIntegratedSettingPair CORE_TOGGLE_WINDOW_MAXIMIZED_KEY;

=== modified file 'compizconfig/integration/gnome/src/ccs_gnome_integration_constants.c'
--- compizconfig/integration/gnome/src/ccs_gnome_integration_constants.c	2012-10-12 05:15:12 +0000
+++ compizconfig/integration/gnome/src/ccs_gnome_integration_constants.c	2013-02-06 13:07:22 +0000
@@ -119,7 +119,7 @@
     { "raise_window_key", "raise" },
     { "maximize_window_vertically_key", "maximize_vertically" },
     { "maximize_window_horizontally_key", "maximize_horizontally" },
-    { "unmaximize_window_key", "unmaximize" },
+    { "unmaximize_or_minimize_window_key", "unmaximize" },
     { "maximize_window_key", "maximize" },
     { "minimize_window_key", "minimize" },
     { "toggle_window_maximized_key", "toggle_maximized" },
@@ -388,7 +388,7 @@
     array[109].pluginName = plugins->CORE;
     array[109].settingName = settings->CORE_MAXIMIZE_WINDOW_HORIZONTALLY_KEY.compizName;
     array[110].pluginName = plugins->CORE;
-    array[110].settingName = settings->CORE_UNMAXIMIZE_WINDOW_KEY.compizName;
+    array[110].settingName = settings->CORE_UNMAXIMIZE_OR_MINIMIZE_WINDOW_KEY.compizName;
     array[111].pluginName = plugins->CORE;
     array[111].settingName = settings->CORE_MAXIMIZE_WINDOW_KEY.compizName;
     array[112].pluginName = plugins->CORE;
@@ -609,7 +609,7 @@
     g_hash_table_insert (coreHashTable, (gpointer) names->CORE_RAISE_WINDOW_KEY.compizName, GINT_TO_POINTER (quarks->ORG_GNOME_DESKTOP_WM_KEYBINDINGS));
     g_hash_table_insert (coreHashTable, (gpointer) names->CORE_MAXIMIZE_WINDOW_VERTICALLY_KEY.compizName, GINT_TO_POINTER (quarks->ORG_GNOME_DESKTOP_WM_KEYBINDINGS));
     g_hash_table_insert (coreHashTable, (gpointer) names->CORE_MAXIMIZE_WINDOW_HORIZONTALLY_KEY.compizName, GINT_TO_POINTER (quarks->ORG_GNOME_DESKTOP_WM_KEYBINDINGS));
-    g_hash_table_insert (coreHashTable, (gpointer) names->CORE_UNMAXIMIZE_WINDOW_KEY.compizName, GINT_TO_POINTER (quarks->ORG_GNOME_DESKTOP_WM_KEYBINDINGS));
+    g_hash_table_insert (coreHashTable, (gpointer) names->CORE_UNMAXIMIZE_OR_MINIMIZE_WINDOW_KEY.compizName, GINT_TO_POINTER (quarks->ORG_GNOME_DESKTOP_WM_KEYBINDINGS));
     g_hash_table_insert (coreHashTable, (gpointer) names->CORE_MAXIMIZE_WINDOW_KEY.compizName, GINT_TO_POINTER (quarks->ORG_GNOME_DESKTOP_WM_KEYBINDINGS));
     g_hash_table_insert (coreHashTable, (gpointer) names->CORE_MINIMIZE_WINDOW_KEY.compizName, GINT_TO_POINTER (quarks->ORG_GNOME_DESKTOP_WM_KEYBINDINGS));
     g_hash_table_insert (coreHashTable, (gpointer) names->CORE_TOGGLE_WINDOW_MAXIMIZED_KEY.compizName, GINT_TO_POINTER (quarks->ORG_GNOME_DESKTOP_WM_KEYBINDINGS));
@@ -773,7 +773,7 @@
     g_hash_table_insert (coreHashTable, (gpointer) names->CORE_RAISE_WINDOW_KEY.compizName, (gpointer) categories->WINDOW_KEYBINDINGS);
     g_hash_table_insert (coreHashTable, (gpointer) names->CORE_MAXIMIZE_WINDOW_VERTICALLY_KEY.compizName, (gpointer) categories->WINDOW_KEYBINDINGS);
     g_hash_table_insert (coreHashTable, (gpointer) names->CORE_MAXIMIZE_WINDOW_HORIZONTALLY_KEY.compizName, (gpointer) categories->WINDOW_KEYBINDINGS);
-    g_hash_table_insert (coreHashTable, (gpointer) names->CORE_UNMAXIMIZE_WINDOW_KEY.compizName, (gpointer) categories->WINDOW_KEYBINDINGS);
+    g_hash_table_insert (coreHashTable, (gpointer) names->CORE_UNMAXIMIZE_OR_MINIMIZE_WINDOW_KEY.compizName, (gpointer) categories->WINDOW_KEYBINDINGS);
     g_hash_table_insert (coreHashTable, (gpointer) names->CORE_MAXIMIZE_WINDOW_KEY.compizName, (gpointer) categories->WINDOW_KEYBINDINGS);
     g_hash_table_insert (coreHashTable, (gpointer) names->CORE_MINIMIZE_WINDOW_KEY.compizName, (gpointer) categories->WINDOW_KEYBINDINGS);
     g_hash_table_insert (coreHashTable, (gpointer) names->CORE_TOGGLE_WINDOW_MAXIMIZED_KEY.compizName, (gpointer) categories->WINDOW_KEYBINDINGS);
@@ -937,7 +937,7 @@
     g_hash_table_insert (coreHashTable, (gpointer) names->CORE_RAISE_WINDOW_KEY.compizName, GINT_TO_POINTER (OptionKey));
     g_hash_table_insert (coreHashTable, (gpointer) names->CORE_MAXIMIZE_WINDOW_VERTICALLY_KEY.compizName, GINT_TO_POINTER (OptionKey));
     g_hash_table_insert (coreHashTable, (gpointer) names->CORE_MAXIMIZE_WINDOW_HORIZONTALLY_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (coreHashTable, (gpointer) names->CORE_UNMAXIMIZE_WINDOW_KEY.compizName, GINT_TO_POINTER (OptionKey));
+    g_hash_table_insert (coreHashTable, (gpointer) names->CORE_UNMAXIMIZE_OR_MINIMIZE_WINDOW_KEY.compizName, GINT_TO_POINTER (OptionKey));
     g_hash_table_insert (coreHashTable, (gpointer) names->CORE_MAXIMIZE_WINDOW_KEY.compizName, GINT_TO_POINTER (OptionKey));
     g_hash_table_insert (coreHashTable, (gpointer) names->CORE_MINIMIZE_WINDOW_KEY.compizName, GINT_TO_POINTER (OptionKey));
     g_hash_table_insert (coreHashTable, (gpointer) names->CORE_TOGGLE_WINDOW_MAXIMIZED_KEY.compizName, GINT_TO_POINTER (OptionKey));
@@ -1100,7 +1100,7 @@
     g_hash_table_insert (coreHashTable, (gpointer) names->CORE_RAISE_WINDOW_KEY.compizName, (gpointer) names->CORE_RAISE_WINDOW_KEY.gnomeName);
     g_hash_table_insert (coreHashTable, (gpointer) names->CORE_MAXIMIZE_WINDOW_VERTICALLY_KEY.compizName, (gpointer) names->CORE_MAXIMIZE_WINDOW_VERTICALLY_KEY.gnomeName);
     g_hash_table_insert (coreHashTable, (gpointer) names->CORE_MAXIMIZE_WINDOW_HORIZONTALLY_KEY.compizName, (gpointer) names->CORE_MAXIMIZE_WINDOW_HORIZONTALLY_KEY.gnomeName);
-    g_hash_table_insert (coreHashTable, (gpointer) names->CORE_UNMAXIMIZE_WINDOW_KEY.compizName, (gpointer) names->CORE_UNMAXIMIZE_WINDOW_KEY.gnomeName);
+    g_hash_table_insert (coreHashTable, (gpointer) names->CORE_UNMAXIMIZE_OR_MINIMIZE_WINDOW_KEY.compizName, (gpointer) names->CORE_UNMAXIMIZE_OR_MINIMIZE_WINDOW_KEY.gnomeName);
     g_hash_table_insert (coreHashTable, (gpointer) names->CORE_MAXIMIZE_WINDOW_KEY.compizName, (gpointer) names->CORE_MAXIMIZE_WINDOW_KEY.gnomeName);
     g_hash_table_insert (coreHashTable, (gpointer) names->CORE_MINIMIZE_WINDOW_KEY.compizName, (gpointer) names->CORE_MINIMIZE_WINDOW_KEY.gnomeName);
     g_hash_table_insert (coreHashTable, (gpointer) names->CORE_TOGGLE_WINDOW_MAXIMIZED_KEY.compizName, (gpointer) names->CORE_TOGGLE_WINDOW_MAXIMIZED_KEY.gnomeName);