Patch to move the logout keybinding into metacity, from control-center - goes with patch in control-center-2.8.1-r1

5 files changed, 253 insertions, 18 deletions

diff --git a/x11-wm/metacity/ChangeLog b/x11-wm/metacity/ChangeLog
index bafa031f2a92..16eb78e4f135 100644
--- a/x11-wm/metacity/ChangeLog
+++ b/x11-wm/metacity/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-wm/metacity
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/ChangeLog,v 1.79 2004/11/22 21:23:51 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/ChangeLog,v 1.80 2004/12/08 04:05:30 obz Exp $
+
+*metacity-2.8.6-r1 (08 Dec 2004)
+
+  08 Dec 2004; Mike Gardiner <obz@gentoo.org> +metacity-2.8.6-r1.ebuild:
+  Patch to move the logout keybinding into metacity, from control-center -
+  goes with patch in control-center-2.8.1-r1
 
   22 Nov 2004; Bryan Østergaard <kloeri@gentoo.org> metacity-2.8.5.ebuild:
   Stable on alpha.
diff --git a/x11-wm/metacity/Manifest b/x11-wm/metacity/Manifest
index c5bfd625f326..cba85e569992 100644
--- a/x11-wm/metacity/Manifest
+++ b/x11-wm/metacity/Manifest
@@ -1,26 +1,20 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 ae50dbfa041b42635f6e0befa71d6eb2 ChangeLog 8739
+MD5 1fc4e5d460d600b4bde6fad7f29568e2 metacity-2.8.6.ebuild 1006
 MD5 7bed435e70472dc2849e235c267b051d metacity-2.8.1.ebuild 883
+MD5 feb86e73ed90bc0bb86deee2e1dffff6 .metacity-2.8.6-r1.ebuild.swp 12288
+MD5 3fe76ce2853a55fbc0aba8b2327b81de metacity-2.8.6-r1.ebuild 1081
+MD5 27a6204ed5153da696dccdd0f6256903 metacity-2.8.5.ebuild 997
 MD5 1d0c6152a10ced81079e2122a95cbd8e metacity-2.8.0.ebuild 1108
 MD5 f6b59812d25914a474884f7b791c4c99 metacity-2.6.3.ebuild 1004
+MD5 ae50dbfa041b42635f6e0befa71d6eb2 ChangeLog 8739
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 a4d312fa0332ab3ffef05469c44ea555 metacity-2.6.5.ebuild 1013
-MD5 1fc4e5d460d600b4bde6fad7f29568e2 metacity-2.8.6.ebuild 1006
-MD5 27a6204ed5153da696dccdd0f6256903 metacity-2.8.5.ebuild 997
-MD5 401c8abc54cf89761ae05db69a25aa60 files/digest-metacity-2.6.5 68
-MD5 518f2435e25b7cd5e532fe83b3178e4c files/digest-metacity-2.8.1 68
 MD5 888edb091b2a7f1feebf5ad86907048f files/metacity-2.4.3-ppc-gcc3.2.diff 1062
-MD5 2562cf5fc7b8b4158301e47955a98c09 files/metacity-2.8.0-xinerama_config_test.patch 466
-MD5 ad3de36c7f3732f72fa88331f5266ba6 files/digest-metacity-2.8.0 68
+MD5 23168d0a6426347e2fc46d78f82cc88f files/metacity-2-logout.patch 7363
+MD5 cb56b63e849c924d574bb926f1c139be files/digest-metacity-2.8.6-r1 68
 MD5 4ab803ac0ffb0f611f083e2df08fc5f1 files/digest-metacity-2.6.3 68
+MD5 401c8abc54cf89761ae05db69a25aa60 files/digest-metacity-2.6.5 68
+MD5 ad3de36c7f3732f72fa88331f5266ba6 files/digest-metacity-2.8.0 68
+MD5 518f2435e25b7cd5e532fe83b3178e4c files/digest-metacity-2.8.1 68
 MD5 6785913225bcd05588b8b2adf011f3c9 files/digest-metacity-2.8.5 68
 MD5 cb56b63e849c924d574bb926f1c139be files/digest-metacity-2.8.6 68
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBoljvugEuf3OQ0akRAl/wAJ0ZktBO1kUc7cYpxZJZ6DDGUznMygCeIr9u
-0/vasrXN8J64xi2ZkgBhsRI=
-=dq5o
------END PGP SIGNATURE-----
+MD5 2562cf5fc7b8b4158301e47955a98c09 files/metacity-2.8.0-xinerama_config_test.patch 466
diff --git a/x11-wm/metacity/files/digest-metacity-2.8.6-r1 b/x11-wm/metacity/files/digest-metacity-2.8.6-r1
new file mode 100644
index 000000000000..334a96e0c781
--- /dev/null
+++ b/x11-wm/metacity/files/digest-metacity-2.8.6-r1
@@ -0,0 +1 @@
+MD5 c49e4b5575503975516159780855e317 metacity-2.8.6.tar.bz2 2174175
diff --git a/x11-wm/metacity/files/metacity-2-logout.patch b/x11-wm/metacity/files/metacity-2-logout.patch
new file mode 100644
index 000000000000..87c03e130e76
--- /dev/null
+++ b/x11-wm/metacity/files/metacity-2-logout.patch
@@ -0,0 +1,185 @@
+diff -ur metacity-2.8.6/src/keybindings.c metacity-2.8.6-patched/src/keybindings.c
+--- metacity-2.8.6/src/keybindings.c	2004-10-11 23:42:37.000000000 +0800
++++ metacity-2.8.6-patched/src/keybindings.c	2004-12-08 11:50:25.631274776 +0800
+@@ -30,6 +30,7 @@
+ #include "place.h"
+ #include "prefs.h"
+ #include "effects.h"
++#include "session.h"
+ 
+ #include <X11/keysym.h>
+ #include <string.h>
+@@ -84,6 +85,11 @@
+                                        MetaWindow     *window,
+                                        XEvent         *event,
+                                        MetaKeyBinding *binding);
++static void handle_logout             (MetaDisplay    *display,
++                                       MetaScreen     *screen,
++                                       MetaWindow     *window,
++                                       XEvent         *event,
++                                       MetaKeyBinding *binding);
+ static void handle_panel_keybinding   (MetaDisplay    *display,
+                                        MetaScreen     *screen,
+                                        MetaWindow     *window,
+@@ -285,6 +291,8 @@
+     GINT_TO_POINTER (META_TAB_LIST_DOCKS) },  
+   { META_KEYBINDING_SHOW_DESKTOP, handle_toggle_desktop,
+     NULL },
++  { META_KEYBINDING_LOGOUT, handle_logout,
++    NULL },
+   { META_KEYBINDING_PANEL_MAIN_MENU, handle_panel_keybinding,
+     GINT_TO_POINTER (META_KEYBINDING_ACTION_PANEL_MAIN_MENU) },
+   { META_KEYBINDING_PANEL_RUN_DIALOG, handle_panel_keybinding,
+@@ -2785,6 +2793,16 @@
+ }
+ 
+ static void
++handle_logout (MetaDisplay    *display,
++	       MetaScreen     *screen,
++	       MetaWindow     *window,
++	       XEvent         *event,
++	       MetaKeyBinding *binding)
++{
++  meta_session_request_logout ();
++}
++
++static void
+ handle_panel_keybinding (MetaDisplay    *display,
+                          MetaScreen     *screen,
+                          MetaWindow     *window,
+diff -ur metacity-2.8.6/src/metacity.schemas metacity-2.8.6-patched/src/metacity.schemas
+--- metacity-2.8.6/src/metacity.schemas	2004-10-04 01:25:40.000000000 +0800
++++ metacity-2.8.6-patched/src/metacity.schemas	2004-12-08 11:50:25.652271584 +0800
+@@ -22578,6 +22578,29 @@
+       </locale>
+     </schema>
+ 
++     <schema>
++      <key>/schemas/apps/metacity/global_keybindings/logout</key>
++      <applyto>/apps/metacity/global_keybindings/logout</applyto>
++      <owner>metacity</owner>
++      <type>string</type>
++      <default>&lt;Control&gt;&lt;Alt&gt;Delete</default>
++      <locale name="C">
++         <short>Log out</short>
++         <long>
++          The keybinding that logs you out from the session.
++
++          The format looks like "&lt;Control&gt;&lt;Alt&gt;Delete" or
++          "&lt;Shift&gt;&lt;Alt&gt;F1.
++
++          The parser is fairly liberal and allows lower or upper case,
++          and also abbreviations such as "&lt;Ctl&gt;" and
++          "&lt;Ctrl&gt;". If you set the option to the special string
++          "disabled", then there will be no keybinding for this
++          action.
++         </long>
++      </locale>
++    </schema>
++
+     <schema>
+       <key>/schemas/apps/metacity/global_keybindings/panel_main_menu</key>
+       <applyto>/apps/metacity/global_keybindings/panel_main_menu</applyto>
+diff -ur metacity-2.8.6/src/metacity.schemas.in metacity-2.8.6-patched/src/metacity.schemas.in
+--- metacity-2.8.6/src/metacity.schemas.in	2004-07-25 00:28:14.000000000 +0800
++++ metacity-2.8.6-patched/src/metacity.schemas.in	2004-12-08 11:50:25.654271280 +0800
+@@ -1641,6 +1641,29 @@
+       </locale>
+     </schema>
+ 
++     <schema>
++      <key>/schemas/apps/metacity/global_keybindings/logout</key>
++      <applyto>/apps/metacity/global_keybindings/logout</applyto>
++      <owner>metacity</owner>
++      <type>string</type>
++      <default>&lt;Control&gt;&lt;Alt&gt;Delete</default>
++      <locale name="C">
++         <short>Log out</short>
++         <long>
++          The keybinding that logs you out from the session.
++
++          The format looks like "&lt;Control&gt;&lt;Alt&gt;Delete" or
++          "&lt;Shift&gt;&lt;Alt&gt;F1.
++
++          The parser is fairly liberal and allows lower or upper case,
++          and also abbreviations such as "&lt;Ctl&gt;" and
++          "&lt;Ctrl&gt;". If you set the option to the special string
++          "disabled", then there will be no keybinding for this
++          action.
++         </long>
++      </locale>
++    </schema>
++
+     <schema>
+       <key>/schemas/apps/metacity/global_keybindings/panel_main_menu</key>
+       <applyto>/apps/metacity/global_keybindings/panel_main_menu</applyto>
+diff -ur metacity-2.8.6/src/prefs.c metacity-2.8.6-patched/src/prefs.c
+--- metacity-2.8.6/src/prefs.c	2004-09-18 23:54:31.000000000 +0800
++++ metacity-2.8.6-patched/src/prefs.c	2004-12-08 11:50:25.655271128 +0800
+@@ -1421,6 +1421,7 @@
+   { META_KEYBINDING_CYCLE_PANELS, 0, 0, TRUE },
+   { META_KEYBINDING_CYCLE_PANELS_BACKWARD, 0, 0, TRUE },
+   { META_KEYBINDING_SHOW_DESKTOP, 0, 0, FALSE },
++  { META_KEYBINDING_LOGOUT, 0, 0, FALSE },
+   { META_KEYBINDING_PANEL_MAIN_MENU, 0, 0, FALSE },
+   { META_KEYBINDING_PANEL_RUN_DIALOG, 0, 0, FALSE },
+   { META_KEYBINDING_COMMAND_1, 0, 0, FALSE },
+diff -ur metacity-2.8.6/src/prefs.h metacity-2.8.6-patched/src/prefs.h
+--- metacity-2.8.6/src/prefs.h	2004-02-20 02:36:14.000000000 +0800
++++ metacity-2.8.6-patched/src/prefs.h	2004-12-08 11:52:59.051951288 +0800
+@@ -111,6 +111,7 @@
+ #define META_KEYBINDING_CYCLE_PANELS             "cycle_panels"
+ #define META_KEYBINDING_CYCLE_PANELS_BACKWARD    "cycle_panels_backward"
+ #define META_KEYBINDING_SHOW_DESKTOP             "show_desktop"
++#define META_KEYBINDING_LOGOUT			 "logout"
+ #define META_KEYBINDING_PANEL_MAIN_MENU          "panel_main_menu"
+ #define META_KEYBINDING_PANEL_RUN_DIALOG         "panel_run_dialog"
+ #define META_KEYBINDING_COMMAND_1                "run_command_1"
+@@ -211,6 +212,7 @@
+   META_KEYBINDING_ACTION_CYCLE_PANELS,
+   META_KEYBINDING_ACTION_CYCLE_PANELS_BACKWARD,
+   META_KEYBINDING_ACTION_SHOW_DESKTOP,
++  META_KEYBINDING_ACTION_LOGOUT,
+   META_KEYBINDING_ACTION_PANEL_MAIN_MENU,
+   META_KEYBINDING_ACTION_PANEL_RUN_DIALOG,
+   META_KEYBINDING_ACTION_COMMAND_1,
+diff -ur metacity-2.8.6/src/session.c metacity-2.8.6-patched/src/session.c
+--- metacity-2.8.6/src/session.c	2004-08-30 14:14:25.000000000 +0800
++++ metacity-2.8.6-patched/src/session.c	2004-12-08 11:50:25.656270976 +0800
+@@ -357,6 +357,24 @@
+   g_free (saved_client_id);
+ }
+ 
++/**
++ * meta_session_request_logout:
++ *
++ * Requests that a save_yourself be sent to the session manager so that we log
++ * out.
++ **/
++void
++meta_session_request_logout (void)
++{
++  if (!session_connection)
++    {
++      meta_warning (_("Cannot log out because we could not connect to the session manager\n"));
++      return;
++    }
++
++  SmcRequestSaveYourself (session_connection, SmSaveGlobal, TRUE, SmInteractStyleAny, FALSE, TRUE);
++}
++
+ void
+ meta_session_shutdown (void)
+ {
+diff -ur metacity-2.8.6/src/session.h metacity-2.8.6-patched/src/session.h
+--- metacity-2.8.6/src/session.h	2002-09-04 10:44:52.000000000 +0800
++++ metacity-2.8.6-patched/src/session.h	2004-12-08 11:50:25.657270824 +0800
+@@ -72,7 +72,7 @@
+ void meta_session_init (const char *client_id,
+                         const char *save_file);
+ 
+-
++void meta_session_request_logout (void);
+ void meta_session_shutdown (void);
+ 
+ #endif
diff --git a/x11-wm/metacity/metacity-2.8.6-r1.ebuild b/x11-wm/metacity/metacity-2.8.6-r1.ebuild
new file mode 100644
index 000000000000..01e0eb0128df
--- /dev/null
+++ b/x11-wm/metacity/metacity-2.8.6-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/metacity-2.8.6-r1.ebuild,v 1.1 2004/12/08 04:05:30 obz Exp $
+
+inherit gnome2 eutils
+
+DESCRIPTION="Gnome default windowmanager"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~amd64 ~ia64 ~mips ~ppc64 ~arm"
+IUSE="xinerama"
+
+# not parallel-safe; see bug #14405
+MAKEOPTS="${MAKEOPTS} -j1"
+
+RDEPEND="virtual/x11
+	>=x11-libs/pango-1.2
+	>=x11-libs/gtk+-2.2.0-r1
+	>=gnome-base/gconf-2
+	>=x11-libs/startup-notification-0.7"
+
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	>=dev-util/pkgconfig-0.12.0
+	>=dev-util/intltool-0.29"
+
+# Compositor is too unreliable
+G2CONF="${G2CONF} $(use_enable xinerama) --disable-compositor"
+
+DOCS="AUTHORS COPYING ChangeLog HACKING INSTALL NEWS README *txt"
+
+src_unpack() {
+
+	unpack ${A}
+	# Fix the logout shortcut problems, by moving the keybindings
+	# into here, from control-center, fixes bug #52034
+	epatch ${FILESDIR}/metacity-2-logout.patch
+
+}
+
+pkg_postinst() {
+
+	gnome2_pkg_postinst
+
+	einfo "Metacity & Xorg X11 with composite enabled may cause unwanted border effects"
+
+}