summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /mate-base/mate-control-center/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'mate-base/mate-control-center/files')
-rw-r--r--mate-base/mate-control-center/files/mate-control-center-1.6.2-libsecret.patch15
1 files changed, 15 insertions, 0 deletions
diff --git a/mate-base/mate-control-center/files/mate-control-center-1.6.2-libsecret.patch b/mate-base/mate-control-center/files/mate-control-center-1.6.2-libsecret.patch
new file mode 100644
index 00000000000..b66a9af83a6
--- /dev/null
+++ b/mate-base/mate-control-center/files/mate-control-center-1.6.2-libsecret.patch
@@ -0,0 +1,15 @@
+diff --git a/libslab/app-shell.c b/libslab/app-shell.c
+index 3c33230..5f4af23 100644
+--- a/libslab/app-shell.c
++++ b/libslab/app-shell.c
+@@ -987,8 +987,8 @@ static void handle_menu_action_performed (Tile * launcher, TileEvent * event, Ti
+ return TRUE;
+ }
+
+- /* discard mate-keyring-manager if CASA is installed */
+- if ((exec && !strcmp (exec, "mate-keyring-manager"))
++ /* discard gnome-keyring-manager if CASA is installed */
++ if ((exec && !strcmp (exec, "gnome-keyring-manager"))
+ && (path = g_find_program_in_path ("CASAManager.sh")))
+ {
+ g_free (path);