← Back to branch summary

~ps-jenkins/compiz/latestsnapshot-10.9.10+13.10.20131004-0ubuntu1

« back to all changes in this revision

Viewing changes to debian/patches/ubuntu-config.patch

  • Committer: Tarmac
  • Author(s): Chris Townsend
  • Date: 2013-08-27 13:04:40 UTC
  • mfrom: (3778.3.3 compiz-0.9.10)
  • Revision ID: tarmac-20130827130440-w400l5cp47wxx9yw
Ctrl-Alt-Del should open the gnome-system-monitor at the processes tab. This fix uses the commands plugin to override the default action. This includes:
 - Install the commands plugin by default.
 - Breaks/Replaces the compiz-plugins package for versions earlier than 0.9.10.
 - Patch commands.xml and integrated.xml to map gnome-system-monitor to Ctrl-Alt-Del by default.
 - Start the command plugin upon Compiz starting. Fixes: https://bugs.launchpad.net/bugs/890747.

Approved by PS Jenkins bot, Brandon Schaefer.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/ubuntu-config.patch
843
843
                    </option>
844
844
                    <option name="ground_color1" type="color">
845
845
                        <_short>Ground Color (near)</_short>
 
846
--- a/compizconfig/integration/gnome/gsettings/org.compiz.integrated.gschema.xml
 
847
+++ b/compizconfig/integration/gnome/gsettings/org.compiz.integrated.gschema.xml
 
848
@@ -10,6 +10,9 @@
 
849
        <key type="s" name="command-screenshot">
 
850
            <default>"gnome-screenshot"</default>
 
851
        </key>
 
852
+        <key type="as" name="run-command-21">
 
853
+            <default>["&lt;Control&gt;&lt;Alt&gt;Delete"]</default>
 
854
+        </key>
 
855
        <key type="as" name="run-command-12">
 
856
            <default>["Disabled"]</default>
 
857
        </key>
 
858
@@ -46,6 +49,9 @@
 
859
        <key type="as" name="run-command-1">
 
860
            <default>["Disabled"]</default>
 
861
        </key>
 
862
+       <key type="s" name="command-21">
 
863
+           <default>"/usr/bin/gnome-system-monitor -p"</default>
 
864
+       </key>
 
865
        <key type="s" name="command-12">
 
866
            <default>""</default>
 
867
        </key>
 
868
--- a/plugins/commands/commands.xml.in
 
869
+++ b/plugins/commands/commands.xml.in
 
870
@@ -117,7 +117,7 @@
 
871
                <option name="command20" type="string">
 
872
                    <_short>Command line 20</_short>
 
873
                    <_long>Command line to be executed in shell when run_command20 is invoked</_long>
 
874
-                   <default></default>
 
875
+                   <default>/usr/bin/gnome-system-monitor -p</default>
 
876
                </option>
 
877
            </group>
 
878
            <group>
 
879
@@ -205,6 +205,7 @@
 
880
                <option name="run_command20_key" type="key">
 
881
                    <_short>Run command 20</_short>
 
882
                    <_long>A keybinding that when invoked, will run the shell command identified by command20</_long>
 
883
+                    <default>&lt;Control&gt;&lt;Alt&gt;Delete</default>
 
884
                </option>
 
885
            </group>
 
886
            <group>