Merge lp:~timo-jyrinki/compiz/compiz.098.fix_1057955 into lp:compiz/0.9.8

[Timo Jyrinki]

Remove the non-used launchers and migration for them. Fixes a crash of g-c-c when entering Keyboard section. (LP: #1057955)

Same as https://code.launchpad.net/~timo-jyrinki/compiz/compiz.fix_1057955/+merge/126885 but for 0.9.8.

[Łukasz Zemczak (sil2100)]

+1

review: Approve

[Daniel van Vugt (vanvugt)]

Hmm, I think auto-merge only works on lp:compiz, not lp:compiz/0.9.8

=== removed file 'gtk/gnome/50-compiz-launchers.xml.in'
--- gtk/gnome/50-compiz-launchers.xml.in	2012-09-05 09:05:58 +0000
+++ gtk/gnome/50-compiz-launchers.xml.in	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<KeyListEntries schema="org.compiz.integrated" wm_name="Compiz" group="system" _name="Launchers" package="compiz">
-
-	<KeyListEntry name="run-command-terminal" _description="Launch Terminal"/>
-
-</KeyListEntries>

=== removed file 'gtk/gnome/50-compiz-screenshot.xml.in'
--- gtk/gnome/50-compiz-screenshot.xml.in	2012-08-15 14:09:32 +0000
+++ gtk/gnome/50-compiz-screenshot.xml.in	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<KeyListEntries schema="org.compiz.integrated" wm_name="Compiz" group="system" _name="Screenshots" package="compiz">
-
-	<KeyListEntry name="run-command-screenshot" _description="Take a screenshot" />
-
-	<KeyListEntry name="run-command-window-screenshot" _description="Take a screenshot of a window"/>
-
-</KeyListEntries>

=== removed file 'gtk/gnome/50-compiz-system.xml.in'
--- gtk/gnome/50-compiz-system.xml.in	2012-08-15 14:09:32 +0000
+++ gtk/gnome/50-compiz-system.xml.in	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<KeyListEntries schema="org.compiz.integrated" wm_name="Compiz" group="system" _name="System" package="compiz">
-
-	<KeyListEntry name="panel-run-dialog" _description="Show the run command prompt" />
-
-	<KeyListEntry name="panel-main-menu" _description="Show the activities overview" />
-
-</KeyListEntries>

=== modified file 'gtk/gnome/CMakeLists.txt'
--- gtk/gnome/CMakeLists.txt	2012-08-16 18:15:29 +0000
+++ gtk/gnome/CMakeLists.txt	2012-09-28 11:07:33 +0000
@@ -10,10 +10,7 @@
     )
 
     set (_keybindings_files
-	 50-compiz-launchers.xml.in
 	 50-compiz-navigation.xml.in
-	 50-compiz-screenshot.xml.in
-	 50-compiz-system.xml.in
 	 50-compiz-windows.xml.in)
 
     set (_keybindings_files_translated "")

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2012-08-16 18:15:29 +0000
+++ po/POTFILES.in	2012-09-28 11:07:33 +0000
@@ -3,11 +3,8 @@
 gtk/window-decorator/forcequit.c
 gtk/window-decorator/gtk-window-decorator.c
 gtk/window-decorator/gwd.schemas.in
-gtk/gnome/50-compiz-launchers.xml.in
 gtk/gnome/50-compiz-navigation.xml.in
-gtk/gnome/50-compiz-screenshot.xml.in
 gtk/gnome/50-compiz-windows.xml.in
-gtk/gnome/50-compiz-system.xml.in
 metadata/core.xml.in
 plugins/annotate/annotate.xml.in
 plugins/blur/blur.xml.in

=== modified file 'postinst/convert-files/compiz-profile-independent-keys.convert'
--- postinst/convert-files/compiz-profile-independent-keys.convert	2012-09-07 08:25:29 +0000
+++ postinst/convert-files/compiz-profile-independent-keys.convert	2012-09-28 11:07:33 +0000
@@ -1,11 +1,3 @@
-[org.compiz.integrated]
-run-command-terminal = /apps/metacity/global_keybindings/run_command_terminal
-run-command-screenshot = /apps/metacity/global_keybindings/run_command_screenshot
-run-command-window-screenshot = /apps/metacity/global_keybindings/run_command_window_screenshot
-panel-run-dialog = /apps/metacity/global_keybindings/panel_run_dialog
-panel-main-menu = /apps/metacity/global_keybindings/panel_main_menu
-
-
 [org.gnome.desktop.wm.keybindings]
 move-to-workspace-1 = /apps/metacity/window_keybindings/move_to_workspace_1
 move-to-workspace-2 = /apps/metacity/window_keybindings/move_to_workspace_2