Hello community, here is the log from the commit of package metacity checked in at Thu Feb 21 01:57:11 CET 2008. -------- --- GNOME/metacity/metacity.changes 2007-12-20 00:01:30.000000000 +0100 +++ /mounts/work_src_done/STABLE/metacity/metacity.changes 2008-02-20 02:18:56.023075000 +0100 @@ -1,0 +2,26 @@ +Wed Feb 20 01:41:59 CET 2008 - maw@suse.de + +- Update to version 2.21.13: + + Windows on other workspaces which need attention appear in the + alt-tab list too (bgo#333548) + + Remove deprecated function call (bgo#512561) + + New release script + + Made a start at improving the general number of comments + + Updated copyright year to 2008, and some other tiny fixes + + Don't do anything unusual when the compositor frees a window + + Mapping windows doesn't mark them as damaged + + Compositor uses the overlay window and not the root window + + Fixed several list leaks + + Fixed warnings about printf formats + + Move source files into subdirectories of the src directory + + Only use compositor version if we have a compositor + (bgo#514453) + + Remove workaround for a problem in an ancient GTK version + (bgo#513737) + + Compositor efficiency fixes + + Various tools added + + Updated translations +- Respin several patches due to changes metacity's source + directory layout. + +------------------------------------------------------------------- Old: ---- metacity-2.21.5.tar.bz2 New: ---- metacity-2.21.13.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ metacity.spec ++++++ --- /var/tmp/diff_new_pack.F24094/_old 2008-02-21 01:56:23.000000000 +0100 +++ /var/tmp/diff_new_pack.F24094/_new 2008-02-21 01:56:23.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package metacity (Version 2.21.5) +# spec file for package metacity (Version 2.21.13) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -10,11 +10,12 @@ # norootforbuild + Name: metacity BuildRequires: fdupes gconf2-devel gnome-patch-translation gtk2-devel intltool libglade2-devel perl-XML-Parser startup-notification-devel update-desktop-files License: GPL v2 or later Group: System/GUI/GNOME -Version: 2.21.5 +Version: 2.21.13 Release: 1 Summary: A Fast Window Manager for the GNOME 2.x Desktop Source: %{name}-%{version}.tar.bz2 @@ -32,7 +33,7 @@ Patch11: metacity-2.21.5-use-compositing-manager.patch Url: http://www.gnome.org BuildRoot: %{_tmppath}/%{name}-%{version}-build -# Only for /usr/share/gnome directory ownership: +# Only for /usr/share/gnome directory ownership: BuildRequires: libgnome # For /usr/share/control-center ownership # BuildRequires: control-center2 @@ -52,7 +53,7 @@ %package devel Summary: Include Files and Libraries mandatory for Development. Group: System/GUI/GNOME -Requires: %{name} = %{version} gtk2-devel +Requires: %{name} = %{version} gconf2-devel gtk2-devel orbit2-devel startup-notification-devel %description devel This package contains all necessary include files and libraries needed @@ -132,7 +133,30 @@ %{_libdir}/pkgconfig/*.pc %changelog -* Wed Dec 19 2007 - maw@suse.de +* Wed Feb 20 2008 maw@suse.de +- Update to version 2.21.13: + + Windows on other workspaces which need attention appear in the + alt-tab list too (bgo#333548) + + Remove deprecated function call (bgo#512561) + + New release script + + Made a start at improving the general number of comments + + Updated copyright year to 2008, and some other tiny fixes + + Don't do anything unusual when the compositor frees a window + + Mapping windows doesn't mark them as damaged + + Compositor uses the overlay window and not the root window + + Fixed several list leaks + + Fixed warnings about printf formats + + Move source files into subdirectories of the src directory + + Only use compositor version if we have a compositor + (bgo#514453) + + Remove workaround for a problem in an ancient GTK version + (bgo#513737) + + Compositor efficiency fixes + + Various tools added + + Updated translations +- Respin several patches due to changes metacity's source + directory layout. +* Thu Dec 20 2007 maw@suse.de - Update to version 2.21.5: + Add --sync option, like all other gtk+ apps + Bugs (bugzilla.gnome.org) fixed: #461927, #469682, #486445, @@ -143,16 +167,16 @@ + Updated translations - Oh the humanity! Rename metacity-preconf.dif to metacity-preconf.patch. -* Mon Sep 17 2007 - sbrabec@suse.cz +* Mon Sep 17 2007 sbrabec@suse.cz - Updated to version 2.20.0: * prevent a crash on logout with metacity subsequently not being restored in future sessions * translations update -* Thu Sep 13 2007 - maw@suse.de +* Thu Sep 13 2007 maw@suse.de - Add metacity-disable-window-keys.patch, which disables the default binding of the "windows key" on openSUSE (#217044); note that future releases of SLES will be unimpacted by this change. -* Thu Aug 30 2007 - jpr@suse.de +* Thu Aug 30 2007 jpr@suse.de - Update to 2.19.55 - Noninteger auto-raise delay is not assumed to be zero (BGO #377491) - Fix mangled window title in "Force Quit" (BGO #462734) @@ -168,37 +192,37 @@ - Keyboard shortcut "Start terminal" missing (#244493) - Remove unnecessary autoreconf call - Remove configure arg FIXME -* Wed Aug 08 2007 - maw@suse.de +* Wed Aug 08 2007 maw@suse.de - Use %%fdupes - Split off a -lang subpackage. -* Wed Aug 01 2007 - mauro@suse.de +* Wed Aug 01 2007 mauro@suse.de - Update to version 2.19.34 - Bugfixes for: #459027, #449427, #92212, #450271. -* Sun Jul 15 2007 - aj@suse.de +* Sun Jul 15 2007 aj@suse.de - Avoid build cycle with control-center2. -* Fri Jul 06 2007 - maw@suse.de +* Fri Jul 06 2007 maw@suse.de - Update to version 2.19.21 - Numerous bugfixes and translation updates. -* Wed Apr 11 2007 - maw@suse.de +* Wed Apr 11 2007 maw@suse.de - Update to version 2.18.2 - Fixes a bug with missing pixels in themes with rounded corners - Updated translations for the gl and nb locales. -* Fri Mar 23 2007 - maw@suse.de +* Fri Mar 23 2007 maw@suse.de - Update to version 2.18.0 - b.g.o #408902, #408899, #395560, #382962, and #358715. -* Mon Feb 19 2007 - maw@suse.de +* Mon Feb 19 2007 maw@suse.de - Update to version 2.17.5. -* Wed Feb 07 2007 - sbrabec@suse.cz +* Wed Feb 07 2007 sbrabec@suse.cz - Do not build unusable static libraries (#238552). -* Mon Dec 18 2006 - sbrabec@suse.cz +* Mon Dec 18 2006 sbrabec@suse.cz - Prefix changed to /usr. - Spec file cleanup. - Splitted devel subpackage. -* Sun Oct 15 2006 - danw@suse.de +* Sun Oct 15 2006 danw@suse.de - Remove dead patches - Remove pre-compiz patches for using metacity with xcompmgr under xgl - Update and re-enable metacity-windows-key-binding.patch (203080) -* Tue Oct 03 2006 - jhargadon@suse.de +* Tue Oct 03 2006 jhargadon@suse.de - update to version 2.16.3 - fix longstanding focus bug with mouse focus (not sloppy focus) and popup override redirect windows, such as mozilla's/firefox's @@ -215,18 +239,18 @@ - Clear the transient_for flag of a window after emitting a warning - Replace copy_of_gdk_x11_window_set_user_time() with the real thing - translation updates -* Mon Sep 18 2006 - danw@suse.de +* Mon Sep 18 2006 danw@suse.de - remove metacity-2.12.0-border-effects.patch, which is a useless deviation from upstream to add a gconf option that probably no one even knows exists any more. #203087 -* Thu Sep 14 2006 - jhargadon@suse.de +* Thu Sep 14 2006 jhargadon@suse.de - update to version 2.16.0 - updated translations - Fix the build with c89/gcc 2.95 -* Mon Sep 11 2006 - jhargadon@suse.de +* Tue Sep 12 2006 jhargadon@suse.de - added a patch to fix a function that would return random data in ui.c -* Wed Aug 30 2006 - jhargadon@suse.de +* Wed Aug 30 2006 jhargadon@suse.de - disabled metacity-windows-key-binding.patch and metacity-2.12.0-border-effects-2.patch because of bug #201997 - update to version 2.15.34 @@ -241,7 +265,7 @@ - fix keybindings with hex-values, coming from special extended keyboard keys - fix metacity-dialog handling of arguments -* Wed Aug 16 2006 - jhargadon@suse.de +* Wed Aug 16 2006 jhargadon@suse.de - update to version 2.15.21 - Add a constrain_titlebar_visible constraint - remove the infinite edge resistance @@ -268,132 +292,132 @@ - prevent a crash when changing resolution - Add a tabbing function, bound to alt-f6 by default, to cycle through the windows of the current application -* Thu Jun 15 2006 - jimmyk@suse.de +* Fri Jun 16 2006 jimmyk@suse.de - Added a keybinding for opening the main-menu when the windows key is pressed, BNC #155437. -* Thu Jun 08 2006 - danw@suse.de +* Thu Jun 08 2006 danw@suse.de - Remove xsession desktop file, since metacity alone is useless as an xsession. #181814 -* Wed May 17 2006 - joeshaw@suse.de +* Wed May 17 2006 joeshaw@suse.de - Add patch to turn audible bell off by default. (bnc #176424) -* Sun Mar 05 2006 - dobey@suse.de +* Sun Mar 05 2006 dobey@suse.de - Default to new Gilouche theme -* Sun Feb 19 2006 - aj@suse.de +* Sun Feb 19 2006 aj@suse.de - Reduce BuildRequires. -* Wed Feb 15 2006 - gekker@suse.de +* Wed Feb 15 2006 gekker@suse.de - Fix dual-head bug (b.g.o#319423) -* Wed Feb 01 2006 - sbrabec@suse.cz +* Wed Feb 01 2006 sbrabec@suse.cz - Use translation compendium gnome-patch-translation. -* Wed Jan 25 2006 - mls@suse.de +* Wed Jan 25 2006 mls@suse.de - converted neededforbuild to BuildRequires -* Tue Jan 17 2006 - dobey@suse.de +* Wed Jan 18 2006 dobey@suse.de - Use Chlorophyll as the default theme now -* Thu Dec 01 2005 - gekker@suse.de +* Thu Dec 01 2005 gekker@suse.de - Update to version 2.12.2 -* Thu Oct 13 2005 - gekker@suse.de +* Thu Oct 13 2005 gekker@suse.de - Update to version 2.12.1 -* Thu Sep 29 2005 - gekker@suse.de +* Thu Sep 29 2005 gekker@suse.de - Add patches to metacity to support better support Xgl -* Thu Sep 22 2005 - clahey@suse.de +* Thu Sep 22 2005 clahey@suse.de - Switch from 4 desktops to 1. -* Tue Sep 06 2005 - gekker@suse.de +* Tue Sep 06 2005 gekker@suse.de - Update to version 2.12.0 (GNOME 2.12) -* Tue Aug 23 2005 - gekker@suse.de +* Tue Aug 23 2005 gekker@suse.de - Update to version 2.11.3 -* Thu Aug 11 2005 - gekker@suse.de +* Thu Aug 11 2005 gekker@suse.de - Update to version 2.11.2 -* Tue Aug 02 2005 - gekker@suse.de +* Tue Aug 02 2005 gekker@suse.de - Update to version 2.11.1 -* Fri Jul 22 2005 - gekker@suse.de +* Sat Jul 23 2005 gekker@suse.de - Update to version 2.11.0 - Remove *.*a files from package -* Thu Jul 21 2005 - federico@novell.com +* Thu Jul 21 2005 federico@novell.com - Added metacity-6626-raise-on-click.diff; this adds a boolean GConf key called /apps/metacity/general/raise_on_click that controls whether windows get raised to the front when a button is pressed on them. Fixes bug #6626. -* Wed Jun 22 2005 - gekker@suse.de +* Wed Jun 22 2005 gekker@suse.de - Update to version 2.10.1 -* Thu Mar 17 2005 - sbrabec@suse.cz +* Thu Mar 17 2005 sbrabec@suse.cz - Disabled metacity's compositing manager (#61691). -* Thu Mar 10 2005 - gekker@suse.de +* Thu Mar 10 2005 gekker@suse.de - Update to version 2.10.0 (GNOME 2.10). -* Fri Mar 04 2005 - gekker@suse.de +* Fri Mar 04 2005 gekker@suse.de - Update to version 2.9.34 -* Fri Feb 11 2005 - gekker@suse.de +* Fri Feb 11 2005 gekker@suse.de - Update to version 2.9.13 -* Thu Feb 10 2005 - adrian@suse.de +* Thu Feb 10 2005 adrian@suse.de - install session desktop file -* Sun Feb 06 2005 - gekker@suse.de +* Sun Feb 06 2005 gekker@suse.de - Update to version 2.9.8 -* Wed Jan 19 2005 - clahey@suse.de +* Wed Jan 19 2005 clahey@suse.de - Updated to version 2.9.3. -* Tue Jan 04 2005 - gekker@suse.de +* Tue Jan 04 2005 gekker@suse.de - Update to version 2.9.2 -* Wed Dec 22 2004 - gekker@suse.de +* Wed Dec 22 2004 gekker@suse.de - Update to version 2.9.0 - Remove titlebar-font-setup.patch, included in update. -* Tue Nov 23 2004 - ro@suse.de +* Tue Nov 23 2004 ro@suse.de - fix build on 9.2 (missing so links for libXfixes) -* Tue Nov 02 2004 - mmj@suse.de +* Tue Nov 02 2004 mmj@suse.de - Locale rename: no -> nb -* Tue Oct 12 2004 - sbrabec@suse.cz +* Tue Oct 12 2004 sbrabec@suse.cz - Fixed libexecdir for bi-arch (#47050). -* Thu Apr 29 2004 - hhetter@suse.de +* Thu Apr 29 2004 hhetter@suse.de - updated 2.8.0 [GNOME2.6] -* Fri Mar 12 2004 - hhetter@suse.de +* Fri Mar 12 2004 hhetter@suse.de - default theme to Industrial -* Wed Mar 10 2004 - sbrabec@suse.cz +* Wed Mar 10 2004 sbrabec@suse.cz - Fixed gconf schemas installation (#33114). -* Mon Mar 01 2004 - sbrabec@suse.cz +* Mon Mar 01 2004 sbrabec@suse.cz - Allow setting of titlebar font in gnome-font-properties (workaround for bug #31388, http://bugzilla.gnome.org/show_bug.cgi?id=104177). - Disable schemas installation during %%install. -* Wed Feb 25 2004 - hhetter@suse.de +* Wed Feb 25 2004 hhetter@suse.de - apply metacity-ping-timeout.patch, increase the time metacity detects crashed programs -* Thu Feb 12 2004 - hhetter@suse.de +* Thu Feb 12 2004 hhetter@suse.de - gconf schema (de-)installation in %%post and %%postun -* Mon Feb 09 2004 - hhetter@suse.de +* Mon Feb 09 2004 hhetter@suse.de - updated to version 2.6.3 [GNOME2.4.2] -* Sat Jan 10 2004 - adrian@suse.de +* Sat Jan 10 2004 adrian@suse.de - add %%run_ldconfig -* Thu Oct 09 2003 - sbrabec@suse.cz +* Thu Oct 09 2003 sbrabec@suse.cz - Updated to version 2.6.2 (GNOME 2.4). -* Mon Jul 14 2003 - sbrabec@suse.cz +* Mon Jul 14 2003 sbrabec@suse.cz - GNOME prefix change to /opt/gnome. -* Tue Jun 24 2003 - sbrabec@suse.cz +* Tue Jun 24 2003 sbrabec@suse.cz - Updated to version 2.4.55. - Updated neededforbuild. - Prefix clash fix (wm-properties). - Fixed directory owhership. -* Thu Mar 13 2003 - sbrabec@suse.cz +* Thu Mar 13 2003 sbrabec@suse.cz - Fixed desktop hang for certain transient loops (k3b-setup, bug 24069). - Allow startup-notification. -* Thu Feb 06 2003 - hhetter@suse.de +* Thu Feb 06 2003 hhetter@suse.de - updated to version 2.4.34 [GNOME 2.2.0] -* Fri Jan 31 2003 - sf@suse.de +* Fri Jan 31 2003 sf@suse.de - fixed library path for lib64 -* Tue Jan 14 2003 - hhetter@suse.de +* Tue Jan 14 2003 hhetter@suse.de - updated to verion 2.4.13 -* Mon Jan 06 2003 - sbrabec@suse.cz +* Mon Jan 06 2003 sbrabec@suse.cz - Updated to version 2.4.8. - Updated %%files. -* Wed Oct 23 2002 - hhetter@suse.de +* Wed Oct 23 2002 hhetter@suse.de - fix kde datadir - fix wrong docdir - updated to version 2.4.2 - FHS fix -* Fri Sep 27 2002 - ro@suse.de +* Fri Sep 27 2002 ro@suse.de - Added alsa alsa-devel to neededforbuild (esound) -* Tue Aug 20 2002 - hhetter@suse.de +* Tue Aug 20 2002 hhetter@suse.de - added PreReq: filesystem -* Mon Aug 12 2002 - hhetter@suse.de +* Mon Aug 12 2002 hhetter@suse.de - updated to version 2.4.0 - fix filelist for new theme conventions -* Sat Jul 27 2002 - adrian@suse.de +* Sat Jul 27 2002 adrian@suse.de - fix neededforbuild -* Fri Jun 14 2002 - hhetter@suse.de +* Fri Jun 14 2002 hhetter@suse.de - provide schemas -* Mon Jun 10 2002 - hhetter@suse.de +* Mon Jun 10 2002 hhetter@suse.de - initial SuSE Package ++++++ metacity-2.21.5.tar.bz2 -> metacity-2.21.13.tar.bz2 ++++++ ++++ 229832 lines of diff (skipped) ++++++ metacity-2.21.5-use-compositing-manager.patch ++++++ --- /var/tmp/diff_new_pack.F24094/_old 2008-02-21 01:56:29.000000000 +0100 +++ /var/tmp/diff_new_pack.F24094/_new 2008-02-21 01:56:29.000000000 +0100 @@ -1,6 +1,8 @@ === modified file 'src/metacity.schemas.in' ---- src/metacity.schemas.in 2007-12-19 22:39:51 +0000 -+++ src/metacity.schemas.in 2007-12-19 22:56:08 +0000 +Index: src/metacity.schemas.in +=================================================================== +--- src/metacity.schemas.in.orig ++++ src/metacity.schemas.in @@ -311,7 +311,7 @@ <applyto>/apps/metacity/general/compositing_manager</applyto> <owner>metacity</owner> @@ -10,12 +12,12 @@ <locale name="C"> <short>Compositing Manager</short> <long> - -=== modified file 'src/prefs.c' ---- src/prefs.c 2007-12-19 22:39:51 +0000 -+++ src/prefs.c 2007-12-19 22:57:06 +0000 -@@ -106,7 +106,7 @@ - static gboolean gnome_accessibility = FALSE; +Index: src/core/prefs.c +=================================================================== +--- src/core/prefs.c.orig ++++ src/core/prefs.c +@@ -108,7 +108,7 @@ static gboolean gnome_accessibility = FA + static gboolean enable_windows_keys = FALSE; static char *cursor_theme = NULL; static int cursor_size = 24; -static gboolean compositing_manager = FALSE; @@ -23,4 +25,3 @@ static MetaVisualBellType visual_bell_type = META_VISUAL_BELL_FULLSCREEN_FLASH; static MetaButtonLayout button_layout; - ++++++ metacity-disable-window-keys.patch ++++++ --- /var/tmp/diff_new_pack.F24094/_old 2008-02-21 01:56:29.000000000 +0100 +++ /var/tmp/diff_new_pack.F24094/_new 2008-02-21 01:56:29.000000000 +0100 @@ -1,8 +1,8 @@ -Index: metacity-2.19.55/src/metacity.schemas.in +Index: metacity-2.21.13/src/metacity.schemas.in =================================================================== ---- metacity-2.19.55.orig/src/metacity.schemas.in -+++ metacity-2.19.55/src/metacity.schemas.in -@@ -392,7 +392,7 @@ +--- metacity-2.21.13.orig/src/metacity.schemas.in ++++ metacity-2.21.13/src/metacity.schemas.in +@@ -374,7 +374,7 @@ <applyto>/apps/metacity/general/enable_windows_keys</applyto> <owner>metacity</owner> <type>bool</type> @@ -11,10 +11,10 @@ <locale name="C"> <short>If true, enables the Windows flag keys to show the panel's main menu</short> <long> -Index: metacity-2.19.55/src/prefs.c +Index: metacity-2.21.13/src/core/prefs.c =================================================================== ---- metacity-2.19.55.orig/src/prefs.c -+++ metacity-2.19.55/src/prefs.c +--- metacity-2.21.13.orig/src/core/prefs.c ++++ metacity-2.21.13/src/core/prefs.c @@ -105,7 +105,7 @@ static gboolean provide_visual_bell = FA static gboolean bell_is_audible = TRUE; static gboolean reduced_resources = FALSE; ++++++ metacity-ping-timeout.patch ++++++ --- /var/tmp/diff_new_pack.F24094/_old 2008-02-21 01:56:29.000000000 +0100 +++ /var/tmp/diff_new_pack.F24094/_new 2008-02-21 01:56:29.000000000 +0100 @@ -1,12 +1,13 @@ -diff -Nru -x '*~' -x '*.o' -x '*.orig' -x '*.rej' metacity-2.4.34.orig/src/display.c metacity-2.4.34/src/display.c ---- metacity-2.4.34.orig/src/display.c 2003-02-04 22:46:06.000000000 -0500 -+++ metacity-2.4.34/src/display.c 2003-05-02 10:11:45.000000000 -0400 -@@ -3224,7 +3224,7 @@ - } - } - +Index: metacity-2.21.13/src/core/display.c +=================================================================== +--- metacity-2.21.13.orig/src/core/display.c ++++ metacity-2.21.13/src/core/display.c +@@ -4202,7 +4202,7 @@ meta_set_syncing (gboolean setting) + * How long, in milliseconds, we should wait after pinging a window + * before deciding it's not going to get back to us. + */ -#define PING_TIMEOUT_DELAY 2250 +#define PING_TIMEOUT_DELAY 5000 - static gboolean - meta_display_ping_timeout (gpointer data) + /** + * Does whatever it is we decided to do when a window didn't respond ++++++ metacity-windows-key-binding.patch ++++++ --- /var/tmp/diff_new_pack.F24094/_old 2008-02-21 01:56:29.000000000 +0100 +++ /var/tmp/diff_new_pack.F24094/_new 2008-02-21 01:56:29.000000000 +0100 @@ -1,19 +1,48 @@ ---- src/keybindings.c -+++ src/keybindings.c -@@ -195,6 +195,12 @@ +Index: src/metacity.schemas.in +=================================================================== +--- src/metacity.schemas.in.orig ++++ src/metacity.schemas.in +@@ -368,6 +368,22 @@ + </locale> + </schema> + ++ ++ <schema> ++ <key>/schemas/apps/metacity/general/enable_windows_keys</key> ++ <applyto>/apps/metacity/general/enable_windows_keys</applyto> ++ <owner>metacity</owner> ++ <type>bool</type> ++ <default>true</default> ++ <locale name="C"> ++ <short>If true, enables the Windows flag keys to show the panel's main menu</short> ++ <long> ++ If true, then pressing the Windows flag keys will cause the panel's main ++ menu to appear. ++ </long> ++ </locale> ++ </schema> ++ + <!-- Window Keybindings --> + + <schema> +Index: src/core/keybindings.c +=================================================================== +--- src/core/keybindings.c.orig ++++ src/core/keybindings.c +@@ -242,6 +242,12 @@ static void handle_run_terminal (M XEvent *event, MetaKeyBinding *binding); +static void handle_panel_action (MetaDisplay *display, -+ MetaScreen *screen, -+ MetaWindow *window, -+ XEvent *event, -+ MetaKeyBindingAction action); ++ MetaScreen *screen, ++ MetaWindow *window, ++ XEvent *event, ++ MetaKeyBindingAction action); + /* debug */ static gboolean process_mouse_move_resize_grab (MetaDisplay *display, MetaScreen *screen, -@@ -881,6 +887,7 @@ +@@ -937,6 +943,7 @@ bindings_changed_callback (MetaPreferenc switch (pref) { case META_PREF_SCREEN_KEYBINDINGS: @@ -21,7 +50,7 @@ rebuild_screen_binding_table (display); reload_keycodes (display); reload_modifiers (display); -@@ -1107,6 +1114,23 @@ +@@ -1163,6 +1170,23 @@ ungrab_all_keys (MetaDisplay *display, meta_error_trap_pop (display, FALSE); } @@ -33,19 +62,19 @@ +meta_screen_grab_ungrab_windows_keys (MetaScreen *screen) +{ + gboolean grab = meta_prefs_get_enable_windows_keys (); -+ ++ + meta_error_trap_push (screen->display); -+ ++ + meta_change_keygrab (screen->display, screen->xroot, grab, 0, WINDOWS_KEY_1_KEYCODE, 0); + meta_change_keygrab (screen->display, screen->xroot, grab, 0, WINDOWS_KEY_2_KEYCODE, 0); -+ ++ + meta_error_trap_pop (screen->display, FALSE); +} + void meta_screen_grab_keys (MetaScreen *screen) { -@@ -1116,6 +1140,8 @@ +@@ -1172,6 +1196,8 @@ meta_screen_grab_keys (MetaScreen *scree if (screen->keys_grabbed) return; @@ -54,21 +83,21 @@ grab_keys (screen->display->screen_bindings, screen->display->n_screen_bindings, screen->display, screen->xroot); -@@ -1636,6 +1662,13 @@ +@@ -1703,6 +1729,13 @@ meta_display_process_key_event (MetaDisp all_keys_grabbed = window ? window->all_keys_grabbed : screen->all_keys_grabbed; if (!all_keys_grabbed) { + if (event->type == KeyPress -+ && meta_prefs_get_enable_windows_keys () -+ && (event->xkey.state & ~display->ignored_modifier_mask) == 0 -+ && (event->xkey.keycode == WINDOWS_KEY_1_KEYCODE -+ || event->xkey.keycode == WINDOWS_KEY_2_KEYCODE)) -+ handle_panel_action (display, screen, NULL, event, META_KEYBINDING_ACTION_PANEL_MAIN_MENU); -+ ++ && meta_prefs_get_enable_windows_keys () ++ && (event->xkey.state & ~display->ignored_modifier_mask) == 0 ++ && (event->xkey.keycode == WINDOWS_KEY_1_KEYCODE ++ || event->xkey.keycode == WINDOWS_KEY_2_KEYCODE)) ++ handle_panel_action (display, screen, NULL, event, META_KEYBINDING_ACTION_PANEL_MAIN_MENU); ++ /* Do the normal keybindings */ process_event (display->screen_bindings, display->n_screen_bindings, -@@ -2976,18 +3009,15 @@ +@@ -3181,18 +3214,15 @@ handle_toggle_desktop (MetaDisplay *d } static void @@ -78,10 +107,10 @@ - XEvent *event, - MetaKeyBinding *binding) +handle_panel_action (MetaDisplay *display, -+ MetaScreen *screen, -+ MetaWindow *window, -+ XEvent *event, -+ MetaKeyBindingAction action) ++ MetaScreen *screen, ++ MetaWindow *window, ++ XEvent *event, ++ MetaKeyBindingAction action) { - MetaKeyBindingAction action; Atom action_atom; @@ -92,7 +121,7 @@ action_atom = None; switch (action) { -@@ -3026,6 +3056,19 @@ +@@ -3233,6 +3263,20 @@ handle_panel_keybinding (MetaDisplay } static void @@ -103,43 +132,21 @@ + MetaKeyBinding *binding) +{ + MetaKeyBindingAction action; -+ ++ + action = GPOINTER_TO_INT (binding->handler->data); + handle_panel_action (display, screen, window, event, action); +} + ++ +static void handle_activate_menu (MetaDisplay *display, MetaScreen *screen, MetaWindow *event_window, ---- src/metacity.schemas.in -+++ src/metacity.schemas.in -@@ -335,6 +335,22 @@ - </locale> - </schema> - -+ -+ <schema> -+ <key>/schemas/apps/metacity/general/enable_windows_keys</key> -+ <applyto>/apps/metacity/general/enable_windows_keys</applyto> -+ <owner>metacity</owner> -+ <type>bool</type> -+ <default>true</default> -+ <locale name="C"> -+ <short>If true, enables the Windows flag keys to show the panel's main menu</short> -+ <long> -+ If true, then pressing the Windows flag keys will cause the panel's main -+ menu to appear. -+ </long> -+ </locale> -+ </schema> -+ - <!-- Window Keybindings --> - - <schema> ---- src/prefs.c -+++ src/prefs.c -@@ -56,6 +56,7 @@ +Index: src/core/prefs.c +=================================================================== +--- src/core/prefs.c.orig ++++ src/core/prefs.c +@@ -60,6 +60,7 @@ #define KEY_BUTTON_LAYOUT "/apps/metacity/general/button_layout" #define KEY_REDUCED_RESOURCES "/apps/metacity/general/reduced_resources" #define KEY_GNOME_ACCESSIBILITY "/desktop/gnome/interface/accessibility" @@ -147,7 +154,7 @@ #define KEY_COMMAND_PREFIX "/apps/metacity/keybinding_commands/command_" -@@ -99,6 +100,7 @@ +@@ -104,6 +105,7 @@ static gboolean provide_visual_bell = FA static gboolean bell_is_audible = TRUE; static gboolean reduced_resources = FALSE; static gboolean gnome_accessibility = FALSE; @@ -155,67 +162,68 @@ static char *cursor_theme = NULL; static int cursor_size = 24; static gboolean compositing_manager = FALSE; -@@ -161,6 +163,7 @@ - const char *value); - static gboolean update_reduced_resources (gboolean value); - static gboolean update_gnome_accessibility (gboolean value); -+static gboolean update_enable_windows_keys (gboolean value); - static gboolean update_cursor_theme (const char *value); - static gboolean update_cursor_size (int size); - static gboolean update_compositing_manager (gboolean value); -@@ -496,6 +499,11 @@ +@@ -135,6 +137,7 @@ static gboolean update_action_titlebar + static gboolean update_auto_raise (gboolean value); + static gboolean update_auto_raise_delay (int value); + static gboolean update_button_layout (const char *value); ++static gboolean update_enable_windows_keys (gboolean value); + static gboolean update_window_binding (const char *name, + const char *value); + static gboolean update_screen_binding (const char *name, +@@ -503,6 +506,11 @@ meta_prefs_init (void) if (get_bool (KEY_GNOME_ACCESSIBILITY, &bool_val)) update_gnome_accessibility (bool_val); + bool_val = gconf_client_get_bool (default_client, KEY_ENABLE_WINDOWS_KEYS, -+ &err); ++ &err); + cleanup_error (&err); + update_enable_windows_keys (bool_val); -+ ++ str_val = gconf_client_get_string (default_client, KEY_CURSOR_THEME, &err); cleanup_error (&err); -@@ -1037,6 +1045,22 @@ +@@ -1064,6 +1072,23 @@ change_notify (GConfClient *client, + if (update_compositing_manager (b)) queue_changed (META_PREF_COMPOSITING_MANAGER); ++ else if (strcmp (key, KEY_ENABLE_WINDOWS_KEYS) == 0) ++ { ++ gboolean b; ++ ++ if (value && value->type != GCONF_VALUE_BOOL) ++ { ++ meta_warning (_("GConf key \"%s\" is set to an invalid type\n"), ++ KEY_ENABLE_WINDOWS_KEYS); ++ goto out; ++ } ++ ++ b = value ? gconf_value_get_bool (value) : enable_windows_keys; ++ ++ if (update_enable_windows_keys (b)) ++ queue_changed (META_PREF_ENABLE_WINDOWS_KEYS); ++ ++ } } -+ else if (strcmp (key, KEY_ENABLE_WINDOWS_KEYS) == 0) -+ { -+ gboolean b; -+ -+ if (value && value->type != GCONF_VALUE_BOOL) -+ { -+ meta_warning (_("GConf key \"%s\" is set to an invalid type\n"), -+ KEY_ENABLE_WINDOWS_KEYS); -+ goto out; -+ } -+ -+ b = value ? gconf_value_get_bool (value) : enable_windows_keys; -+ -+ if (update_enable_windows_keys (b)) -+ queue_changed (META_PREF_ENABLE_WINDOWS_KEYS); -+ } else { - meta_topic (META_DEBUG_PREFS, "Key %s doesn't mean anything to Metacity\n", -@@ -1577,6 +1601,16 @@ +@@ -1662,6 +1687,16 @@ update_disable_workarounds (gboolean val return old != disable_workarounds; } + -+static gboolean ++gboolean +update_enable_windows_keys (gboolean value) +{ + gboolean old = enable_windows_keys; -+ ++ + enable_windows_keys = value; -+ ++ + return old != enable_windows_keys; +} #endif /* HAVE_GCONF */ gboolean -@@ -2846,6 +2880,12 @@ +@@ -2961,6 +2996,12 @@ meta_prefs_get_reduced_resources (void) } gboolean @@ -228,9 +236,11 @@ meta_prefs_get_gnome_accessibility () { return gnome_accessibility; ---- src/prefs.h -+++ src/prefs.h -@@ -52,6 +52,7 @@ +Index: src/include/prefs.h +=================================================================== +--- src/include/prefs.h.orig ++++ src/include/prefs.h +@@ -56,6 +56,7 @@ typedef enum META_PREF_VISUAL_BELL_TYPE, META_PREF_REDUCED_RESOURCES, META_PREF_GNOME_ACCESSIBILITY, @@ -238,11 +248,12 @@ META_PREF_CURSOR_THEME, META_PREF_CURSOR_SIZE, META_PREF_COMPOSITING_MANAGER -@@ -82,6 +83,7 @@ +@@ -86,7 +87,7 @@ gboolean meta_prefs_g int meta_prefs_get_auto_raise_delay (void); gboolean meta_prefs_get_reduced_resources (void); gboolean meta_prefs_get_gnome_accessibility (void); +- +gboolean meta_prefs_get_enable_windows_keys (void); - const char* meta_prefs_get_command (int i); + char* meta_prefs_get_gconf_key_for_command (int i); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org