← Back to branch summary

~noskcaj/ubuntu/vivid/gnome-keyring/3.15.90

« back to all changes in this revision

Viewing changes to daemon/dbus/gkd-dbus-environment.c

  • Committer: Package Import Robot
  • Author(s): Dimitri John Ledkov
  • Date: 2014-12-06 18:47:09 UTC
  • mfrom: (116.2.6 sid)
  • Revision ID: package-import@ubuntu.com-20141206184709-r2sbrchgej06j31z
Tags: 3.14.0-1ubuntu1
* Merge from debian, remaining changes:
  - Build with dh-autoreconf for new libtool.  
  - Provide upstart user session jobs.
  * debian/gnome-keyring.ubiquity, debian/rules:
    - Apply capabilities at the end of the ubiquity process to make sure new
      installs have gnome-keyring-daemon with cap_ipc_lock+ep.
  * debian/control, debian/*.install, debian/rules:
    - change for multiarch support, install pkcs11 in its own binary

Show diffs side-by-side

added added

removed removed

Lines of Context:
daemon/dbus/gkd-dbus-environment.c
15
15
 
16
16
   You should have received a copy of the GNU Library General Public
17
17
   License along with the Gnome Library; see the file COPYING.LIB.  If not,
18
 
   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
19
 
   Boston, MA 02111-1307, USA.
 
18
   <http://www.gnu.org/licenses/>.
20
19
 
21
20
   Author: Stef Walter <stef@memberwebs.com>
22
21
*/
23
22
 
24
23
#include "config.h"
25
24
 
26
 
 
27
25
#include "gkd-dbus-private.h"
28
 
#include "gkd-util.h"
 
26
 
 
27
#include "daemon/gkd-util.h"
29
28
 
30
29
#include <dbus/dbus.h>
31
30