summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosé Alburquerque <jaalburqu@svn.gnome.org>2013-03-27 00:50:58 -0400
committerJosé Alburquerque <jaalburqu@svn.gnome.org>2013-03-27 00:50:58 -0400
commit3df1b41edb8bd134f97f84bdf4f5012ec29f542c (patch)
treeec860b9892d371aeb96fc5be498d30327dee7dce
parente28f5093dced2e8cafef5795c02657b7265b78ca (diff)
downloadglibmm-3df1b41edb8bd134f97f84bdf4f5012ec29f542c.tar.gz
giomm.h: Also remove the tlsfiledatabase.h include.
* gio/giomm.h: Remove the include from here so that make check will not fail. * gio/src/error.hg (TlsError): A minor correction in the 'EOF' substitution regular expression.
-rw-r--r--ChangeLog10
-rw-r--r--gio/giomm.h1
-rw-r--r--gio/src/error.hg2
3 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 120f6164..aa3182d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2013-03-27 José Alburquerque <jaalburquerque@gmail.com>
+
+ giomm.h: Also remove the tlsfiledatabase.h include.
+
+ * gio/giomm.h: Remove the include from here so that make check will
+ not fail.
+
+ * gio/src/error.hg (TlsError): A minor correction in the 'EOF'
+ substitution regular expression.
+
2013-03-26 José Alburquerque <jaalburquerque@gmail.com>
TlsFileDatabase: Remove the class until its usage is more clear.
diff --git a/gio/giomm.h b/gio/giomm.h
index 777d9d6a..2ce4935f 100644
--- a/gio/giomm.h
+++ b/gio/giomm.h
@@ -131,7 +131,6 @@
#include <giomm/tlsclientconnection.h>
#include <giomm/tlsconnection.h>
#include <giomm/tlsdatabase.h>
-#include <giomm/tlsfiledatabase.h>
#include <giomm/tlsinteraction.h>
#include <giomm/tlspassword.h>
#include <giomm/tlsserverconnection.h>
diff --git a/gio/src/error.hg b/gio/src/error.hg
index b147a7df..5369fa47 100644
--- a/gio/src/error.hg
+++ b/gio/src/error.hg
@@ -43,7 +43,7 @@ namespace Gio
*/
_WRAP_GERROR(Error, GIOErrorEnum, G_IO_ERROR, NO_GTYPE)
_WRAP_GERROR(ResolverError, GResolverError, G_RESOLVER_ERROR, NO_GTYPE)
-_WRAP_GERROR(TlsError, GTlsError, G_TLS_ERROR, NO_GTYPE, s#^EOF#ENDOFFILE#)
+_WRAP_GERROR(TlsError, GTlsError, G_TLS_ERROR, NO_GTYPE, s#^EOF$#ENDOFFILE#)
} // namespace Gio