← Back to branch summary

~ubuntu-branches/ubuntu/precise/metacity/precise

« back to all changes in this revision

Viewing changes to debian/patches/05_raise_on_click_for_click_mode.patch

  • Committer: Bazaar Package Importer
  • Author(s): Robert Ancell
  • Date: 2009-12-03 00:32:57 UTC
  • mfrom: (2.1.6 squeeze)
  • Revision ID: james.westby@ubuntu.com-20091203003257-ixn0ozsghxbrnec4
Tags: 1:2.28.0-2ubuntu1
https://launchpad.net/bugs/490214
* Sync with Debian unstable, remaining changes: (LP: #490214)
* debian/metacity-common.gconf-defaults:
  - Default to two workspaces
  - Fix default keybinding for shift-alt-tab
* debian/patches/03_strict_focus.patch:
  - Strict focus
* debian/patches/04_worspaces_default_name.patch:
  - Use "Desk" instead of "Workspace" for default workspaces naming.
* debian/patches/05_raise_on_click_for_click_mode.patch:
  - Use raise on click option
* debian/patches/06_drop_Werror.patch
  - Build without -Werror in CFLAGS which fixes FTBFS on armel
* debian/patches/07_fix_wm_cm_selection_timestamp.patch
  - Fix metacity to give up the compositing manager
* debian/watch:
  - Watch for unstable versions

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/05_raise_on_click_for_click_mode.patch
 
1
#
 
2
# Description: Use raise on click option.
 
3
#
 
4
diff -Nur -x '*.orig' -x '*~' metacity-2.27.1/src/core/prefs.c metacity-2.27.1.new/src/core/prefs.c
 
5
--- metacity-2.27.1/src/core/prefs.c    2009-09-10 16:46:24.000000000 +1000
 
6
+++ metacity-2.27.1.new/src/core/prefs.c        2009-09-10 16:46:24.000000000 +1000
 
7
@@ -1258,10 +1258,7 @@
 
8
 gboolean
 
9
 meta_prefs_get_raise_on_click (void)
 
10
 {
 
11
-  /* Force raise_on_click on for click-to-focus, as requested by Havoc
 
12
-   * in #326156.
 
13
-   */
 
14
-  return raise_on_click || focus_mode == META_FOCUS_MODE_CLICK;
 
15
+  return raise_on_click;
 
16
 }
 
17
 
 
18
 const char*