diff options
Diffstat (limited to 'gnome-base/gnome-session')
14 files changed, 18 insertions, 1428 deletions
diff --git a/gnome-base/gnome-session/ChangeLog b/gnome-base/gnome-session/ChangeLog index 7f39dda35056..a5cbad50d8bb 100644 --- a/gnome-base/gnome-session/ChangeLog +++ b/gnome-base/gnome-session/ChangeLog @@ -1,6 +1,19 @@ # ChangeLog for gnome-base/gnome-session # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.341 2014/09/22 13:10:12 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.342 2014/11/13 11:30:56 pacho Exp $ + + 13 Nov 2014; Pacho Ramos <pacho@gentoo.org> -files/10-user-dirs-update-gnome, + -files/15-xdg-data-gnome, -files/defaults.list, + -files/gnome-session-2.32.0-session-saving-button.patch, + -files/gnome-session-2.32.1-dialog-size.patch, + -files/gnome-session-2.32.1-dialog-size2.patch, + -files/gnome-session-2.32.1-gnome3-conditions.patch, + -files/gnome-session-2.32.1-gsettings-conditions.patch, + -files/gnome-session-2.32.1-idle-transition.patch, + -files/gnome-session-3.8.4-blacklist-nv25.patch, + -files/gnome-session-3.8.4-presence-crash.patch, + -gnome-session-2.32.1-r3.ebuild: + Drop old (#508854) *gnome-session-3.12.1-r1 (22 Sep 2014) diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest index e681e5aa5a41..720e23747bc0 100644 --- a/gnome-base/gnome-session/Manifest +++ b/gnome-base/gnome-session/Manifest @@ -1,33 +1,20 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX 10-user-dirs-update-gnome 264 SHA256 f060f401bf0e3f7dad91ce675666853de062d8523a3749f1040c4895bc3db931 SHA512 57ffafeaba34ed4102ba7fc7b1ac91db8fce4ee5d122daebe1bff28f4dc2da45bc85b825ea9fae22f70de4f7941ab602b42da661e632c692350f1d3d589c62c2 WHIRLPOOL 3435353ef4be7e32ff3c5842a54f8fad7b705c248e8ddf1a19151dba3ab55c452c45db5e3f53c128a3e165986d44c366297adc7abf3e4d890c4df3847286e88f AUX 10-user-dirs-update-gnome-r1 299 SHA256 4baf3771a18f87db323580d868f232bf33830f72dcc54b4b3aa3d9bc9cce05e5 SHA512 9e4b7e32546433e913928f0e357eef2936750bea0996dbb33443bc1f2ac32a3e38880abad6985a229382ef06138583de65b6f1e76dea3ac4577e10fec7f46b2a WHIRLPOOL 0dca330c2bedd4cfb056d162550680f4fcf89b94598ace9e02d0289d9e6a4414aa184b2444ce768e8f757ee9ce492fa9288616c25ca8885dbe92dffec28fd9f6 -AUX 15-xdg-data-gnome 227 SHA256 dca4022749bd9a7657dc077546ce0bc65312e87054e6f98761a7f1dd5f6a88cd SHA512 f6039b3640b69f468f47eeeb3bd0116b470930cbfab93630c065b17355b3686eda00007311b2b8d0f5c24dfb902e1175aae11a8f930a9e039ca6945e84af4e8f WHIRLPOOL 4a0eccdd48ea38a3edcbae80c665ff1126c4356dff47910ebe1b2fa428649887d073f0d7d7ea44c632a6e06308d0b7c04c5d6b9796e9b39dc78a568e73882669 AUX 15-xdg-data-gnome-r1 262 SHA256 860767c9ee4fc9e0d29c20cd8143311db7d0981ed4f590069d0d9edf46ec0b24 SHA512 aecdebbaaad1bd3032d687975017f040b58520fe8d5848dc5fd9b726aba8904dda314a315d3ee33e76bb11eddf8785a939a0a83634d99ba74a0342683840fcbc WHIRLPOOL dbf53f428300ec213eb7397f88cdb54a7c4c4f6bf9d45a07e84894db83e95906cb45a217d437db1e875c000c77c5658b97b6f21050c8d89d20b0750a102aac2e AUX Gnome 2391 SHA256 ffc912945278c88ef854c8988b0042675ffa78525592f34580ee76c1f25309d3 SHA512 a994e811855c822c3f03354ec7608587f4102e6e9039dd35aec75e825b7610b259d4e1e7246cb6136ec2f7a4d27c1859dc02945fb13c448aafc26b8a2dae53a6 WHIRLPOOL 7c3d492309bd3916b24ab48e0fc31a7924ce1ce6661f27770e6b8cc3c902fd06c1f22f6950d46dcac97b8d82a9f95f0b5cc12235dd0e78bc34b4cb2a5f0a7da0 -AUX defaults.list 14505 SHA256 efe30d8f5be448661870fec6a5e49ae98ecfb73f06ee4ab0926990cb15223354 SHA512 8f343fff8ad08bf98e2c96157c04a6c3253d719455293e8296a8c8c383c94bea3666b4936ae5687d1d5de2d04a599271e3520aff5e52474eb63a87d1fc5c24e8 WHIRLPOOL ee81a0a72b87c3f10b7dc9a1479d296d1d885eb10ec06cc517969a9c4fb3f7229e70f5a8c470152492bc52730afde4f06068289f09981555e06a2a6635bdd92f AUX defaults.list-r1 16386 SHA256 e98a66ad71c7e2233334ec5484b768cfd91e38fa428ec376c0ef1a3d8ca7116f SHA512 bf98a58dbcd0673f2cd157ed867a0bb282108a28466347524f7dadcf6d1c791404d642b5373a9d4eb50a965beafc1c278edfb0423b3112e65f56227561429939 WHIRLPOOL 84c8c32b8f45be1120e50c6e497a8c723b954e6da34c13a85ac3420c6c7cb4cb7eb2f93a83cb05598f5b3c22fe5530ff4db5c65a872d71a620ce1418ee8cb317 AUX defaults.list-r2 16773 SHA256 ebb1be82f7a24e2e3a82ccb93ca5a19a348f1d00330b03bbba27124dffa816bf SHA512 2e761609871e1508136ef9a324a506ac4318d53727445dbcc8ddcf8e7b44f8f6172834dda3aa5e8f9c2ab7fc186c6c674adddef8c3bf6b4e9467e7570867ee65 WHIRLPOOL 0d42647906e882936db706488ede69bfed824ca91af63d08f9dc5b9f3ffe1b2e076f6c0f210e24da173b06c1e793827118c8248f506eff89b95e083678ae7396 -AUX gnome-session-2.32.0-session-saving-button.patch 21424 SHA256 7a2dd8771180bc460fdc034ad95d61ed83b14952b16b17c3cb9a10aade8a1a97 SHA512 e9d506fbb690a560c362f4e16e4bd7353aaa437faa2e36673456fab294e555ad61d4774821acc976a44894a81a42b34c867e64e1aad27eb5fa946bf5880ac8d3 WHIRLPOOL 493a0fe84f8d755ec843cc6e86215eec1a788dda1d494a58e7048747c995ad666ed06932a2cf788e1c5458bd9c245251232ef9f6fc2e78d0182dfd8be4f51edf -AUX gnome-session-2.32.1-dialog-size.patch 953 SHA256 8f96daba40ae19223d54aa271f79e0a6541e4c936771815a4599077533c6948b SHA512 0ffcbeba40449c1ed0741e0d988b87504741d371b1ce897b013ec4dbdf813f0d632b88f41ffdbd080a50a752e58bce63c17cc80b6550853f01fe8cdb2dd6785c WHIRLPOOL 2f78f956521ee65d0b4e9b3cdfe8b151172d8553c071edc8230363e1cc366866c04e866da7a1a1b56b0363c3aad22b7fcbb3a9e7e9540ede87e2e56fc9724040 -AUX gnome-session-2.32.1-dialog-size2.patch 1114 SHA256 fefa53adb80c531fecc4fa4e67f5faff7ee5cfd33a290c689dca9f2267525f6e SHA512 6fb6d6214051d61470fe50bbb4db4d4f7c0b7475a28f72c485f16dba7a885fde7d7bfc2375b11fc82b5da1a3e0fd6e5d609a6ac70fe6a25a72a3cca2c1bce3c8 WHIRLPOOL 225f5b0ca3fa341c8bf591f66e257fad080f0fcf920625271a395331f3c89d1b1607f7ae13f18796bc8f62bcac7973c24901c9396939b257c5f70fa9a8568eff -AUX gnome-session-2.32.1-gnome3-conditions.patch 4552 SHA256 88482711f19399b766ed562c43511d8a6db1e1df2790945cd1819d7f616af42e SHA512 c6547805cdb8619b0cb27e8f450ca4688bbfc83925f4ad76dadacf33983293a9cea7ab3db587547de38dd4794286dc66996ee4d75aecdace3cd5dc74226ad787 WHIRLPOOL bb58874a45be0202ddfbec6d875c951a3bfde8138250667ce19b6c73e1924497e217acb8182f56c6da40b59790347b603527ee90fe4e6f63f3c851cf29a0de4b -AUX gnome-session-2.32.1-gsettings-conditions.patch 5085 SHA256 a57d614d533a54d0d3c186d521c53caad7150d4dc19863b9171472b1a48c01b0 SHA512 289592081a1f9fb44cb0d21566cbca9e649db8588a1bf23628f1d3c01283e6d2c9bd0141ed3803399ab1f61e71c1b540145a061f25428adbd3efad1916e1ff99 WHIRLPOOL c49000b4237f7451f42463e870112939079a9fa4f80e4856be51df9b08c0f33628b004dc0c44e70066fb9d3099e7c0e7b73dc55cf54e807da84596c8b5665072 -AUX gnome-session-2.32.1-idle-transition.patch 1802 SHA256 6e80574672ff9e4b9a63796959d1e83af0f184eb4ad507bcbe6589c364b63038 SHA512 c09e0df938d46cc95f0b997142e63c109e8fd4b52dc07c36b1642f0688b3e2faf5627c88a6d0cb81b672d714354cc1f3d19c5c2d6cbcfdd889aadd638bda6958 WHIRLPOOL 1fab4d3c7b9785125d8f8540500941d1f897f8a20e16e16e113b0a9b7a28324c42e1976a49328fb8c7c6337a519fa5c917463da5ba7a360d1ae459261a61f850 -AUX gnome-session-3.8.4-blacklist-nv25.patch 592 SHA256 2c0894db69a13678d12047f14eae213c6ebf1c2b940e9e46a9297ef4ad1e2b8d SHA512 d112f286256f0dc94daf887cf40153a76fccd5684cd9f638510cd1caeeb5de2f51ffe2e298e992a6dab6d7a5ea11e12d0372365ecb2e29d0c2759f7ccc25ed94 WHIRLPOOL 40e1bb37592199fa25a188a8868d83116d336db12db29a7de7ecf611eaf92c239c35233c38f85f45b251e8a974f330ae0bdce4e28854b6a8ad651b261eecd24c -AUX gnome-session-3.8.4-presence-crash.patch 2036 SHA256 14e24caadd8ed2056b00b0bd4eef0dec61b07fa9e72d8ca990e64bcfa42dabcb SHA512 dff7f096d562f8b7b661b6eda1d65a3f9a992cd4cd22604034f44ea77ca72b1282b9bced4702ca24e89185f97de54b4a554877b7cbc8a1ca9f55ef15030f3ac9 WHIRLPOOL faa03513c86fec3f313c3a1a14e40d86d2d35b636d5ad8aa70f17ae51424e205ae99dd00670ac41aaa2465e7281c63bc48574a41d5978ca78bf832a51a574ad0 -DIST gnome-session-2.32.1.tar.bz2 774842 SHA256 22d93ce433fcf9c7ce6b5f36dd81f64e692ea0e41faaa0f61159ddac28c3686a SHA512 5d688e971ff440d33c7fff86db7b11d06aa39e9f6b4654a54ef6f4b608fe39c24b13be04726c69dbca4600fa91dc21b2f12415499367ec6045212828674bed99 WHIRLPOOL e03c121c5c644975deae06590828ce84a66e583838fc7de28752026e6c798b6fa4eaa4d6cdfa4975930c7ead730568e051c4dc280e5c7c80ab2bd4e64ffe9ca0 DIST gnome-session-3.12.1.tar.xz 718380 SHA256 fa308771ac18bc5f77e5a5be3b2d93df1625168cb40167c1dfa898e9006e25d3 SHA512 ee435aa31e2971f4d7246c748cace17a67f5697cbf016084aea4c263b2b2c096590b50920bc70ab45fb11e1470558f9c5b8864a37ae838f4a306ddc49acc5f2b WHIRLPOOL 41677526ad3323c7177ae592525f64d969004c475e9f17bddfb285a4d117a7cfc188c0b378b33f242be9a5d522441868b55f6c0a4f5029eb1949d195fef26517 -EBUILD gnome-session-2.32.1-r3.ebuild 2999 SHA256 8aa4a5faf11e1bf7f268cf9388eacfbbff017fa7eea3b58f23a4ce8d5f1a83d4 SHA512 e820a1bac84f06f9db5a4eb66ce58fe36d590a0c485483eb39920561f0249eefe20a0e5a08bb3dc0866ea8496c3cfba99e6d5bd2a8e77a732f415d939edd9246 WHIRLPOOL f294df3f7a16f871f60103dad6f7e50e4dc68e1416399054a793c325ffc11de3dd0a5b2d601f2f4934bdeba53e75c643fa97b8fa5c837dac9ed17c728138fb6f EBUILD gnome-session-3.12.1-r1.ebuild 3393 SHA256 e4f396153f6f47b17fbfd628bc3a4172dc8144511d3ac6158bd5a905c8fc77cd SHA512 6ed9c230feb87b9ef79927afe48dab236babb7f09630fb102b95eab89f09d6158c5cd1a651b779fa91eda6b1ab593a432cf918f4432d3399afca0ea30381647a WHIRLPOOL 1e53c3358acfa048db78f83f13e53ed5eb596af6b204a609dbbc8e636832ab793396d6961de61bcec191a81f70b020e3f1aba5c54787a5a34a65207a69ccf925 EBUILD gnome-session-3.12.1.ebuild 3441 SHA256 b61ea04691a542561ff1f9d1b5f498739e9f8728dd6231df435082f0ccfdab75 SHA512 7e0af6166c61b04f26ee8257dfc95994b076fa41c03888bc9ea57da022f42fdfc8c032832bf64e8826aac4dc66f63a7a6b502f0803fbe305066cddbf187ba895 WHIRLPOOL 9c750e398c7f3b7f2e3d97c8918c683cd212d67d82778021d55552d525285c5c4ac67879bfa227cf7c8e8a26d551cc0b97e7445e1e394d69e8a5c713bce5c656 -MISC ChangeLog 51463 SHA256 2f5bcd261628ec9a06805c0f80cc3bb7c2dbeab0ab1c06a48a10abba1480d157 SHA512 5a8cb47cd1feed40428bc49839e7b1060d6acd71a296e42ecaea2c9f1e4d0cb214f59bff1669b4fb85023e2c841d8c658d722d7d63914bef97e0ca9e5b4563b6 WHIRLPOOL 44902172ff25997f4441b4a47c3fefe1fd8c34ba3397eafa8ff0b346acb39fe66dc6be4c23e25299cf7c74feee3e816366b853dea5b84b4c5b581941897ad826 +MISC ChangeLog 52076 SHA256 1000a147f8b9173c8f2eb39467c32a00da7533c58e87a8545aecf6f3283ae501 SHA512 9d9518095896f90e8ff64023009865277abf8efabe2c0133c23856a01cc5312f29b502734758d2052d00eafcad531d632704f2df2f976c67a5b1400563d3e146 WHIRLPOOL 8a04cd4694b1d1ed1ebc8d2e57bd451eca6a5b796798017d6fbea29fdf6b14899a71ea82679097e87b1f5218bfaf8ca1d1ae494263de2b818d8df35f951ebb8c MISC metadata.xml 278 SHA256 4b6d5cc443e75f79675a992f133fdcf809fc528ca0e53bdbaf96a69383323c1d SHA512 32c59f5a0898ec7378ad33ac5a3f885f9b825633dfc0373603d413e8bf36b264c4efe03b8c0f4813237474ad858f929a74643869b7604c128e1ac5a5d1875b60 WHIRLPOOL 5552633b5518f886a89fa3a7b69ca5e8e7b81cc3436dc573e10990a4dea1e40ef14731a756501266449bbde0d9211145f9dccf3e3b728036645d6de1a6995295 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlQgH7UACgkQCaWpQKGI+9T0vACeMpevaoaNJHMOnFSyzPEAmf/j -KpkAn0NnkukLJyBuklcRDdKlvburNfl7 -=P/sl +iEYEAREIAAYFAlRklnIACgkQCaWpQKGI+9QohQCeNwQPAJS+yp/+it8ladQSluNn +KgYAn3YvZEZYDdsOG3jBIZhy02a/qsaV +=9dUL -----END PGP SIGNATURE----- diff --git a/gnome-base/gnome-session/files/10-user-dirs-update-gnome b/gnome-base/gnome-session/files/10-user-dirs-update-gnome deleted file mode 100755 index f909d44dacdf..000000000000 --- a/gnome-base/gnome-session/files/10-user-dirs-update-gnome +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -# Create various XDG directories, and write ~/.config/user-dirs.dirs, etc. -# That file is read by glib to get XDG_PICTURES_DIR, etc - -if [ "$DESKTOP_SESSION" = "gnome" ]; then - if type xdg-user-dirs-update &>/dev/null; then - xdg-user-dirs-update - fi -fi diff --git a/gnome-base/gnome-session/files/15-xdg-data-gnome b/gnome-base/gnome-session/files/15-xdg-data-gnome deleted file mode 100644 index e62f3e1c6baa..000000000000 --- a/gnome-base/gnome-session/files/15-xdg-data-gnome +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -if [ "$DESKTOP_SESSION" = "gnome" ]; then - if [ -z "$XDG_DATA_DIRS" ]; then - export XDG_DATA_DIRS=/usr/share/gnome:/usr/local/share/:/usr/share/ - else - export XDG_DATA_DIRS=/usr/share/gnome:"$XDG_DATA_DIRS" - fi -fi diff --git a/gnome-base/gnome-session/files/defaults.list b/gnome-base/gnome-session/files/defaults.list deleted file mode 100644 index 572b5407002c..000000000000 --- a/gnome-base/gnome-session/files/defaults.list +++ /dev/null @@ -1,333 +0,0 @@ -[Default Applications] -application/rtf=abiword.desktop -application/x-abiword=abiword.desktop -text/abiword=abiword.desktop -text/richtext=abiword.desktop -text/rtf=abiword.desktop -text/x-abiword=abiword.desktop -text/x-xml-abiword=abiword.desktop -x-content/blank-bd=brasero-nautilus.desktop -x-content/blank-dvd=brasero-nautilus.desktop -x-content/blank-cd=brasero-nautilus.desktop -x-content/blank-hddvd=brasero-nautilus.desktop -application/x-dia-diagram=dia.desktop -image/bmp=eog.desktop -image/gif=eog.desktop -image/jpeg=eog.desktop -image/jpg=eog.desktop -image/pjpeg=eog.desktop -image/png=eog.desktop -image/svg+xml=eog.desktop -image/svg+xml-compressed=eog.desktop -image/x-bmp=eog.desktop -image/x-gray=eog.desktop -image/x-icb=eog.desktop -image/x-ico=eog.desktop -image/x-pcx=eog.desktop -image/x-png=eog.desktop -image/x-portable-anymap=eog.desktop -image/x-portable-bitmap=eog.desktop -image/x-portable-graymap=eog.desktop -image/x-portable-pixmap=eog.desktop -image/x-xbitmap=eog.desktop -image/x-xpixmap=eog.desktop -image/vnd.wap.wbmp=eog.desktop -image/g3fax=gimp.desktop -image/x-compressed-xcf=gimp.desktop -image/x-fits=gimp.desktop -image/x-icon=gimp.desktop -image/x-psd=gimp.desktop -image/x-sgi=gimp.desktop -image/x-sun-raster=gimp.desktop -image/x-tga=gimp.desktop -image/x-xcf=gimp.desktop -image/x-xwindowdump=gimp.desktop -application/xhtml+xml=firefox.desktop;firefox-3.6.desktop;epiphany.desktop -text/html=firefox.desktop;firefox-3.6.desktop;epiphany.desktop -application/pdf=evince.desktop -application/x-bzpdf=evince.desktop -application/x-gzpdf=evince.desktop -application/postscript=evince.desktop -application/x-bzpostscript=evince.desktop -application/x-gzpostscript=evince.desktop -image/x-eps=evince.desktop -image/x-bzeps=evince.desktop -image/x-gzeps=evince.desktop -application/x-dvi=evince.desktop -application/x-bzdvi=evince.desktop -application/x-gzdvi=evince.desktop -image/vnd.djvu=evince.desktop -image/tiff=evince.desktop -application/x-cbr=evince.desktop -application/x-cbz=evince.desktop -application/x-cb7=evince.desktop -application/x-7z-compressed=file-roller.desktop -application/x-7z-compressed-tar=file-roller.desktop -application/x-ace=file-roller.desktop -application/x-alz=file-roller.desktop -application/x-ar=file-roller.desktop -application/x-arj=file-roller.desktop -application/x-bzip=file-roller.desktop -application/x-bzip-compressed-tar=file-roller.desktop -application/x-bzip1=file-roller.desktop -application/x-bzip1-compressed-tar=file-roller.desktop -application/x-cabinet=file-roller.desktop -application/x-cd-image=file-roller.desktop -application/x-compress=file-roller.desktop -application/x-compressed-tar=file-roller.desktop -application/x-cpio=file-roller.desktop -application/x-deb=file-roller.desktop -application/x-ear=file-roller.desktop -application/x-gtar=file-roller.desktop -application/x-gzip=file-roller.desktop -application/x-java-archive=file-roller.desktop -application/x-lha=file-roller.desktop -application/x-lhz=file-roller.desktop -application/x-lzip=file-roller.desktop -application/x-lzip-compressed-tar=file-roller.desktop -application/x-lzma=file-roller.desktop -application/x-lzma-compressed-tar=file-roller.desktop -application/x-lzop=file-roller.desktop -application/x-lzop-compressed-tar=file-roller.desktop -application/x-rar=file-roller.desktop -application/x-rar-compressed=file-roller.desktop -application/x-rpm=file-roller.desktop -application/x-rzip=file-roller.desktop -application/x-tar=file-roller.desktop -application/x-tarz=file-roller.desktop -application/x-stuffit=file-roller.desktop -application/x-war=file-roller.desktop -application/x-xz=file-roller.desktop -application/x-xz-compressed-tar=file-roller.desktop -application/x-zip=file-roller.desktop -application/x-zip-compressed=file-roller.desktop -application/x-zoo=file-roller.desktop -application/zip=file-roller.desktop -multipart/x-zip=file-roller.desktop -text/plain=gedit.desktop -text/css=gedit.desktop -text/javascript=gedit.desktop -text/mathml=gedit.desktop -text/x-csrc=gedit.desktop -text/x-chdr=gedit.desktop -text/x-dtd=gedit.desktop -text/x-java=gedit.desktop -text/x-javascript=gedit.desktop -text/x-patch=gedit.desktop -text/x-perl=gedit.destkop -text/x-php=gedit.destkop -text/x-python=gedit.destkop -text/x-sql=gedit.desktop -text/xml=gedit.desktop -application/javascript=gedit.destkop -application/x-cgi=gedit.desktop -application/x-javascript=gedit.desktop -application/x-perl=gedit.desktop -application/x-php=gedit.desktop -application/x-python=gedit.desktop -application/xml=gedit.desktop -application/xml-dtd=gedit.desktop -application/x-font-ttf=gnome-font-viewer.desktop -application/x-font-pcf=gnome-font-viewer.desktop -application/x-font-type1=gnome-font-viewer.desktop -application/x-font-otf=gnome-font-viewer.desktop -application/csv=gnumeric.desktop -application/excel=gnumeric.desktop -application/msexcel=gnumeric.desktop -application/tab-separated-values=gnumeric.desktop -application/vnd.lotus-1-2-3=gnumeric.desktop -application/vnd.ms-excel=gnumeric.desktop -application/x-123=gnumeric.desktop -application/x-applix-spreadsheet=gnumeric.desktop -application/x-dbase=gnumeric.desktop -application/x-dbf=gnumeric.desktop -application/x-dos_ms_excel=gnumeric.desktop -application/x-excel=gnumeric.desktop -application/x-gnumeric=gnumeric.desktop -application/x-mps=gnumeric.desktop -application/x-ms-excel=gnumeric.desktop -application/x-msexcel=gnumeric.desktop -application/x-oleo=gnumeric.desktop -application/x-planperfect=gnumeric.desktop -application/x-quattropro=gnumeric.desktop -application/x-sc=gnumeric.desktop -application/x-sylk=gnumeric.desktop -application/x-xbase=gnumeric.desktop -application/x-xls=gnumeric.desktop -application/xls=gnumeric.desktop -text/comma-separated-values=gnumeric.desktop -text/csv=gnumeric.desktop -text/spreadsheet=gnumeric.desktop -text/tab-separated-values=gnumeric.desktop -text/x-comma-separated-values=gnumeric.desktop -text/x-csv=gnumeric.desktop -zz-application/zz-winassoc-xls=gnumeric.desktop -x-content/software=nautilus-autorun-software.desktop -x-directory/gnome-default-handler=nautilus-folder-handler.desktop -x-directory/normal=nautilus-folder-handler.desktop -inode/directory=nautilus-folder-handler.desktop -application/x-gnome-saved-search=nautilus-folder-handler.desktop -application/vnd.oasis.opendocument.spreadsheet=libreoffice-calc.desktop;openoffice.org-calc.desktop -application/vnd.oasis.opendocument.spreadsheet-template=libreoffice-calc.desktop;openoffice.org-calc.desktop -application/vnd.sun.xml.calc=libreoffice-calc.desktop;openoffice.org-calc.desktop -application/vnd.sun.xml.calc.template=libreoffice-calc.desktop;openoffice.org-calc.desktop -application/vnd.stardivision.calc=libreoffice-calc.desktop;openoffice.org-calc.desktop -application/vnd.stardivision.chart=libreoffice-calc.desktop;openoffice.org-calc.desktop -application/vnd.openxmlformats-officedocument.spreadsheetml.sheet=libreoffice-calc.desktop;openoffice.org-calc.desktop -application/vnd.ms-excel.sheet.macroenabled.12=libreoffice-calc.desktop;openoffice.org-calc.desktop -application/vnd.openxmlformats-officedocument.spreadsheetml.template=libreoffice-calc.desktop;openoffice.org-calc.desktop -application/vnd.ms-excel.template.macroenabled.12=libreoffice-calc.desktop;openoffice.org-calc.desktop -application/vnd.ms-excel.sheet.binary.macroenabled.12=libreoffice-calc.desktop;openoffice.org-calc.desktop -application/vnd.oasis.opendocument.graphics=libreoffice-draw.desktop;openoffice.org-draw.desktop -application/vnd.oasis.opendocument.graphics-template=libreoffice-draw.desktop;openoffice.org-draw.desktop -application/vnd.sun.xml.draw=libreoffice-draw.desktop;openoffice.org-draw.desktop -application/vnd.sun.xml.draw.template=libreoffice-draw.desktop;openoffice.org-draw.desktop -application/vnd.stardivision.draw=libreoffice-draw.desktop;openoffice.org-draw.desktop -application/vnd.oasis.opendocument.presentation=libreoffice-impress.desktop;openoffice.org-impress.desktop -application/vnd.oasis.opendocument.presentation-template=libreoffice-impress.desktop;openoffice.org-impress.desktop -application/vnd.sun.xml.impress=libreoffice-impress.desktop;openoffice.org-impress.desktop -application/vnd.sun.xml.impress.template=libreoffice-impress.desktop;openoffice.org-impress.desktop -application/vnd.stardivision.impress=libreoffice-impress.desktop;openoffice.org-impress.desktop -application/mspowerpoint=libreoffice-impress.desktop;openoffice.org-impress.desktop -application/vnd.ms-powerpoint=libreoffice-impress.desktop;openoffice.org-impress.desktop -application/vnd.openxmlformats-officedocument.presentationml.presentation=libreoffice-impress.desktop;openoffice.org-impress.desktop -application/vnd.ms-powerpoint.presentation.macroenabled.12=libreoffice-impress.desktop;openoffice.org-impress.desktop -application/vnd.openxmlformats-officedocument.presentationml.template=libreoffice-impress.desktop;openoffice.org-impress.desktop -application/vnd.ms-powerpoint.template.macroenabled.12=libreoffice-impress.desktop;openoffice.org-impress.desktop -application/vnd.oasis.opendocument.formula=libreoffice-math.desktop;openoffice.org-math.desktop -application/vnd.sun.xml.math=libreoffice-math.desktop;openoffice.org-math.desktop -application/vnd.stardivision.math=libreoffice-math.desktop;openoffice.org-math.desktop -application/vnd.oasis.opendocument.text=libreoffice-writer.desktop;openoffice.org-writer.desktop -application/vnd.oasis.opendocument.text-template=libreoffice-writer.desktop;openoffice.org-writer.desktop -application/vnd.oasis.opendocument.text-web=libreoffice-writer.desktop;openoffice.org-writer.desktop -application/vnd.oasis.opendocument.text-master=libreoffice-writer.desktop;openoffice.org-writer.desktop -application/vnd.sun.xml.writer=libreoffice-writer.desktop;openoffice.org-writer.desktop -application/vnd.sun.xml.writer.template=libreoffice-writer.desktop;openoffice.org-writer.desktop -application/vnd.sun.xml.writer.global=libreoffice-writer.desktop;openoffice.org-writer.desktop -application/vnd.stardivision.writer=libreoffice-writer.desktop;openoffice.org-writer.desktop -application/msword=libreoffice-writer.desktop;openoffice.org-writer.desktop -application/vnd.ms-word=libreoffice-writer.desktop;openoffice.org-writer.desktop -application/x-doc=libreoffice-writer.desktop;openoffice.org-writer.desktop -application/vnd.wordperfect=libreoffice-writer.desktop;openoffice.org-writer.desktop -application/wordperfect=libreoffice-writer.desktop;openoffice.org-writer.desktop -application/vnd.openxmlformats-officedocument.wordprocessingml.document=libreoffice-writer.desktop;openoffice.org-writer.desktop -application/vnd.ms-word.document.macroenabled.12=libreoffice-writer.desktop;openoffice.org-writer.desktop -application/vnd.openxmlformats-officedocument.wordprocessingml.template=libreoffice-writer.desktop;openoffice.org-writer.desktop -application/vnd.ms-word.template.macroenabled.12=libreoffice-writer.desktop;openoffice.org-writer.desktop -x-content/audio-player=rhythmbox.desktop -x-content/audio-cdda=sound-juicer.desktop -application/x-shockwave-flash=swfdec-player.desktop -application/futuresplash=swfdec-player.desktop -application/mxf=totem.desktop -application/ogg=totem.desktop -application/ram=totem.desktop -application/sdp=totem.desktop -application/smil=totem.desktop -application/smil+xml=totem.desktop -application/vnd.ms-wpl=totem.desktop -application/vnd.rn-realmedia=totem.desktop -application/x-extension-m4a=totem.desktop -application/x-extension-mp4=totem.desktop -application/x-flac=totem.desktop -application/x-flash-video=totem.desktop -application/x-matroska=totem.desktop -application/x-netshow-channel=totem.desktop -application/x-ogg=totem.desktop -application/x-quicktime-media-link=totem.desktop -application/x-quicktimeplayer=totem.desktop -application/x-shorten=totem.desktop -application/x-smil=totem.desktop -application/xspf+xml=totem.desktop -audio/3gpp=totem.desktop -audio/ac3=totem.desktop -audio/AMR=totem.desktop -audio/AMR-WB=totem.desktop -audio/basic=totem.desktop -audio/midi=totem.desktop -audio/mp4=totem.desktop -audio/mpeg=totem.desktop -audio/mpegurl=totem.desktop -audio/ogg=totem.desktop -audio/prs.sid=totem.desktop -audio/vnd.rn-realaudio=totem.desktop -audio/x-ape=totem.desktop -audio/x-flac=totem.desktop -audio/x-gsm=totem.desktop -audio/x-it=totem.desktop -audio/x-m4a=totem.desktop -audio/x-matroska=totem.desktop -audio/x-mod=totem.desktop -audio/x-mp3=totem.desktop -audio/x-mpeg=totem.desktop -audio/x-mpegurl=totem.desktop -audio/x-ms-asf=totem.desktop -audio/x-ms-asx=totem.desktop -audio/x-ms-wax=totem.desktop -audio/x-ms-wma=totem.desktop -audio/x-musepack=totem.desktop -audio/x-pn-aiff=totem.desktop -audio/x-pn-au=totem.desktop -audio/x-pn-realaudio=totem.desktop -audio/x-pn-realaudio-plugin=totem.desktop -audio/x-pn-wav=totem.desktop -audio/x-pn-windows-acm=totem.desktop -audio/x-realaudio=totem.desktop -audio/x-real-audio=totem.desktop -audio/x-sbc=totem.desktop -audio/x-scpls=totem.desktop -audio/x-speex=totem.desktop -audio/x-tta=totem.desktop -audio/x-vorbis=totem.desktop -audio/x-vorbis+ogg=totem.desktop -audio/x-wav=totem.desktop -audio/x-wavpack=totem.desktop -audio/x-xm=totem.desktop -image/vnd.rn-realpix=totem.desktop -image/x-pict=totem.desktop -misc/ultravox=totem.desktop -text/google-video-pointer=totem.desktop -text/x-google-video-pointer=totem.desktop -video/3gpp=totem.desktop -video/dv=totem.desktop -video/fli=totem.desktop -video/flv=totem.desktop -video/mp2t=totem.desktop -video/mp4=totem.desktop -video/mp4v-es=totem.desktop -video/mpeg=totem.desktop -video/msvideo=totem.desktop -video/ogg=totem.desktop -video/quicktime=totem.desktop -video/vivo=totem.desktop -video/vnd.divx=totem.desktop -video/vnd.rn-realvideo=totem.desktop -video/vnd.vivo=totem.desktop -video/webm=totem.desktop -video/x-anim=totem.desktop -video/x-avi=totem.desktop -video/x-flc=totem.desktop -video/x-fli=totem.desktop -video/x-flic=totem.desktop -video/x-flv=totem.desktop -video/x-m4v=totem.desktop -video/x-matroska=totem.desktop -video/x-mpeg=totem.desktop -video/x-ms-asf=totem.desktop -video/x-ms-asx=totem.desktop -video/x-msvideo=totem.desktop -video/x-ms-wm=totem.desktop -video/x-ms-wmv=totem.desktop -video/x-ms-wmx=totem.desktop -video/x-ms-wvx=totem.desktop -video/x-nsv=totem.desktop -video/x-ogm+ogg=totem.desktop -video/x-theora+ogg=totem.desktop -video/x-totem-stream=totem.desktop -x-content/video-dvd=totem.desktop -x-content/video-vcd=totem.desktop -x-content/video-svcd=totem.desktop -x-scheme-handler/ghelp=yelp.desktop; -x-scheme-handler/help=yelp.desktop; -x-scheme-handler/http=firefox.desktop;epiphany.desktop -x-scheme-handler/https=firefox.desktop;epiphany.desktop -x-scheme-handler/mailto=evolution.desktop
\ No newline at end of file diff --git a/gnome-base/gnome-session/files/gnome-session-2.32.0-session-saving-button.patch b/gnome-base/gnome-session/files/gnome-session-2.32.0-session-saving-button.patch deleted file mode 100644 index b407f9a4d880..000000000000 --- a/gnome-base/gnome-session/files/gnome-session-2.32.0-session-saving-button.patch +++ /dev/null @@ -1,559 +0,0 @@ -From c56898dcc1a73af37333b5df28f3b298a0c0669d Mon Sep 17 00:00:00 2001 -From: Priit Laes <plaes@plaes.org> -Date: Thu, 9 Sep 2010 15:38:37 +0300 -Subject: [PATCH] Implement session saving UI in gnome-session-properties - -Original patch by Ghee Teo and Josselin Mouette - -https://bugzilla.gnome.org/show_bug.cgi?id=575544 ---- - capplet/gsm-properties-dialog.c | 63 ++++++++++++- - configure.ac | 1 + - data/session-properties.ui | 12 ++ - gnome-session/gsm-client.c | 10 ++ - gnome-session/gsm-client.h | 6 + - gnome-session/gsm-dbus-client.c | 14 +++ - gnome-session/gsm-manager.c | 150 +++++++++++++++++++++++++++- - gnome-session/gsm-manager.h | 3 + - gnome-session/gsm-xsmp-client.c | 37 +++++++ - gnome-session/gsm-xsmp-client.h | 3 +- - gnome-session/org.gnome.SessionManager.xml | 8 ++ - 11 files changed, 303 insertions(+), 4 deletions(-) - -diff --git a/capplet/gsm-properties-dialog.c b/capplet/gsm-properties-dialog.c -index 84ef910..f54656e 100644 ---- a/capplet/gsm-properties-dialog.c -+++ b/capplet/gsm-properties-dialog.c -@@ -35,6 +35,12 @@ - #include "gsm-util.h" - #include "gsp-app.h" - #include "gsp-app-manager.h" -+#include <dbus/dbus-glib.h> -+#include <dbus/dbus-glib-lowlevel.h> -+ -+#define GSM_SERVICE_DBUS "org.gnome.SessionManager" -+#define GSM_PATH_DBUS "/org/gnome/SessionManager" -+#define GSM_INTERFACE_DBUS "org.gnome.SessionManager" - - #define GSM_PROPERTIES_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSM_TYPE_PROPERTIES_DIALOG, GsmPropertiesDialogPrivate)) - -@@ -50,6 +56,7 @@ - #define CAPPLET_DELETE_WIDGET_NAME "session_properties_delete_button" - #define CAPPLET_EDIT_WIDGET_NAME "session_properties_edit_button" - #define CAPPLET_SAVE_WIDGET_NAME "session_properties_save_button" -+#define CAPPLET_SESSION_SAVED_WIDGET_NAME "session_properties_session_saved_label" - #define CAPPLET_REMEMBER_WIDGET_NAME "session_properties_remember_toggle" - - #define STARTUP_APP_ICON "system-run" -@@ -493,10 +500,64 @@ on_autosave_value_toggled (GtkToggleButton *button, - } - - static void -+session_saved_message (GsmPropertiesDialog *dialog, -+ const char *msg, -+ gboolean is_error) -+{ -+ GtkLabel *label; -+ gchar *markup; -+ label = GTK_LABEL (gtk_builder_get_object (dialog->priv->xml, CAPPLET_SESSION_SAVED_WIDGET_NAME)); -+ if (is_error) -+ markup = g_markup_printf_escaped ("<span foreground=\"red\">%s</span>", msg); -+ else -+ markup = g_markup_escape_text (msg, -1); -+ gtk_label_set_markup (label, markup); -+ g_free (markup); -+} -+ -+static void -+session_saved_cb (DBusGProxy *proxy, -+ DBusGProxyCall *call_id, -+ void *user_data) -+{ -+ gboolean res; -+ GsmPropertiesDialog *dialog = user_data; -+ -+ res = dbus_g_proxy_end_call (proxy, call_id, NULL, G_TYPE_INVALID); -+ if (res) -+ session_saved_message (dialog, _("Your session has been saved."), FALSE); -+ else -+ session_saved_message (dialog, _("Failed to save session"), TRUE); -+ -+ g_object_unref (proxy); -+} -+ -+static void - on_save_session_clicked (GtkWidget *widget, - GsmPropertiesDialog *dialog) - { -- g_debug ("Session saving is not implemented yet!"); -+ DBusGConnection *conn; -+ DBusGProxy *proxy; -+ DBusGProxyCall *call; -+ -+ conn = dbus_g_bus_get (DBUS_BUS_SESSION, NULL); -+ if (conn == NULL) { -+ session_saved_message (dialog, _("Could not connect to the session bus"), TRUE); -+ return; -+ } -+ -+ proxy = dbus_g_proxy_new_for_name (conn, GSM_SERVICE_DBUS, GSM_PATH_DBUS, GSM_INTERFACE_DBUS); -+ if (proxy == NULL) { -+ session_saved_message (dialog, _("Could not connect to the session manager"), TRUE); -+ return; -+ } -+ -+ call = dbus_g_proxy_begin_call (proxy, "SaveSession", session_saved_cb, dialog, NULL, G_TYPE_INVALID); -+ if (call == NULL) { -+ session_saved_message (dialog, _("Failed to save session"), TRUE); -+ g_object_unref (proxy); -+ return; -+ } - } - - static void -diff --git a/configure.ac b/configure.ac -index 3988b4a..b2b96b8 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -76,6 +76,7 @@ PKG_CHECK_MODULES(GNOME_SESSION, - PKG_CHECK_MODULES(SESSION_PROPERTIES, - glib-2.0 >= $GLIB_REQUIRED - gtk+-$GTK_API_VERSION >= $GTK_REQUIRED -+ dbus-glib-1 >= $DBUS_GLIB_REQUIRED - ) - - PKG_CHECK_MODULES(SM, sm) -diff --git a/data/session-properties.ui b/data/session-properties.ui -index 24f721d..3083fc1 100644 ---- a/data/session-properties.ui -+++ b/data/session-properties.ui -@@ -148,6 +148,7 @@ - <property name="visible">True</property> - <child> - <object class="GtkButton" id="session_properties_save_button"> -+ <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <child> -@@ -191,6 +192,17 @@ - <property name="position">1</property> - </packing> - </child> -+ <child> -+ <object class="GtkLabel" id="session_properties_session_saved_label"> -+ <property name="visible">True</property> -+ <property name="wrap">True</property> -+ </object> -+ <packing> -+ <property name="expand">False</property> -+ <property name="fill">False</property> -+ <property name="position">2</property> -+ </packing> -+ </child> - </object> - <packing> - <property name="position">1</property> -diff --git a/gnome-session/gsm-client.c b/gnome-session/gsm-client.c -index b1c3c02..b063aca 100644 ---- a/gnome-session/gsm-client.c -+++ b/gnome-session/gsm-client.c -@@ -510,6 +510,16 @@ gsm_client_disconnected (GsmClient *client) - g_signal_emit (client, signals[DISCONNECTED], 0); - } - -+gboolean -+gsm_client_request_save (GsmClient *client, -+ guint flags, -+ GError **error) -+{ -+ g_return_val_if_fail (GSM_IS_CLIENT (client), FALSE); -+ -+ return GSM_CLIENT_GET_CLASS (client)->impl_request_save (client, flags, error); -+} -+ - GKeyFile * - gsm_client_save (GsmClient *client, - GError **error) -diff --git a/gnome-session/gsm-client.h b/gnome-session/gsm-client.h -index 8fa28ad..a191e1d 100644 ---- a/gnome-session/gsm-client.h -+++ b/gnome-session/gsm-client.h -@@ -92,6 +92,9 @@ struct _GsmClientClass - GError **error); - gboolean (*impl_stop) (GsmClient *client, - GError **error); -+ gboolean (*impl_request_save) (GsmClient *client, -+ guint flags, -+ GError **error); - GKeyFile * (*impl_save) (GsmClient *client, - GError **error); - }; -@@ -137,6 +140,9 @@ gboolean gsm_client_cancel_end_session (GsmClient *client, - - void gsm_client_disconnected (GsmClient *client); - -+gboolean gsm_client_request_save (GsmClient *client, -+ guint flags, -+ GError **error); - GKeyFile *gsm_client_save (GsmClient *client, - GError **error); - /* exported to bus */ -diff --git a/gnome-session/gsm-dbus-client.c b/gnome-session/gsm-dbus-client.c -index e0aaf3d..a6ab43a 100644 ---- a/gnome-session/gsm-dbus-client.c -+++ b/gnome-session/gsm-dbus-client.c -@@ -413,6 +413,19 @@ gsm_dbus_client_finalize (GObject *object) - G_OBJECT_CLASS (gsm_dbus_client_parent_class)->finalize (object); - } - -+static gboolean -+dbus_client_request_save (GsmClient *client, -+ guint flags, -+ GError **error) -+{ -+ g_debug ("GsmDBusClient: sending save request to client with id %s", -+ gsm_client_peek_id (client)); -+ -+ /* FIXME: The protocol does not support this */ -+ -+ return FALSE; -+} -+ - static GKeyFile * - dbus_client_save (GsmClient *client, - GError **error) -@@ -665,6 +678,7 @@ gsm_dbus_client_class_init (GsmDBusClientClass *klass) - object_class->set_property = gsm_dbus_client_set_property; - object_class->dispose = gsm_dbus_client_dispose; - -+ client_class->impl_request_save = dbus_client_request_save; - client_class->impl_save = dbus_client_save; - client_class->impl_stop = dbus_client_stop; - client_class->impl_query_end_session = dbus_client_query_end_session; -diff --git a/gnome-session/gsm-manager.c b/gnome-session/gsm-manager.c -index c85cea6..ca1a0ae 100644 ---- a/gnome-session/gsm-manager.c -+++ b/gnome-session/gsm-manager.c -@@ -68,6 +68,7 @@ - #define GSM_MANAGER_DBUS_NAME "org.gnome.SessionManager" - - #define GSM_MANAGER_PHASE_TIMEOUT 10 /* seconds */ -+#define GSM_MANAGER_SAVE_SESSION_TIMEOUT 2 - - #define GDM_FLEXISERVER_COMMAND "gdmflexiserver" - #define GDM_FLEXISERVER_ARGS "--startnew Standard" -@@ -1153,6 +1154,69 @@ query_end_session_complete (GsmManager *manager) - - } - -+static gboolean -+_client_request_save (GsmClient *client, -+ ClientEndSessionData *data) -+{ -+ gboolean ret; -+ GError *error; -+ -+ error = NULL; -+ ret = gsm_client_request_save (client, data->flags, &error); -+ if (ret) { -+ g_debug ("GsmManager: adding client to query clients: %s", gsm_client_peek_id (client)); -+ data->manager->priv->query_clients = g_slist_prepend (data->manager->priv->query_clients, -+ client); -+ } else if (error) { -+ g_debug ("GsmManager: unable to query client: %s", error->message); -+ g_error_free (error); -+ } -+ -+ return FALSE; -+} -+ -+static gboolean -+_client_request_save_helper (const char *id, -+ GsmClient *client, -+ ClientEndSessionData *data) -+{ -+ return _client_request_save (client, data); -+} -+ -+static void -+query_save_session_complete (GsmManager *manager) -+{ -+ GError *error = NULL; -+ -+ if (g_slist_length (manager->priv->next_query_clients) > 0) { -+ ClientEndSessionData data; -+ -+ data.manager = manager; -+ data.flags = GSM_CLIENT_END_SESSION_FLAG_LAST; -+ -+ g_slist_foreach (manager->priv->next_query_clients, -+ (GFunc)_client_request_save, -+ &data); -+ -+ g_slist_free (manager->priv->next_query_clients); -+ manager->priv->next_query_clients = NULL; -+ -+ return; -+ } -+ -+ if (manager->priv->query_timeout_id > 0) { -+ g_source_remove (manager->priv->query_timeout_id); -+ manager->priv->query_timeout_id = 0; -+ } -+ -+ gsm_session_save (manager->priv->clients, &error); -+ -+ if (error) { -+ g_warning ("Error saving session: %s", error->message); -+ g_error_free (error); -+ } -+} -+ - static guint32 - generate_cookie (void) - { -@@ -1227,6 +1291,21 @@ _on_query_end_session_timeout (GsmManager *manager) - return FALSE; - } - -+static gboolean -+_on_query_save_session_timeout (GsmManager *manager) -+{ -+ manager->priv->query_timeout_id = 0; -+ -+ g_debug ("GsmManager: query to save session timed out"); -+ -+ g_slist_free (manager->priv->query_clients); -+ manager->priv->query_clients = NULL; -+ -+ query_save_session_complete (manager); -+ -+ return FALSE; -+} -+ - static void - do_phase_query_end_session (GsmManager *manager) - { -@@ -1863,13 +1942,32 @@ on_client_end_session_response (GsmClient *client, - const char *reason, - GsmManager *manager) - { -- /* just ignore if received outside of shutdown */ -- if (manager->priv->phase < GSM_MANAGER_PHASE_QUERY_END_SESSION) { -+ /* just ignore if we are not yet running */ -+ if (manager->priv->phase < GSM_MANAGER_PHASE_RUNNING) { - return; - } - - g_debug ("GsmManager: Response from end session request: is-ok=%d do-last=%d cancel=%d reason=%s", is_ok, do_last, cancel, reason ? reason :""); - -+ if (manager->priv->phase == GSM_MANAGER_PHASE_RUNNING) { -+ /* Ignore responses when no requests were sent */ -+ if (manager->priv->query_clients == NULL) { -+ return; -+ } -+ -+ manager->priv->query_clients = g_slist_remove (manager->priv->query_clients, client); -+ -+ if (do_last) { -+ manager->priv->next_query_clients = g_slist_prepend (manager->priv->next_query_clients, -+ client); -+ } -+ -+ if (manager->priv->query_clients == NULL) { -+ query_save_session_complete (manager); -+ } -+ return; -+ } -+ - if (cancel) { - cancel_end_session (manager); - return; -@@ -1968,6 +2066,15 @@ on_xsmp_client_logout_request (GsmXSMPClient *client, - } - - static void -+on_xsmp_client_save_request (GsmXSMPClient *client, -+ gboolean show_dialog, -+ GsmManager *manager) -+{ -+ g_debug ("GsmManager: save_request"); -+ gsm_manager_save_session (manager, NULL); -+} -+ -+static void - on_store_client_added (GsmStore *store, - const char *id, - GsmManager *manager) -@@ -1988,6 +2095,10 @@ on_store_client_added (GsmStore *store, - "logout-request", - G_CALLBACK (on_xsmp_client_logout_request), - manager); -+ g_signal_connect (client, -+ "save-request", -+ G_CALLBACK (on_xsmp_client_save_request), -+ manager); - } - - g_signal_connect (client, -@@ -2945,6 +3056,41 @@ gsm_manager_shutdown (GsmManager *manager, - } - - gboolean -+gsm_manager_save_session (GsmManager *manager, -+ GError **error) -+{ -+ ClientEndSessionData data; -+ -+ g_debug ("GsmManager: SaveSession called"); -+ -+ g_return_val_if_fail (GSM_IS_MANAGER (manager), FALSE); -+ -+ if (manager->priv->phase != GSM_MANAGER_PHASE_RUNNING) { -+ g_set_error (error, -+ GSM_MANAGER_ERROR, -+ GSM_MANAGER_ERROR_NOT_IN_RUNNING, -+ "SaveSession interface is only available during the Running phase"); -+ return FALSE; -+ } -+ -+ data.manager = manager; -+ data.flags = 0; -+ gsm_store_foreach (manager->priv->clients, -+ (GsmStoreFunc)_client_request_save_helper, -+ &data); -+ -+ if (manager->priv->query_clients) { -+ manager->priv->query_timeout_id = g_timeout_add_seconds (GSM_MANAGER_SAVE_SESSION_TIMEOUT, -+ (GSourceFunc)_on_query_save_session_timeout, -+ manager); -+ return TRUE; -+ } else { -+ g_debug ("GsmManager: Nothing to save"); -+ return FALSE; -+ } -+} -+ -+gboolean - gsm_manager_can_shutdown (GsmManager *manager, - gboolean *shutdown_available, - GError **error) -diff --git a/gnome-session/gsm-manager.h b/gnome-session/gsm-manager.h -index 17c70b3..dd6f198 100644 ---- a/gnome-session/gsm-manager.h -+++ b/gnome-session/gsm-manager.h -@@ -152,6 +152,9 @@ gboolean gsm_manager_is_inhibited (GsmManager - gboolean gsm_manager_shutdown (GsmManager *manager, - GError **error); - -+gboolean gsm_manager_save_session (GsmManager *manager, -+ GError **error); -+ - gboolean gsm_manager_can_shutdown (GsmManager *manager, - gboolean *shutdown_available, - GError **error); -diff --git a/gnome-session/gsm-xsmp-client.c b/gnome-session/gsm-xsmp-client.c -index ce22ed9..ed55406 100644 ---- a/gnome-session/gsm-xsmp-client.c -+++ b/gnome-session/gsm-xsmp-client.c -@@ -69,6 +69,7 @@ enum { - enum { - REGISTER_REQUEST, - LOGOUT_REQUEST, -+ SAVE_REQUEST, - LAST_SIGNAL - }; - -@@ -502,6 +503,30 @@ xsmp_cancel_end_session (GsmClient *client, - return TRUE; - } - -+static gboolean -+xsmp_request_save (GsmClient *client, -+ guint flags, -+ GError **error) -+{ -+ GsmXSMPClient *xsmp = (GsmXSMPClient *) client; -+ -+ g_debug ("GsmXSMPClient: xsmp_request_save ('%s')", xsmp->priv->description); -+ -+ if (xsmp->priv->conn == NULL) { -+ g_set_error (error, -+ GSM_CLIENT_ERROR, -+ GSM_CLIENT_ERROR_NOT_REGISTERED, -+ "Client is not registered"); -+ return FALSE; -+ } -+ -+ if (flags & GSM_CLIENT_END_SESSION_FLAG_LAST) -+ xsmp_save_yourself_phase2 (client); -+ else -+ do_save_yourself (xsmp, SmSaveLocal, FALSE); -+ -+ return TRUE; -+} - static char * - get_desktop_file_path (GsmXSMPClient *client) - { -@@ -976,6 +1001,7 @@ gsm_xsmp_client_class_init (GsmXSMPClientClass *klass) - object_class->get_property = gsm_xsmp_client_get_property; - object_class->set_property = gsm_xsmp_client_set_property; - -+ client_class->impl_request_save = xsmp_request_save; - client_class->impl_save = xsmp_save; - client_class->impl_stop = xsmp_stop; - client_class->impl_query_end_session = xsmp_query_end_session; -@@ -1006,6 +1032,17 @@ gsm_xsmp_client_class_init (GsmXSMPClientClass *klass) - G_TYPE_NONE, - 1, G_TYPE_BOOLEAN); - -+ signals[SAVE_REQUEST] = -+ g_signal_new ("save-request", -+ G_OBJECT_CLASS_TYPE (object_class), -+ G_SIGNAL_RUN_LAST, -+ G_STRUCT_OFFSET (GsmXSMPClientClass, save_request), -+ NULL, -+ NULL, -+ g_cclosure_marshal_VOID__BOOLEAN, -+ G_TYPE_NONE, -+ 1, G_TYPE_BOOLEAN); -+ - g_object_class_install_property (object_class, - PROP_ICE_CONNECTION, - g_param_spec_pointer ("ice-connection", -diff --git a/gnome-session/gsm-xsmp-client.h b/gnome-session/gsm-xsmp-client.h -index b80f933..4fa24fb 100644 ---- a/gnome-session/gsm-xsmp-client.h -+++ b/gnome-session/gsm-xsmp-client.h -@@ -54,7 +54,8 @@ struct _GsmXSMPClientClass - char **client_id); - gboolean (*logout_request) (GsmXSMPClient *client, - gboolean prompt); -- -+ gboolean (*save_request) (GsmXSMPClient *client, -+ gboolean prompt); - - void (*saved_state) (GsmXSMPClient *client); - -diff --git a/gnome-session/org.gnome.SessionManager.xml b/gnome-session/org.gnome.SessionManager.xml -index b8bec4e..bece3f5 100644 ---- a/gnome-session/org.gnome.SessionManager.xml -+++ b/gnome-session/org.gnome.SessionManager.xml -@@ -256,6 +256,14 @@ - </doc:doc> - </method> - -+ <method name="SaveSession"> -+ <doc:doc> -+ <doc:description> -+ <doc:para>Request to save session</doc:para> -+ </doc:description> -+ </doc:doc> -+ </method> -+ - <method name="CanShutdown"> - <arg name="is_available" direction="out" type="b"> - <doc:doc> --- -1.7.2.2 - diff --git a/gnome-base/gnome-session/files/gnome-session-2.32.1-dialog-size.patch b/gnome-base/gnome-session/files/gnome-session-2.32.1-dialog-size.patch deleted file mode 100644 index c5cfcebbfd8b..000000000000 --- a/gnome-base/gnome-session/files/gnome-session-2.32.1-dialog-size.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 8c4cdd5304929d19a27f876eb9cb5bbb67a4d59f Mon Sep 17 00:00:00 2001 -From: Vincent Untz <vuntz@gnome.org> -Date: Mon, 29 Nov 2010 21:44:03 +0000 -Subject: capplet: Give the dialog a reasonable default height - -https://bugzilla.gnome.org/show_bug.cgi?id=635891 ---- -diff --git a/capplet/gsm-properties-dialog.c b/capplet/gsm-properties-dialog.c -index 4432b09..8b51169 100644 ---- a/capplet/gsm-properties-dialog.c -+++ b/capplet/gsm-properties-dialog.c -@@ -784,6 +784,7 @@ gsm_properties_dialog_init (GsmPropertiesDialog *dialog) - "main-notebook")); - gtk_box_pack_start (GTK_BOX (content_area), widget, TRUE, TRUE, 0); - -+ gtk_window_set_default_size (GTK_WINDOW (dialog), -1, 450); - gtk_window_set_resizable (GTK_WINDOW (dialog), TRUE); - gtk_container_set_border_width (GTK_CONTAINER (dialog), 6); - gtk_box_set_spacing (GTK_BOX (content_area), 2); --- -cgit v0.9.0.2 diff --git a/gnome-base/gnome-session/files/gnome-session-2.32.1-dialog-size2.patch b/gnome-base/gnome-session/files/gnome-session-2.32.1-dialog-size2.patch deleted file mode 100644 index 39a02806d599..000000000000 --- a/gnome-base/gnome-session/files/gnome-session-2.32.1-dialog-size2.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 6fd301895a39fc32f302ea3fced74fc03e5c75c9 Mon Sep 17 00:00:00 2001 -From: Vincent Untz <vuntz@gnome.org> -Date: Mon, 29 Nov 2010 21:47:00 +0000 -Subject: capplet: Also give the dialog a reasonable width - -We don't want to depend on the natural size, which depends on the length -of strings for this. - -https://bugzilla.gnome.org/show_bug.cgi?id=635891 ---- -diff --git a/capplet/gsm-properties-dialog.c b/capplet/gsm-properties-dialog.c -index 8b51169..487250e 100644 ---- a/capplet/gsm-properties-dialog.c -+++ b/capplet/gsm-properties-dialog.c -@@ -784,7 +784,7 @@ gsm_properties_dialog_init (GsmPropertiesDialog *dialog) - "main-notebook")); - gtk_box_pack_start (GTK_BOX (content_area), widget, TRUE, TRUE, 0); - -- gtk_window_set_default_size (GTK_WINDOW (dialog), -1, 450); -+ gtk_window_set_default_size (GTK_WINDOW (dialog), 600, 450); - gtk_window_set_resizable (GTK_WINDOW (dialog), TRUE); - gtk_container_set_border_width (GTK_CONTAINER (dialog), 6); - gtk_box_set_spacing (GTK_BOX (content_area), 2); --- -cgit v0.9.0.2 diff --git a/gnome-base/gnome-session/files/gnome-session-2.32.1-gnome3-conditions.patch b/gnome-base/gnome-session/files/gnome-session-2.32.1-gnome3-conditions.patch deleted file mode 100644 index a4c220732503..000000000000 --- a/gnome-base/gnome-session/files/gnome-session-2.32.1-gnome3-conditions.patch +++ /dev/null @@ -1,107 +0,0 @@ -From d27c9dfb07e0d69ff37d029e5647bd68e7db7e95 Mon Sep 17 00:00:00 2001 -From: Nirbheek Chauhan <nirbheek@gentoo.org> -Date: Mon, 4 Apr 2011 18:07:09 +0530 -Subject: [PATCH] Don't reject GNOME 3 session autostart conditions - -gnome-session-3.0 introduced a new AutostartCondition=GNOME3 directive. -See commit 58ebdfac for details on that. - -This commit adds detection for that directive instead of disabling .desktop -files with that. Now, apps are autostarted if they contain: - - AutostartCondition=GNOME3 is-session gnome-fallback -or - AutostartCondition=GNOME3 unless-session [something other than gnome-fallback] - -And are disabled for all other cases. ---- - gnome-session/gsm-autostart-app.c | 45 +++++++++++++++++++++++++++++++----- - 1 files changed, 38 insertions(+), 7 deletions(-) - -diff --git a/gnome-session/gsm-autostart-app.c b/gnome-session/gsm-autostart-app.c -index 529a346..abc918f 100644 ---- a/gnome-session/gsm-autostart-app.c -+++ b/gnome-session/gsm-autostart-app.c -@@ -40,11 +40,14 @@ enum { - }; - - enum { -- GSM_CONDITION_NONE = 0, -- GSM_CONDITION_IF_EXISTS = 1, -- GSM_CONDITION_UNLESS_EXISTS = 2, -- GSM_CONDITION_GNOME = 3, -- GSM_CONDITION_UNKNOWN = 4 -+ GSM_CONDITION_NONE = 0, -+ GSM_CONDITION_IF_EXISTS = 1, -+ GSM_CONDITION_UNLESS_EXISTS = 2, -+ GSM_CONDITION_GNOME = 3, -+ GSM_CONDITION_GSETTINGS = 4, -+ GSM_CONDITION_IF_SESSION = 5, -+ GSM_CONDITION_UNLESS_SESSION = 6, -+ GSM_CONDITION_UNKNOWN = 7 - }; - - #define GSM_SESSION_CLIENT_DBUS_INTERFACE "org.gnome.SessionClient" -@@ -153,15 +156,31 @@ parse_condition_string (const char *condition_string, - key++; - } - -+ kind = GSM_CONDITION_UNKNOWN; -+ - if (!g_ascii_strncasecmp (condition_string, "if-exists", len) && key) { - kind = GSM_CONDITION_IF_EXISTS; - } else if (!g_ascii_strncasecmp (condition_string, "unless-exists", len) && key) { - kind = GSM_CONDITION_UNLESS_EXISTS; - } else if (!g_ascii_strncasecmp (condition_string, "GNOME", len)) { - kind = GSM_CONDITION_GNOME; -- } else { -+ } else if (!g_ascii_strncasecmp (condition_string, "GNOME3", len)) { -+ condition_string = key; -+ space = condition_string + strcspn (condition_string, " "); -+ len = space - condition_string; -+ key = space; -+ while (isspace ((unsigned char)*key)) { -+ key++; -+ } -+ if (!g_ascii_strncasecmp (condition_string, "if-session", len) && key) { -+ kind = GSM_CONDITION_IF_SESSION; -+ } else if (!g_ascii_strncasecmp (condition_string, "unless-session", len) && key) { -+ kind = GSM_CONDITION_UNLESS_SESSION; -+ } -+ } -+ -+ if (kind == GSM_CONDITION_UNKNOWN) { - key = NULL; -- kind = GSM_CONDITION_UNKNOWN; - } - - if (keyp != NULL) { -@@ -364,6 +383,12 @@ setup_condition_monitor (GsmAutostartApp *app) - gconf_condition_cb, - app, NULL, NULL); - g_object_unref (client); -+ } else if (kind == GSM_CONDITION_IF_SESSION) { -+ /* We treat GNOME 2.32 as the same as gnome-fallback */ -+ disabled = strcmp ("gnome-fallback", key) != 0; -+ } else if (kind == GSM_CONDITION_UNLESS_SESSION) { -+ /* We treat GNOME 2.32 as the same as gnome-fallback */ -+ disabled = strcmp ("gnome-fallback", key) == 0; - } else { - disabled = TRUE; - } -@@ -647,6 +672,12 @@ is_conditionally_disabled (GsmApp *app) - g_assert (GCONF_IS_CLIENT (client)); - disabled = !gconf_client_get_bool (client, key, NULL); - g_object_unref (client); -+ } else if (kind == GSM_CONDITION_IF_SESSION) { -+ /* We treat GNOME 2.32 as the same as gnome-fallback */ -+ disabled = strcmp ("gnome-fallback", key) != 0; -+ } else if (kind == GSM_CONDITION_UNLESS_SESSION) { -+ /* We treat GNOME 2.32 as the same as gnome-fallback */ -+ disabled = strcmp ("gnome-fallback", key) == 0; - } else { - disabled = TRUE; - } --- -1.7.3.4 - diff --git a/gnome-base/gnome-session/files/gnome-session-2.32.1-gsettings-conditions.patch b/gnome-base/gnome-session/files/gnome-session-2.32.1-gsettings-conditions.patch deleted file mode 100644 index 9c272375e3eb..000000000000 --- a/gnome-base/gnome-session/files/gnome-session-2.32.1-gsettings-conditions.patch +++ /dev/null @@ -1,135 +0,0 @@ ---- gnome-session/gsm-autostart-app.c.old 2011-09-12 11:06:20.552420744 +0200 -+++ gnome-session/gsm-autostart-app.c 2011-09-12 11:18:39.934966203 +0200 -@@ -66,6 +66,7 @@ - - GFileMonitor *condition_monitor; - guint condition_notify_id; -+ GSettings *condition_settings; - - int launch_type; - GPid pid; -@@ -164,6 +165,8 @@ - kind = GSM_CONDITION_UNLESS_EXISTS; - } else if (!g_ascii_strncasecmp (condition_string, "GNOME", len)) { - kind = GSM_CONDITION_GNOME; -+ } else if (!g_ascii_strncasecmp (condition_string, "GSettings", len)) { -+ kind = GSM_CONDITION_GSETTINGS; - } else if (!g_ascii_strncasecmp (condition_string, "GNOME3", len)) { - condition_string = key; - space = condition_string + strcspn (condition_string, " "); -@@ -289,6 +292,81 @@ - } - - static void -+gsettings_condition_cb (GSettings *settings, -+ const char *key, -+ gpointer user_data) -+{ -+ GsmApp *app; -+ GsmAutostartAppPrivate *priv; -+ gboolean condition; -+ -+ g_return_if_fail (GSM_IS_APP (user_data)); -+ -+ app = GSM_APP (user_data); -+ -+ priv = GSM_AUTOSTART_APP (app)->priv; -+ -+ condition = g_settings_get_boolean (settings, key); -+ -+ g_debug ("GsmAutostartApp: app:%s condition changed condition:%d", -+ gsm_app_peek_id (app), -+ condition); -+ -+ /* Emit only if the condition actually changed */ -+ if (condition != priv->condition) { -+ priv->condition = condition; -+ g_signal_emit (app, signals[CONDITION_CHANGED], 0, condition); -+ } -+} -+ -+static gboolean -+setup_gsettings_condition_monitor (GsmAutostartApp *app, -+ const char *key) -+{ -+ GSettings *settings; -+ const char * const *schemas; -+ char **elems; -+ gboolean schema_exists; -+ guint i; -+ gboolean retval; -+ char *signal; -+ -+ elems = g_strsplit (key, " ", 2); -+ if (elems == NULL) -+ return FALSE; -+ if (elems[0] == NULL || elems[1] == NULL) { -+ g_strfreev (elems); -+ return FALSE; -+ } -+ -+ schemas = g_settings_list_schemas (); -+ schema_exists = FALSE; -+ for (i = 0; schemas[i] != NULL; i++) { -+ if (g_str_equal (schemas[i], elems[0])) { -+ schema_exists = TRUE; -+ break; -+ } -+ } -+ -+ if (schema_exists == FALSE) -+ return FALSE; -+ -+ settings = g_settings_new (elems[0]); -+ retval = g_settings_get_boolean (settings, elems[1]); -+ -+ signal = g_strdup_printf ("changed::%s", elems[1]); -+ g_signal_connect (G_OBJECT (settings), signal, -+ G_CALLBACK (gsettings_condition_cb), app); -+ g_free (signal); -+ -+ app->priv->condition_settings = settings; -+ -+ g_strfreev (elems); -+ -+ return retval; -+} -+ -+static void - setup_condition_monitor (GsmAutostartApp *app) - { - guint kind; -@@ -383,6 +461,8 @@ - gconf_condition_cb, - app, NULL, NULL); - g_object_unref (client); -+ } else if (kind == GSM_CONDITION_GSETTINGS) { -+ disabled = !setup_gsettings_condition_monitor (app, key); - } else if (kind == GSM_CONDITION_IF_SESSION) { - /* We treat GNOME 2.32 as the same as gnome-fallback */ - disabled = strcmp ("gnome-fallback", key) != 0; -@@ -578,6 +658,11 @@ - priv->condition_string = NULL; - } - -+ if (priv->condition_settings) { -+ g_object_unref (priv->condition_settings); -+ priv->condition_settings = NULL; -+ } -+ - if (priv->desktop_file) { - egg_desktop_file_free (priv->desktop_file); - priv->desktop_file = NULL; -@@ -672,6 +757,12 @@ - g_assert (GCONF_IS_CLIENT (client)); - disabled = !gconf_client_get_bool (client, key, NULL); - g_object_unref (client); -+ } else if (kind == GSM_CONDITION_GSETTINGS && -+ priv->condition_settings != NULL) { -+ char **elems; -+ elems = g_strsplit (key, " ", 2); -+ disabled = !g_settings_get_boolean (priv->condition_settings, elems[1]); -+ g_strfreev (elems); - } else if (kind == GSM_CONDITION_IF_SESSION) { - /* We treat GNOME 2.32 as the same as gnome-fallback */ - disabled = strcmp ("gnome-fallback", key) != 0; diff --git a/gnome-base/gnome-session/files/gnome-session-2.32.1-idle-transition.patch b/gnome-base/gnome-session/files/gnome-session-2.32.1-idle-transition.patch deleted file mode 100644 index 4fb215151d12..000000000000 --- a/gnome-base/gnome-session/files/gnome-session-2.32.1-idle-transition.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 861313503a741f0129611ca005cf6d7c27124b54 Mon Sep 17 00:00:00 2001 -From: Christopher Halse Rogers <chalserogers@gmail.com> -Date: Thu, 26 May 2011 09:09:14 +0000 -Subject: gsm: Fix race condition in idle monitor - -In _xsync_alarm_set(), the positive and negative transition intervals -are set to the same value. However, the SYNC extension defines the -positive transition as set when the counter goes from strictly below the -threshold to greater than or equal to the threshold and similarly a -negative transition is triggered when the counter goes form strictly -greater than the threshold to less than or equal to the threshold. - -Thus in the current set up there's a chance that the positive transition -can trigger, marking the session as idle, and some user input occur on -the same click so the IDLETIME count will hit the threshold but not go -above so the negative transition will not trigger. Thus the session will -not be marked as active. - -The negative transition threshold should be set to 1ms less than the -positive transition to ensure that it always fires. - -https://bugzilla.gnome.org/show_bug.cgi?id=627903 ---- -diff --git a/gnome-session/gs-idle-monitor.c b/gnome-session/gs-idle-monitor.c -index cd38dcb..d25144f 100644 ---- a/gnome-session/gs-idle-monitor.c -+++ b/gnome-session/gs-idle-monitor.c -@@ -463,6 +463,7 @@ _xsync_alarm_set (GSIdleMonitor *monitor, - watch->xalarm_positive = XSyncCreateAlarm (monitor->priv->display, flags, &attr); - } - -+ attr.trigger.wait_value = _int64_to_xsyncvalue (_xsyncvalue_to_int64 (watch->interval) - 1); - attr.trigger.test_type = XSyncNegativeTransition; - if (watch->xalarm_negative != None) { - g_debug ("GSIdleMonitor: updating alarm for negative transition wait=%lld", --- -cgit v0.9.0.2 diff --git a/gnome-base/gnome-session/files/gnome-session-3.8.4-blacklist-nv25.patch b/gnome-base/gnome-session/files/gnome-session-3.8.4-blacklist-nv25.patch deleted file mode 100644 index 3f28c2b2a60d..000000000000 --- a/gnome-base/gnome-session/files/gnome-session-3.8.4-blacklist-nv25.patch +++ /dev/null @@ -1,22 +0,0 @@ -From f11f157d507495589b0f4930f4fcc431c87bc121 Mon Sep 17 00:00:00 2001 -From: Ray Strode <rstrode@redhat.com> -Date: Tue, 12 Nov 2013 13:32:45 +0000 -Subject: data: blacklist nv25 - -It doesn't work very well. - -https://bugzilla.gnome.org/show_bug.cgi?id=711347 ---- -diff --git a/data/hardware-compatibility b/data/hardware-compatibility -index 927ba8b..48b7946 100644 ---- a/data/hardware-compatibility -+++ b/data/hardware-compatibility -@@ -27,3 +27,6 @@ - - # Gallium has softpipe; we explicitly enable llvmpipe - -softpipe -+ -+# nouveau vieux NV25 doesn't work too well -+-Mesa DRI nv25 --- -cgit v0.9.2 diff --git a/gnome-base/gnome-session/files/gnome-session-3.8.4-presence-crash.patch b/gnome-base/gnome-session/files/gnome-session-3.8.4-presence-crash.patch deleted file mode 100644 index e76f433a9c1b..000000000000 --- a/gnome-base/gnome-session/files/gnome-session-3.8.4-presence-crash.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 90714db611d6ced5202421ef3ba99334f1e9e6ec Mon Sep 17 00:00:00 2001 -From: Matthias Clasen <mclasen@redhat.com> -Date: Fri, 01 Nov 2013 20:30:06 +0000 -Subject: Fix a possible crash in the presence interface - -Improper error handling in gsm_presence_set_status_text() would -lead to a double free on the next call to that function. -Found using the dfuzzer tool, -https://github.com/matusmarhefka/dfuzzer ---- -diff --git a/gnome-session/gsm-presence.c b/gnome-session/gsm-presence.c -index f6a022f..93ca1a0 100644 ---- a/gnome-session/gsm-presence.c -+++ b/gnome-session/gsm-presence.c -@@ -365,6 +365,7 @@ gsm_presence_set_status_text (GsmPresence *presence, - g_return_val_if_fail (GSM_IS_PRESENCE (presence), FALSE); - - g_free (presence->priv->status_text); -+ presence->priv->status_text = NULL; - - /* check length */ - if (status_text != NULL && strlen (status_text) > MAX_STATUS_TEXT) { -@@ -377,11 +378,11 @@ gsm_presence_set_status_text (GsmPresence *presence, - - if (status_text != NULL) { - presence->priv->status_text = g_strdup (status_text); -- } else { -- presence->priv->status_text = g_strdup (""); - } -+ - g_object_notify (G_OBJECT (presence), "status-text"); -- g_signal_emit (presence, signals[STATUS_TEXT_CHANGED], 0, presence->priv->status_text); -+ g_signal_emit (presence, signals[STATUS_TEXT_CHANGED], 0, -+ presence->priv->status_text ? presence->priv->status_text : ""); - return TRUE; - } - -@@ -457,7 +458,7 @@ gsm_presence_get_property (GObject *object, - g_value_set_uint (value, self->priv->status); - break; - case PROP_STATUS_TEXT: -- g_value_set_string (value, self->priv->status_text); -+ g_value_set_string (value, self->priv->status_text ? self->priv->status_text : ""); - break; - case PROP_IDLE_ENABLED: - g_value_set_boolean (value, self->priv->idle_enabled); --- -cgit v0.9.2 diff --git a/gnome-base/gnome-session/gnome-session-2.32.1-r3.ebuild b/gnome-base/gnome-session/gnome-session-2.32.1-r3.ebuild deleted file mode 100644 index d87475aa2e45..000000000000 --- a/gnome-base/gnome-session/gnome-session-2.32.1-r3.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-2.32.1-r3.ebuild,v 1.13 2014/06/01 08:03:47 pacho Exp $ - -EAPI="4" -GCONF_DEBUG="yes" -GNOME_TARBALL_SUFFIX="bz2" - -inherit autotools eutils gnome2 - -DESCRIPTION="Gnome session manager" -HOMEPAGE="http://www.gnome.org/" - -LICENSE="GPL-2 LGPL-2 FDL-1.1" -SLOT="0" -KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" - -IUSE="doc ipv6 elibc_FreeBSD" - -# x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and -# create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_* -# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below). -# >=gconf-3.2.6 no longer provides gconf-sanity-check-2 -RDEPEND=">=dev-libs/glib-2.16:2 - >=x11-libs/gtk+-2.22.0:2 - >=dev-libs/dbus-glib-0.76 - >=gnome-base/gconf-2:2[gtk(+)] - <gnome-base/gconf-3.2.6 - || ( <sys-power/upower-0.99 sys-power/upower-pm-utils ) - elibc_FreeBSD? ( dev-libs/libexecinfo ) - - x11-libs/libSM - x11-libs/libICE - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXtst - x11-apps/xdpyinfo - - x11-misc/xdg-user-dirs - x11-misc/xdg-user-dirs-gtk" -DEPEND="${RDEPEND} - >=dev-lang/perl-5 - >=sys-devel/gettext-0.10.40 - virtual/pkgconfig - >=dev-util/intltool-0.40 - gnome-base/gnome-common - !<gnome-base/gdm-2.20.4 - doc? ( - app-text/xmlto - dev-libs/libxslt )" -# gnome-common needed for eautoreconf -# gnome-base/gdm does not provide gnome.desktop anymore - -pkg_setup() { - # TODO: convert libnotify to a configure option - G2CONF="${G2CONF} - --docdir="${EPREFIX}/usr/share/doc/${PF}" - --with-default-wm=gnome-wm - --with-gtk=2.0 - $(use_enable doc docbook-docs) - $(use_enable ipv6)" - DOCS="AUTHORS ChangeLog NEWS README" -} - -src_prepare() { - # Add "session saving" button back, upstream bug #575544 - epatch "${FILESDIR}/${PN}-2.32.0-session-saving-button.patch" - - # Fix support for GNOME3 conditions, bug #XXXXXX - epatch "${FILESDIR}/${PN}-2.32.1-gnome3-conditions.patch" - - # Also support Gsettings conditions to work with libcanberra - epatch "${FILESDIR}/${PN}-2.32.1-gsettings-conditions.patch" - - # gsm: Fix race condition in idle monitor - epatch "${FILESDIR}/${PN}-2.32.1-idle-transition.patch" - - # Fix dialog size - epatch "${FILESDIR}/${PN}-2.32.1-dialog-size.patch" - epatch "${FILESDIR}/${PN}-2.32.1-dialog-size2.patch" - - intltoolize --force --copy --automake || die "intltoolize failed" - eautoreconf - gnome2_src_prepare -} - -src_install() { - gnome2_src_install - - dodir /etc/X11/Sessions - exeinto /etc/X11/Sessions - doexe "${FILESDIR}/Gnome" - - dodir /usr/share/gnome/applications/ - insinto /usr/share/gnome/applications/ - doins "${FILESDIR}/defaults.list" - - dodir /etc/X11/xinit/xinitrc.d/ - exeinto /etc/X11/xinit/xinitrc.d/ - doexe "${FILESDIR}/15-xdg-data-gnome" - - # This should be done here as discussed in bug #270852 - doexe "${FILESDIR}/10-user-dirs-update-gnome" -} |