projects/dbus-d: dbus-d/dsrc/org/freedesktop/dbus/DBus.d comparison

comparison dbus-d/dsrc/org/freedesktop/dbus/DBus.d @ 11:44c987465a20

fixed assertion error for open_container

author	Frank Benoit <benoit@tionex.de>
date	Fri, 09 Nov 2007 16:17:32 +0100
parents	963d271f7c25
children

comparison

equal deleted inserted replaced

-:19117ffaee67
+:44c987465a20
 /*
 * Copyright (C) 2007  Frank Benoit
 *
 * Licensed under the Academic Free License version 2.1
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 */
 bool[ DBusObjectImpl ] objectLocker;
 class DBusConnectionImpl {
 	DBusConnection* conn;
 	public this( char[] addr ){
 		DBusError err;
 		int trial = 0;
 		while( true ){
 			trial++;
 			dbus_error_init(&err);
 			scope(exit)
 				if( dbus_error_is_set(&err) ){
 					dbus_error_free(&err);
 				}
 			conn = dbus_connection_open_private( XtoUtf8z(addr), & err );
 			if( !dbus_error_is_set(&err) && conn !is null ){
 				return;
 			}
 			if( trial > 10 ){
 				if( dbus_error_is_set(&err) ){
 					Stdout.formatln( "Connect Error ({})\n", fromUtf8z( err.message));
 					throw new Exception("");
 				}
 				if( conn is null ){
 					throw new IOException("connecting not successful");
 				}
 			else{
 				Thread.sleep( 0.1 );
 			}
 		}
 	}
 /+	public DBusInterface getRemoteObject( char[] path ){
 		return null;
 	}+/
 	public void mainLoop(){
 		//Stdout.formatln( "   D mainloop starting" );
 		DBusError err;
 		dbus_error_init(&err);
 		//CBus.dbus_bus_request_name(conn, XtoUtf8z("test.method.caller"), DBUS_NAME_FLAG_REPLACE_EXISTING , &err);
 		if( dbus_error_is_set(&err) ){
 			Stdout.formatln( "Name Error ({})\n", fromUtf8z( err.message));
 			dbus_error_free(&err);
 			throw new Exception("");
 		}
 	}
 	public void disconnect(){
 appendMsgParam( conn, &sub, v.value );
 }
 else if( DBusVariantStruct v = cast(DBusVariantStruct)value ){
 DBusMessageIter sub2;
-ensureDBus( dbus_message_iter_open_container( &sub, DBUS_TYPE_STRUCT, XtoUtf8z( v.getSig() ), &sub2 ));
+// open_cont: if type=STRUCT => sig shall be null
+ensureDBus( dbus_message_iter_open_container( &sub, DBUS_TYPE_STRUCT, null/*XtoUtf8z( v.getSig() )*/, &sub2 ));
 foreach( el; v.values ){
 appendMsgParamVariant( conn, &sub2, el );
 }
 ensureDBus( dbus_message_iter_close_container( &sub, &sub2 ));
 }
 ensureDBus( dbus_message_iter_close_container( &sub2, &el ));
 }
 ensureDBus( dbus_message_iter_close_container( &sub, &sub2 ));
 }
 else{
 Stdout.formatln( "appendMsgParamVariant not handled case for sig: {}", value.getSig() ).flush();
 ensure( false, "appendMsgParamVariant not handled case for sig: %0", value.getSig() );
 }
 ensureDBus( dbus_message_iter_close_container( iter, &sub ));
 }
 }
 void appendMsgParamStruct( T... )( DBusConnection* conn, DBusMessageIter* iter, T t ){
 //pragma( msg, "appendMsgParamStruct: "~typeof(T).stringof );
 DBusMessageIter sub;
-ensureDBus( dbus_message_iter_open_container( iter, DBUS_TYPE_STRUCT, XtoUtf8z( createDBusSignature!(T)), &sub ));
+// open_cont: if type=STRUCT => sig shall be null
+ensureDBus( dbus_message_iter_open_container( iter, DBUS_TYPE_STRUCT, null, &sub ));
 foreach( item; t ){
 appendItem( conn, &sub, item );
 }
 ensureDBus( dbus_message_iter_close_container( iter, &sub ));
 }
 	char[] name = fromUtf8z( dbus_message_get_member(message));
 	if( buf.length < name.length ){
 		buf.length = name.length;
 	}
 	buf[ 0 .. name.length ] = name;
 	char[] sig = fromUtf8z( dbus_message_get_signature(message));
 	int sz = name.length+sig.length+1;
 	if( buf.length < sz ){
 		buf.length= sz;
 	}
 getVariantAsKnownType!( DBusVariant[ DBusVariant ] )( null );
 getVariantAsKnownType!( Struct!( int[], long, char[], Struct!( bool ) ) )( null );
 }
 /**
 * this function shall be used like so:
 * ---
 * mixin( createJavaImplementation( "MyClass", ["I1", "I2" ] ));
 * ---
 * This creates a simple standard implementation by generating code in this form:

Mercurial > projects > dbus-d

comparison dbus-d/dsrc/org/freedesktop/dbus/DBus.d @ 11:44c987465a20