Skip to content

Commit 26145c9

Browse files
committed
Merge branch 'bc/gnome-keyring'
Cleanups and tweaks for credential handling to work with ancient versions of the gnome-keyring library that are still in use. * bc/gnome-keyring: contrib/git-credential-gnome-keyring.c: support really ancient gnome-keyring contrib/git-credential-gnome-keyring.c: support ancient gnome-keyring contrib/git-credential-gnome-keyring.c: report failure to store password contrib/git-credential-gnome-keyring.c: use glib messaging functions contrib/git-credential-gnome-keyring.c: use glib memory allocation functions contrib/git-credential-gnome-keyring.c: use secure memory for reading passwords contrib/git-credential-gnome-keyring.c: use secure memory functions for passwds contrib/git-credential-gnome-keyring.c: use gnome helpers in keyring_object() contrib/git-credential-gnome-keyring.c: set Gnome application name contrib/git-credential-gnome-keyring.c: ensure buffer is non-empty before accessing contrib/git-credential-gnome-keyring.c: strlen() returns size_t, not ssize_t contrib/git-credential-gnome-keyring.c: exit non-zero when called incorrectly contrib/git-credential-gnome-keyring.c: add static where applicable contrib/git-credential-gnome-keyring.c: *style* use "if ()" not "if()" etc. contrib/git-credential-gnome-keyring.c: remove unused die() function contrib/git-credential-gnome-keyring.c: remove unnecessary pre-declarations
2 parents f92f068 + 15f7221 commit 26145c9

File tree

2 files changed

+167
-134
lines changed

2 files changed

+167
-134
lines changed

contrib/credential/gnome-keyring/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ CFLAGS = -g -O2 -Wall
88
-include ../../../config.mak.autogen
99
-include ../../../config.mak
1010

11-
INCS:=$(shell pkg-config --cflags gnome-keyring-1)
12-
LIBS:=$(shell pkg-config --libs gnome-keyring-1)
11+
INCS:=$(shell pkg-config --cflags gnome-keyring-1 glib-2.0)
12+
LIBS:=$(shell pkg-config --libs gnome-keyring-1 glib-2.0)
1313

1414
SRCS:=$(MAIN).c
1515
OBJS:=$(SRCS:.c=.o)

0 commit comments

Comments
 (0)