[Xfce4-commits] r30413 - in xfc/trunk: . examples/core/iochannel examples/howto/selection

[Bo Lorentsen]

Author: bl
Date: 2009-07-28 21:30:37 +0000 (Tue, 28 Jul 2009)
New Revision: 30413

Modified:
   xfc/trunk/ChangeLog
   xfc/trunk/examples/core/iochannel/iochannel.cc
   xfc/trunk/examples/howto/selection/selection.cc
Log:
bug 1648

Modified: xfc/trunk/ChangeLog
===================================================================
--- xfc/trunk/ChangeLog	2009-07-28 21:11:52 UTC (rev 30412)
+++ xfc/trunk/ChangeLog	2009-07-28 21:30:37 UTC (rev 30413)
@@ -1,3 +1,7 @@
+2009-07.28 23:30  bl
+
+   * fix from Mateusz Loskot, added (bug 1648)
+
 2009-07.28 23:11  bl
 
    * add basic build structure for libXFCde as panel, utils and ui

Modified: xfc/trunk/examples/core/iochannel/iochannel.cc
===================================================================
--- xfc/trunk/examples/core/iochannel/iochannel.cc	2009-07-28 21:11:52 UTC (rev 30412)
+++ xfc/trunk/examples/core/iochannel/iochannel.cc	2009-07-28 21:30:37 UTC (rev 30413)
@@ -76,7 +76,7 @@
 		read_length += buffer.size();
 
 		do
-		status = gio_write->write(buffer, &length_out, &error);
+		status = gio_write->write(buffer.c_str(), &length_out, &error);
 		while (status == G::IO_STATUS_AGAIN);
 		if (status != G::IO_STATUS_NORMAL)
 		break;

Modified: xfc/trunk/examples/howto/selection/selection.cc
===================================================================
--- xfc/trunk/examples/howto/selection/selection.cc	2009-07-28 21:11:52 UTC (rev 30412)
+++ xfc/trunk/examples/howto/selection/selection.cc	2009-07-28 21:30:37 UTC (rev 30413)
@@ -47,7 +47,7 @@
 	cout << " * type() = " << selection_data.get_type() << endl;
 	cout << " * format() = " << selection_data.format() << endl;
 	cout.setf(ios_base::hex, ios_base::basefield);
-	cout << " * data() = 0x" << reinterpret_cast<unsigned long>(selection_data.data()) << endl;
+	cout << " * data() = 0x" << static_cast<int>(*selection_data.data()) << endl;
 	cout.setf(ios_base::dec, ios_base::basefield);
 	cout << " * length() = " << selection_data.length() << endl << endl;