summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Martin Szulecki2009-08-04 19:07:47 +0200
committerGravatar Martin Szulecki2009-08-04 19:07:47 +0200
commit74ba34bb0554f581f408ebadd25bbc203b24b4aa (patch)
treed3fe143d8e96646f04457d85ad90e018f7a31a33
parent3b3a47b798b80c78446d9f062d311bcca135b177 (diff)
parent84620d89f988b0b763daea1f4ccae66acc062b19 (diff)
downloadlibimobiledevice-74ba34bb0554f581f408ebadd25bbc203b24b4aa.tar.gz
libimobiledevice-74ba34bb0554f581f408ebadd25bbc203b24b4aa.tar.bz2
Merge branch 'master' of git://github.com/MattColyer/libiphone into martin
Conflicts: dev/Makefile.am
-rw-r--r--configure.ac4
-rw-r--r--doxygen.cfg2
-rw-r--r--src/userpref.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index 55f5bae..1303e23 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.61)
-AC_INIT(libiphone, 0.9.2, nospam@nowhere.com)
+AC_INIT(libiphone, 0.9.3, nospam@nowhere.com)
AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip])
AC_CONFIG_SRCDIR([src/])
AC_CONFIG_HEADERS([config.h])
@@ -20,7 +20,7 @@ AC_PROG_CC
AM_PROG_CC_C_O
# Checks for libraries.
-PKG_CHECK_MODULES(libusbmuxd, libusbmuxd >= 0.1.0)
+PKG_CHECK_MODULES(libusbmuxd, libusbmuxd >= 0.1.3)
PKG_CHECK_MODULES(libglib2, glib-2.0 >= 2.14.1)
PKG_CHECK_MODULES(libgthread2, gthread-2.0 >= 2.14.1)
PKG_CHECK_MODULES(libgnutls, gnutls >= 1.6.3 )
diff --git a/doxygen.cfg b/doxygen.cfg
index 0942031..5aff928 100644
--- a/doxygen.cfg
+++ b/doxygen.cfg
@@ -31,7 +31,7 @@ PROJECT_NAME = libiphone
# This could be handy for archiving the generated documentation or
# if some version control system is used.
-PROJECT_NUMBER = 0.9.1
+PROJECT_NUMBER = 0.9.3
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
diff --git a/src/userpref.c b/src/userpref.c
index b930693..9dd1a01 100644
--- a/src/userpref.c
+++ b/src/userpref.c
@@ -148,7 +148,7 @@ void userpref_get_host_id(char **host_id)
g_key_file_free(key_file);
g_free(config_file);
- if (!host_id) {
+ if (!*host_id) {
/* no config, generate host_id */
*host_id = userpref_generate_host_id();
userpref_set_host_id(*host_id);