summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathon Jongsma <jonathon@quotidian.org>2009-09-08 14:05:10 -0500
committerJonathon Jongsma <jonathon@quotidian.org>2009-09-08 14:05:10 -0500
commit8af25a014e90633f9acfbca8e2e131d44efabefd (patch)
tree15020287fb3ff4f9ad27269e8e21d104f6b202da
parent911b607407a05a8fed5485fe788d94a271a03efe (diff)
downloadglibmm-8af25a014e90633f9acfbca8e2e131d44efabefd.tar.gz
fix distcheckglibmm-2.21.5
-rw-r--r--ChangeLog7
-rw-r--r--examples/Makefile.am1
-rw-r--r--gio/giomm.h8
-rw-r--r--gio/src/filelist.am13
4 files changed, 7 insertions, 22 deletions
diff --git a/ChangeLog b/ChangeLog
index b337c78e..c935a64e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2009-09-08 Jonathon Jongsma <jonathon.jongsma@collabora.co.uk>
+ * examples/Makefile.am:
+ * gio/giomm.h:
+ * gio/src/filelist.am: disable more network io stuff that was
+ causing distcheck to fail
+
+2009-09-08 Jonathon Jongsma <jonathon.jongsma@collabora.co.uk>
+
* NEWS: update for release
* configure.ac: increment version to 2.21.5
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 5d69948f..ea48c914 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -23,7 +23,6 @@ check_PROGRAMS = \
iochannel_stream/example \
keyfile/example \
markup/parser \
- network_io/resolve \
options/example \
properties/example \
regex/example \
diff --git a/gio/giomm.h b/gio/giomm.h
index 4ad29c09..2e393c6e 100644
--- a/gio/giomm.h
+++ b/gio/giomm.h
@@ -48,8 +48,6 @@
#include <giomm/filterinputstream.h>
#include <giomm/filteroutputstream.h>
#include <giomm/icon.h>
-#include <giomm/inetaddress.h>
-#include <giomm/inetsocketaddress.h>
#include <giomm/init.h>
#include <giomm/inputstream.h>
#include <giomm/iostream.h>
@@ -58,14 +56,8 @@
#include <giomm/memoryoutputstream.h>
#include <giomm/mount.h>
#include <giomm/mountoperation.h>
-#include <giomm/networkaddress.h>
#include <giomm/outputstream.h>
-#include <giomm/resolver.h>
#include <giomm/seekable.h>
-#include <giomm/socketaddressenumerator.h>
-#include <giomm/socketaddress.h>
-#include <giomm/socketconnectable.h>
-#include <giomm/srvtarget.h>
#include <giomm/themedicon.h>
#include <giomm/unixinputstream.h>
#include <giomm/unixoutputstream.h>
diff --git a/gio/src/filelist.am b/gio/src/filelist.am
index aece5c92..093d47d8 100644
--- a/gio/src/filelist.am
+++ b/gio/src/filelist.am
@@ -50,19 +50,6 @@ giomm_files_any_hg = \
volume.hg \
volumemonitor.hg
-## Network IO not ready for stable release
-## inetaddress.hg \
-## inetsocketaddress.hg \
-## initable.hg \
-## networkaddress.hg \
-## networkservice.hg \
-## resolver.hg \
-## socket.hg \
-## socketaddress.hg \
-## socketaddressenumerator.hg \
-## socketconnectable.hg \
-## srvtarget.hg
-
giomm_files_posix_hg = \
desktopappinfo.hg \
unixinputstream.hg \