From: Mike Gardiner Date: Wed, 8 Dec 2004 04:04:36 +0000 (+0000) Subject: Patch to move the logout keybinding out of control-center, and into metacity - goes... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b81f2b8ac00704ef7de826f3cfcdee0d6fc5b421;p=gentoo.git Patch to move the logout keybinding out of control-center, and into metacity - goes with patch in metacity-2.8.6-r1 --- diff --git a/gnome-base/control-center/ChangeLog b/gnome-base/control-center/ChangeLog index 2b426c0c5961..c2c8c24ca03f 100644 --- a/gnome-base/control-center/ChangeLog +++ b/gnome-base/control-center/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for gnome-base/control-center # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/ChangeLog,v 1.81 2004/11/25 05:29:14 obz Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/ChangeLog,v 1.82 2004/12/08 04:04:36 obz Exp $ + +*control-center-2.8.1-r1 (08 Dec 2004) + + 08 Dec 2004; Mike Gardiner + +control-center-2.8.1-r1.ebuild: + Patch to move the logout keybinding out of control-center, and into metacity + - goes with patch in metacity-2.8.6-r1 *control-center-2.8.1 (25 Nov 2004) diff --git a/gnome-base/control-center/Manifest b/gnome-base/control-center/Manifest index 582b6dd7c44a..d84725c2050e 100644 --- a/gnome-base/control-center/Manifest +++ b/gnome-base/control-center/Manifest @@ -1,14 +1,17 @@ MD5 5d0747c465a083e774f07f4d348fea2c control-center-2.8.1.ebuild 1838 MD5 35adc764e969a2630ffcd21322c6ddab control-center-2.8.0.ebuild 1843 +MD5 6b5d3b0f0157eedc30e1456997b0b6f5 control-center-2.8.1-r1.ebuild 1851 MD5 4451c102f231b8b62a631e19e2e9edb5 control-center-2.6.1.ebuild 1880 MD5 33b394e0936edc187e0ca9481cc6a7c9 control-center-1.4.0.5-r1.ebuild 1259 -MD5 f2c4fc1c32584f67ffcfd1c5674ce9e4 ChangeLog 10639 +MD5 8f31826f704b348fdf03f6da2e1960aa ChangeLog 10881 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158 MD5 3afae17cdd913d2de47ec8017cafe327 files/digest-control-center-2.6.1 74 MD5 0ac36f350969840cdac6ab03ead02612 files/digest-control-center-2.8.0 74 MD5 3c50bab26a7b8dd1ccb40514655a0a79 files/digest-control-center-2.8.1 74 MD5 fdc3d7feea8b429588a2d193c9547dbf files/control-center-2.2.0.1-alpha_hack.patch 2997 +MD5 cfecda4817a0252254abf7ee4d1a10ba files/control-center-2-logout.patch 12887 MD5 63670f480e3cafb0d9dc8b3423425071 files/control-center-2.6.0-remove-pmu.patch 1210 MD5 adbe3cf7b6918f7681569128f76a4b71 files/control-center-2.2-icons_install.patch 2943 MD5 dbc915ad73576e8f0ae8a948e52fb621 files/control-center-1.4.0.5-cflags.patch 744 +MD5 3c50bab26a7b8dd1ccb40514655a0a79 files/digest-control-center-2.8.1-r1 74 MD5 38949ed5d795344f78a96af44764f896 files/digest-control-center-1.4.0.5-r1 76 diff --git a/gnome-base/control-center/control-center-2.8.1-r1.ebuild b/gnome-base/control-center/control-center-2.8.1-r1.ebuild new file mode 100644 index 000000000000..0d65bca87503 --- /dev/null +++ b/gnome-base/control-center/control-center-2.8.1-r1.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/control-center-2.8.1-r1.ebuild,v 1.1 2004/12/08 04:04:36 obz Exp $ + +inherit gnome2 eutils + +DESCRIPTION="The gnome2 Desktop configuration tool" +HOMEPAGE="http://www.gnome.org/" + +LICENSE="GPL-2" +SLOT="2" +KEYWORDS="~x86 ~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~sparc" +IUSE="alsa gstreamer" + +MAKEOPTS="${MAKEOPTS} -j1" + +RDEPEND=">=x11-libs/gtk+-2.3 + virtual/xft + media-libs/fontconfig + >=dev-libs/atk-1.2 + >=gnome-base/gconf-1.2 + >=gnome-base/libgnome-2.2 + >=gnome-base/libgnomeui-2.2 + >=gnome-base/libglade-2 + >=gnome-base/libbonobo-2.2 + >=gnome-base/libbonoboui-2.2 + >=gnome-base/nautilus-2.2 + >=gnome-base/gnome-vfs-2.2 + >=gnome-base/gnome-desktop-2.2 + dev-libs/libxml2 + media-sound/esound + >=x11-wm/metacity-2.8.6-r1 + >=x11-libs/libxklavier-1.02 + !arm? ( alsa? ( >=media-libs/alsa-lib-0.9 ) ) + gstreamer? ( >=media-libs/gst-plugins-0.8 ) + !gnome-extra/fontilus + !gnome-extra/themus + !gnome-extra/acme" + +DEPEND="${RDEPEND} + >=app-text/scrollkeeper-0.3.11 + >=dev-util/pkgconfig-0.12.0 + >=dev-util/intltool-0.29" + +DOCS="AUTHORS ChangeLog README TODO NEWS" + +G2CONF="${G2CONF} \ + --disable-schemas-install\ + --enable-vfs-methods \ + $(use_enable alsa) \ + $(use_enable gstreamer)" + +USE_DESTDIR="1" + +src_unpack() { + + unpack ${A} + cd ${S} + + # See http://gcc.gnu.org/cgi-bin/gnatsweb.pl problem #9700 for + # what this is about. + use alpha && epatch ${FILESDIR}/control-center-2.2.0.1-alpha_hack.patch + + # Temporary workaround for a problematic behaviour with acme. + epatch ${FILESDIR}/control-center-2.6.0-remove-pmu.patch + + # Fix the logout keyboard shortcut by moving it out of + # the control-center here, and into metacity, bug #52034 + epatch ${FILESDIR}/control-center-2-logout.patch + +} diff --git a/gnome-base/control-center/files/control-center-2-logout.patch b/gnome-base/control-center/files/control-center-2-logout.patch new file mode 100644 index 000000000000..3374331e5a29 --- /dev/null +++ b/gnome-base/control-center/files/control-center-2-logout.patch @@ -0,0 +1,337 @@ +diff -ur control-center-2.8.1/capplets/keybindings/gnome-keybinding-properties.c control-center-2.8.1-patched/capplets/keybindings/gnome-keybinding-properties.c +--- control-center-2.8.1/capplets/keybindings/gnome-keybinding-properties.c 2004-09-10 10:34:56.000000000 +0800 ++++ control-center-2.8.1-patched/capplets/keybindings/gnome-keybinding-properties.c 2004-12-08 11:28:52.339884952 +0800 +@@ -41,13 +41,13 @@ + const KeyListEntry desktop_key_list[] = + { + { "/apps/gnome_settings_daemon/keybindings/help", ALWAYS_VISIBLE, 0 }, +- { "/apps/gnome_settings_daemon/keybindings/power", ALWAYS_VISIBLE, 0 }, + { "/apps/gnome_settings_daemon/keybindings/sleep", ALWAYS_VISIBLE, 0 }, + { "/apps/gnome_settings_daemon/keybindings/screensaver", ALWAYS_VISIBLE, 0 }, + { "/apps/gnome_settings_daemon/keybindings/home", ALWAYS_VISIBLE, 0 }, + { "/apps/gnome_settings_daemon/keybindings/search", ALWAYS_VISIBLE, 0 }, + { "/apps/gnome_settings_daemon/keybindings/email", ALWAYS_VISIBLE, 0 }, + { "/apps/gnome_settings_daemon/keybindings/www", ALWAYS_VISIBLE, 0 }, ++ { "/apps/metacity/global_keybindings/logout", ALWAYS_VISIBLE, 0 }, + { "/apps/metacity/global_keybindings/panel_run_dialog", ALWAYS_VISIBLE, 0 }, + { "/apps/metacity/global_keybindings/panel_main_menu", ALWAYS_VISIBLE, 0 }, + { "/apps/metacity/global_keybindings/run_command_screenshot", ALWAYS_VISIBLE, 0 }, +diff -ur control-center-2.8.1/gnome-settings-daemon/actions/acme.h control-center-2.8.1-patched/gnome-settings-daemon/actions/acme.h +--- control-center-2.8.1/gnome-settings-daemon/actions/acme.h 2004-03-24 10:54:33.000000000 +0800 ++++ control-center-2.8.1-patched/gnome-settings-daemon/actions/acme.h 2004-12-08 11:28:52.339884952 +0800 +@@ -29,7 +29,6 @@ + MUTE_KEY, + VOLUME_DOWN_KEY, + VOLUME_UP_KEY, +- POWER_KEY, + EJECT_KEY, + HOME_KEY, + SEARCH_KEY, +@@ -64,7 +63,6 @@ + { MUTE_KEY, GCONF_BINDING_DIR "/volume_mute",NULL }, + { VOLUME_DOWN_KEY, GCONF_BINDING_DIR "/volume_down", NULL }, + { VOLUME_UP_KEY, GCONF_BINDING_DIR "/volume_up", NULL }, +- { POWER_KEY, GCONF_BINDING_DIR "/power", NULL }, + { EJECT_KEY, GCONF_BINDING_DIR "/eject", NULL }, + { HOME_KEY, GCONF_BINDING_DIR "/home", NULL }, + { SEARCH_KEY, GCONF_BINDING_DIR "/search", NULL }, +diff -ur control-center-2.8.1/gnome-settings-daemon/gnome-settings-multimedia-keys.c control-center-2.8.1-patched/gnome-settings-daemon/gnome-settings-multimedia-keys.c +--- control-center-2.8.1/gnome-settings-daemon/gnome-settings-multimedia-keys.c 2004-10-09 09:52:01.000000000 +0800 ++++ control-center-2.8.1-patched/gnome-settings-daemon/gnome-settings-multimedia-keys.c 2004-12-08 11:28:52.340884800 +0800 +@@ -641,22 +641,6 @@ + } + + static void +-do_exit_action (Acme *acme) +-{ +- GnomeClient *master; +- +- master = gnome_master_client(); +- g_return_if_fail(master != NULL); +- +- gnome_client_request_save(master, +- GNOME_SAVE_BOTH, +- TRUE, +- GNOME_INTERACT_ANY, +- FALSE, +- TRUE); +-} +- +-static void + do_eject_action (Acme *acme) + { + GtkWidget *progress; +@@ -797,9 +781,6 @@ + case VOLUME_UP_KEY: + do_sound_action (acme, type); + break; +- case POWER_KEY: +- do_exit_action (acme); +- break; + case EJECT_KEY: + do_eject_action (acme); + break; +diff -ur control-center-2.8.1/schemas/apps_gnome_settings_daemon_keybindings.schemas control-center-2.8.1-patched/schemas/apps_gnome_settings_daemon_keybindings.schemas +--- control-center-2.8.1/schemas/apps_gnome_settings_daemon_keybindings.schemas 2004-10-15 03:00:04.000000000 +0800 ++++ control-center-2.8.1-patched/schemas/apps_gnome_settings_daemon_keybindings.schemas 2004-12-08 11:29:58.511825288 +0800 +@@ -1106,238 +1106,6 @@ + + + +- /schemas/apps/gnome_settings_daemon/keybindings/power +- /apps/gnome_settings_daemon/keybindings/power +- string +- +- +- Log out +- Log out's shortcut. +- +- +- +- تسجيل الخروج +- مختصر تسجيل الخروج. +- +- +- +- İclası sonlandır +- İclası sonlandırma qısa yolu. +- +- +- +- Смяна на потребителя +- Бърз клавиш за излизане от работната среда. +- +- +- +- লগ-আউট +- লগ-আউট করার শর্টকাট। +- +- +- +- Odjava +- Kratica za odjavu. +- +- +- +- Surt +- Drecera per a sortir. +- +- +- +- Odhlásit se +- Zkratka odhlášení. +- +- +- +- Allgofnodi +- Byrlwybr i allgofnodi. +- +- +- +- Logud +- Genvej til logud. +- +- +- +- Abmelden +- Abmelden-Tastenkombination. +- +- +- +- Αποσύνδεση +- Σύντομευση αποσύνδεσης. +- +- +- +- Log out +- Log out's shortcut. +- +- +- +- Log out +- Log out's shortcut. +- +- +- +- Terminar sesión +- Combinación de teclas para terminar sesión. +- +- +- +- Kirjaudu ulos +- Ulos kirjaava pikanäppäin. +- +- +- +- Déconnexion +- Raccourci clavier de « Déconnexion ». +- +- +- +- બહાર નીકળો +- બહાર નીકળવાનું ટુંકાણ. +- +- +- +- लॉग आउट +- लॉगआउट का शॉर्टकट. +- +- +- +- Kijelentkezés +- Kijelentkezés gyorsbillentyűje. +- +- +- +- Termina sessione +- Scorciatoia di «Termina sessione». +- +- +- +- ログアウト +- ログアウトする機能のショートカットです。 +- +- +- +- 로그아웃 +- 로그아웃 바로 가기. +- +- +- +- Atsijungti +- Atsijungimo susiejimas. +- +- +- +- Одјави се +- Кратенка за одјава. +- +- +- +- Logg ut +- Snarvei for å logge ut. +- +- +- +- Afmelden +- Sneltoets voor afmelden +- +- +- +- Logg ut +- Snøggtast som loggar ut. +- +- +- +- Logg ut +- Snarvei for å logge ut. +- +- +- +- ਬਾਹਰੀ ਦਰ +- ਬਾਹਰੀ ਦਰ ਦਾ ਸ਼ਾਰਟਕਟ ਹੈ। +- +- +- +- Wylogowanie +- Klawisz skrótu wylogowania. +- +- +- +- Terminar a sessão +- Atalho para terminar a sessão. +- +- +- +- Sair +- Atalho para Sair +- +- +- +- Deautentificare +- Combinaţie pentru Deautentificare +- +- +- +- Завершить сеанс +- Комбинация клавиш для завершения сеанса. +- +- +- +- Dil jashtë +- Shpejtuesi i tasteve për daljen jashtë(log out). +- +- +- +- Одјава +- Пречица за одјављивање. +- +- +- +- Odjava +- Prečica za odjavljivanje. +- +- +- +- Logga ut +- Genvägen för logga ut. +- +- +- +- இட அமைவு. +- _கனிமேசை குறுக்கு வழிகள். +- +- +- +- ออกจากระบบ +- ปุ่มลัดสำหรับออกจากระบบ +- +- +- +- Çıkış +- Çıkış'ın kısayolu. +- +- +- +- Завершення роботи +- Комбінація клавіш для завершення роботи. +- +- +- +- Đăng xuất +- Phím tắt Đăng xuất. +- +- +- +- 注销 +- 注销的快捷键。 +- +- +- +- +- + /schemas/apps/gnome_settings_daemon/keybindings/eject + /apps/gnome_settings_daemon/keybindings/eject + string +diff -ur control-center-2.8.1/schemas/apps_gnome_settings_daemon_keybindings.schemas.in control-center-2.8.1-patched/schemas/apps_gnome_settings_daemon_keybindings.schemas.in +--- control-center-2.8.1/schemas/apps_gnome_settings_daemon_keybindings.schemas.in 2004-05-18 01:03:38.000000000 +0800 ++++ control-center-2.8.1-patched/schemas/apps_gnome_settings_daemon_keybindings.schemas.in 2004-12-08 11:28:52.341884648 +0800 +@@ -50,18 +50,6 @@ + + + +- /schemas/apps/gnome_settings_daemon/keybindings/power +- /apps/gnome_settings_daemon/keybindings/power +- string +- +- +- Log out +- Log out's shortcut. +- +- +- +- +- + /schemas/apps/gnome_settings_daemon/keybindings/eject + /apps/gnome_settings_daemon/keybindings/eject + string diff --git a/gnome-base/control-center/files/digest-control-center-2.8.1-r1 b/gnome-base/control-center/files/digest-control-center-2.8.1-r1 new file mode 100644 index 000000000000..3d5859c76a3c --- /dev/null +++ b/gnome-base/control-center/files/digest-control-center-2.8.1-r1 @@ -0,0 +1 @@ +MD5 7bd9c12b9abb05b6fcf7b4906b6918ea control-center-2.8.1.tar.bz2 2547071