glibmm r563 - in trunk: . gio gio/src

[jjongsma svn gnome org]

Author: jjongsma
Date: Sat Feb  2 22:03:37 2008
New Revision: 563
URL: http://svn.gnome.org/viewvc/glibmm?rev=563&view=rev

Log:
	* gio/giomm.h: add new header files to the main include
	* gio/src/datainputstream.hg: add FIXME note about not being able to tell
	error conditions from empty strings on read_line() / read_until()



Modified:
   trunk/ChangeLog
   trunk/gio/giomm.h
   trunk/gio/src/datainputstream.hg

Modified: trunk/gio/giomm.h
==============================================================================
--- trunk/gio/giomm.h	(original)
+++ trunk/gio/giomm.h	Sat Feb  2 22:03:37 2008
@@ -22,7 +22,9 @@
 
 #include <giomm/appinfo.h>
 #include <giomm/asyncresult.h>
+#include <giomm/bufferedinputstream.h>
 #include <giomm/cancellable.h>
+#include <giomm/datainputstream.h>
 #include <giomm/drive.h>
 #include <giomm/error.h>
 #include <giomm/fileattributeinfolist.h>

Modified: trunk/gio/src/datainputstream.hg
==============================================================================
--- trunk/gio/src/datainputstream.hg	(original)
+++ trunk/gio/src/datainputstream.hg	Sat Feb  2 22:03:37 2008
@@ -110,6 +110,10 @@
   guint64 read_uint64(std::auto_ptr<Glib::Error>& error);
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 
+  // FIXME: In C, these functions return NULL if there is an error (i.e. end of
+  // stream reached), but if we use std::string, we don't have a way to tell an
+  // empty string from NULL.  Perhaps we should use raw pointers as in C, but
+  // that would mean we need to worry about freeing the C string...
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   std::string read_line(const Glib::RefPtr<Cancellable>& cancellable);
 #else