Fix a missing brace in main.c, fix distchecking.
This commit is contained in:
Bastien Nocera
2010-08-19 14:54:34 +01:00
parent 7872479415
commit 731b22d368
5 changed files with 11 additions and 11 deletions

3
NEWS
View File

@ -1,2 +1,5 @@
This file lists notable changes in each release. For the full history of all
changes, see ChangeLog.
version 0.2.0:
- First actual release

View File

@ -1,5 +1,5 @@
AC_INIT([fprintd], [0.1])
AM_INIT_AUTOMAKE
AC_INIT([fprintd], [0.2.0])
AM_INIT_AUTOMAKE([1.11 dist-bzip2 no-dist-gzip check-news])
AC_CONFIG_SRCDIR([src/main.c])
AC_CONFIG_HEADERS([config.h])
@ -45,10 +45,9 @@ AC_MSG_CHECKING(for PAM headers and library)
AC_MSG_RESULT([$has_pam])
AC_CHECK_PROG([POLKIT_POLICY_FILE_VALIDATE],
[polkit-policy-file-validate], [polkit-policy-file-validate])
AC_CHECK_PROG([XMLLINT], [xmllint], [xmllint])
AC_CHECK_PROG([XSLTPROC], [xsltproc], [xsltproc])
AC_PATH_PROG([XSLTPROC], [xsltproc])
GTK_DOC_CHECK([1.3])
AS_AC_EXPAND(DATADIR, $datadir)

View File

@ -22,10 +22,10 @@ man_MANS = fprintd.1
fprintd.1: fprintd.pod
$(AM_V_GEN) pod2man -c "" -s 1 -q none -n fprintd -r freedesktop $< > $@
EXTRA_DIST = $(dbus_services_in_files) $(dbus_conf_DATA) $(polkit_in_files) $(conf_DATA)
CLEANFILES = $(polkit_DATA) $(dbus_services_DATA)
EXTRA_DIST = $(dbus_services_in_files) $(dbus_conf_DATA) $(polkit_in_files) $(conf_DATA) fprintd.pod
CLEANFILES = $(polkit_DATA) $(dbus_services_DATA) fprintd.1
check:
$(POLKIT_POLICY_FILE_VALIDATE) $(polkit_DATA)
$(XMLLINT) $(polkit_DATA)

View File

@ -3,9 +3,6 @@
* Copyright (C) 2007 Daniel Drake <dsd@gentoo.org>
* Copyright (C) 2008 Bastien Nocera <hadess@hadess.net>
*
* Experimental code. This will be moved out of fprintd into it's own
* package once the system has matured.
*
* This program 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

View File

@ -356,6 +356,7 @@ int main(int argc, char **argv)
0, &request_name_ret, &error)) {
g_warning("Failed to get name: %s", error->message);
return 1;
}
if (request_name_ret != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
g_warning ("Got result code %u from requesting name", request_name_ret);