aboutsummaryrefslogtreecommitdiff
path: root/preferences
diff options
context:
space:
mode:
authorGuido Günther <agx@sigxcpu.org>2010-06-19 15:28:04 +0200
committerGuido Günther <agx@sigxcpu.org>2010-06-19 15:28:04 +0200
commit3dabd41cdb58f4575dd81e6668a7cba6337ca09c (patch)
treeb70234f94d6c99481f3dac90635337ca32053017 /preferences
parentDon't only match even release numbers (diff)
parentImported Upstream version 0.16~rc2 (diff)
downloadkrb5-auth-dialog-3dabd41cdb58f4575dd81e6668a7cba6337ca09c.tar.gz
krb5-auth-dialog-3dabd41cdb58f4575dd81e6668a7cba6337ca09c.tar.bz2
krb5-auth-dialog-3dabd41cdb58f4575dd81e6668a7cba6337ca09c.zip
Merge commit 'upstream/0.16.rc2' into experimental
Diffstat (limited to 'preferences')
-rw-r--r--preferences/Makefile.in2
-rw-r--r--preferences/ka-preferences.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/preferences/Makefile.in b/preferences/Makefile.in
index a95522f..852125f 100644
--- a/preferences/Makefile.in
+++ b/preferences/Makefile.in
@@ -232,6 +232,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PAM_LIBS = @PAM_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
diff --git a/preferences/ka-preferences.c b/preferences/ka-preferences.c
index f925b7e..e408dac 100644
--- a/preferences/ka-preferences.c
+++ b/preferences/ka-preferences.c
@@ -826,7 +826,7 @@ main (int argc, char *argv[])
g_print ("%s\n%s\n",
error->message,
help_msg);
- g_error_free (error);
+ g_clear_error (&error);
return 1;
}
textdomain (PACKAGE);
bgstack15