From 958c480022adaadc1b125cdd0c0e9ea10ee6e63e Mon Sep 17 00:00:00 2001 From: Klismann Smoger Mottin <ksm09@inf.ufpr.br> Date: Tue, 28 Aug 2012 12:23:09 -0300 Subject: [PATCH] le-interface: Add code to disable gnome-keyring Adds a shell script, that executes when the X starts, that disables the gnome-keyring dialog. --- le-interface/VERSAO | 2 +- le-interface/pacote/etc/kde4/kdm/Xstartup | 4 ++- .../pacote/etc/skel/.gnome2/keyrings/default | 1 + .../etc/skel/.gnome2/keyrings/default.keyring | 9 ++++++ .../local/bin/le-interface-gnome-keyring.sh | 28 +++++++++++++++++++ 5 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 le-interface/pacote/etc/skel/.gnome2/keyrings/default create mode 100644 le-interface/pacote/etc/skel/.gnome2/keyrings/default.keyring create mode 100755 le-interface/pacote/usr/local/bin/le-interface-gnome-keyring.sh diff --git a/le-interface/VERSAO b/le-interface/VERSAO index 1892b9267..5bdcf5c39 100644 --- a/le-interface/VERSAO +++ b/le-interface/VERSAO @@ -1 +1 @@ -1.3.2 +1.3.15 diff --git a/le-interface/pacote/etc/kde4/kdm/Xstartup b/le-interface/pacote/etc/kde4/kdm/Xstartup index c013ac892..c1ed916e2 100755 --- a/le-interface/pacote/etc/kde4/kdm/Xstartup +++ b/le-interface/pacote/etc/kde4/kdm/Xstartup @@ -31,6 +31,7 @@ VIA=le-interface-via-fix.sh NETWORK=le-interface-network.sh NETCONFIG=le-netconfig.sh SOUNDCONFIG=le-soundconfig.sh +GNOMEKEYRING=le-interface-gnome-keyring.sh # Scripts lists for non-freeze and freeze users, and a commom scripts list COMMONSCRIPTS=" @@ -40,7 +41,8 @@ COMMONSCRIPTS=" $SHPATH/$VIA \ $SHPATH/$NETWORK \ $SHPATH/$NETCONFIG \ - $SHPATH/$SOUNDCONFIG + $SHPATH/$SOUNDCONFIG \ + $SHPATH/$GNOMEKEYRING " NFSCRIPTS=" diff --git a/le-interface/pacote/etc/skel/.gnome2/keyrings/default b/le-interface/pacote/etc/skel/.gnome2/keyrings/default new file mode 100644 index 000000000..4ad96d515 --- /dev/null +++ b/le-interface/pacote/etc/skel/.gnome2/keyrings/default @@ -0,0 +1 @@ +default diff --git a/le-interface/pacote/etc/skel/.gnome2/keyrings/default.keyring b/le-interface/pacote/etc/skel/.gnome2/keyrings/default.keyring new file mode 100644 index 000000000..8bc6e2c1e --- /dev/null +++ b/le-interface/pacote/etc/skel/.gnome2/keyrings/default.keyring @@ -0,0 +1,9 @@ + +[keyring] +display-name=PadrĂ£o +ctime=0 +mtime=0 +lock-on-idle=false +lock-after=false + + diff --git a/le-interface/pacote/usr/local/bin/le-interface-gnome-keyring.sh b/le-interface/pacote/usr/local/bin/le-interface-gnome-keyring.sh new file mode 100755 index 000000000..e6a8e5ade --- /dev/null +++ b/le-interface/pacote/usr/local/bin/le-interface-gnome-keyring.sh @@ -0,0 +1,28 @@ +#!/bin/bash +# +# Copyright (C) 2004-2012 Centro de Computacao Cientifica e Software Livre +# Departamento de Informatica - Universidade Federal do Parana - C3SL/UFPR +# +# This file is part of le-interface +# +# le-interface is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +# USA. + +# Removes gnome-keyring at login +if ! test -f "$HOME/.gnome2/keyrings/default.keyring"; then + cp -r /etc/skel/.gnome2 "$HOME" + chown -R --reference="$HOME" "$HOME/.gnome2" +fi + -- GitLab