summaryrefslogtreecommitdiff
path: root/contrib/credential/gnome-keyring
diff options
context:
space:
mode:
authorBrandon Casey <drafnel@gmail.com>2013-09-23 18:49:09 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-10-16 16:35:31 (GMT)
commitff55c47d0f737cd33594e864a0e5a5e1d32fdd13 (patch)
treef5939ff133e3bc6294592a361b395373363cd50a /contrib/credential/gnome-keyring
parent73bbc0796b4ce65bfb1a12b47a0edc27845ecf50 (diff)
downloadgit-ff55c47d0f737cd33594e864a0e5a5e1d32fdd13.zip
git-ff55c47d0f737cd33594e864a0e5a5e1d32fdd13.tar.gz
git-ff55c47d0f737cd33594e864a0e5a5e1d32fdd13.tar.bz2
contrib/git-credential-gnome-keyring.c: set Gnome application name
Since this is a Gnome application, let's set the application name to something reasonable. This will be displayed in Gnome dialog boxes e.g. the one that prompts for the user's keyring password. We add an include statement for glib.h and add the glib-2.0 cflags and libs to the compilation arguments, but both of these are really noops since glib is already a dependency of gnome-keyring. Signed-off-by: Brandon Casey <drafnel@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/credential/gnome-keyring')
-rw-r--r--contrib/credential/gnome-keyring/Makefile4
-rw-r--r--contrib/credential/gnome-keyring/git-credential-gnome-keyring.c3
2 files changed, 5 insertions, 2 deletions
diff --git a/contrib/credential/gnome-keyring/Makefile b/contrib/credential/gnome-keyring/Makefile
index e6561d8..c3c7c98 100644
--- a/contrib/credential/gnome-keyring/Makefile
+++ b/contrib/credential/gnome-keyring/Makefile
@@ -8,8 +8,8 @@ CFLAGS = -g -O2 -Wall
-include ../../../config.mak.autogen
-include ../../../config.mak
-INCS:=$(shell pkg-config --cflags gnome-keyring-1)
-LIBS:=$(shell pkg-config --libs gnome-keyring-1)
+INCS:=$(shell pkg-config --cflags gnome-keyring-1 glib-2.0)
+LIBS:=$(shell pkg-config --libs gnome-keyring-1 glib-2.0)
SRCS:=$(MAIN).c
OBJS:=$(SRCS:.c=.o)
diff --git a/contrib/credential/gnome-keyring/git-credential-gnome-keyring.c b/contrib/credential/gnome-keyring/git-credential-gnome-keyring.c
index 0d2c55e..43b19dd 100644
--- a/contrib/credential/gnome-keyring/git-credential-gnome-keyring.c
+++ b/contrib/credential/gnome-keyring/git-credential-gnome-keyring.c
@@ -28,6 +28,7 @@
#include <stdarg.h>
#include <stdlib.h>
#include <errno.h>
+#include <glib.h>
#include <gnome-keyring.h>
/*
@@ -399,6 +400,8 @@ int main(int argc, char *argv[])
exit(EXIT_FAILURE);
}
+ g_set_application_name("Git Credential Helper");
+
/* lookup operation callback */
while (try_op->name && strcmp(argv[1], try_op->name))
try_op++;