--- a/dbus-d-javatests/dsrc/DBusTestingGen.d	Sun Oct 21 19:22:41 2007 +0200
+++ b/dbus-d-javatests/dsrc/DBusTestingGen.d	Sun Oct 28 19:35:38 2007 +0100
@@ -29,34 +29,16 @@
                 public interface Peer {
                     public void Ping();
                     public char[] GetMachineId();
-                    template _StdJavaImpl(){
-                    }
-                    template _StdDImpl(){
-                        void _init(){
-                        }
-                    }
                 }
                 // org.freedesktop.DBus.Introspectable
                 public interface Introspectable {
                     public char[] Introspect();
-                    template _StdJavaImpl(){
-                    }
-                    template _StdDImpl(){
-                        void _init(){
-                        }
-                    }
                 }
                 // org.freedesktop.DBus.Properties
                 public interface Properties {
                     public DBusVariant Get( in char[] intf_name, in char[] prop_name );
                     public void Set( in char[] intf_name, in char[] prop_name, in DBusVariant prop );
                     public DBusVariant[ char[] ] GetAll( in char[] intf_name );
-                    template _StdJavaImpl(){
-                    }
-                    template _StdDImpl(){
-                        void _init(){
-                        }
-                    }
                 }
             }
         }
@@ -66,62 +48,26 @@
         // dbustest.OtherInterface
         public interface OtherInterface {
             public void dummy( in char[] arg1 );
-            template _StdJavaImpl(){
-            }
-            template _StdDImpl(){
-                void _init(){
-                }
-            }
         }
         // dbustest.TestControl
         public interface TestControl {
             public char[][] getCalledTests();
             public void activateExceptions( in bool enable );
-            template _StdJavaImpl(){
-            }
-            template _StdDImpl(){
-                void _init(){
-                }
-            }
         }
         // dbustest.TestListener
         public interface TestListener {
             public char[] getName();
-            template _StdJavaImpl(){
-            }
-            template _StdDImpl(){
-                void _init(){
-                }
-            }
         }
         // dbustest.JavaImpl
         public interface JavaImpl {
             public void testV_V();
             public int testI_I( in int arg1 );
-            template _StdJavaImpl(){
-            }
-            template _StdDImpl(){
-                void _init(){
-                }
-            }
         }
         // dbustest.DImpl
         public interface DImpl {
             public void testV_V();
             public int testI_I( in int arg1 );
             public void testParamAllSimpleTyes( in bool i_bool, out bool o_bool, in byte i_byte, out byte o_byte, in short i_short, out short o_short, in ushort i_ushort, out ushort o_ushort, in int i_int, out int o_int, in uint i_uint, out uint o_uint, in long i_long, out long o_long, in ulong i_ulong, out ulong o_ulong, in double i_double, out double o_double, in char[] i_string, out char[] o_string );
-            public void triggerSignal( in int count );
-            public tango.core.Signal.Signal!( int )* testSigI();
-            template _StdJavaImpl(){
-            }
-            template _StdDImpl(){
-                void _init(){
-                }
-                protected tango.core.Signal.Signal!( int ) _testSigI;
-                public tango.core.Signal.Signal!( int )* testSigI(){
-                    return &_testSigI;
-                }
-            }
         }
     }
 }
@@ -246,9 +192,6 @@
             "    <arg  name=\"i_string\" type=\"s\" direction=\"in\" />\\n"
             "    <arg  name=\"o_string\" type=\"s\" direction=\"out\" />\\n"
             "  </method>\\n"
-            "  <method name=\"triggerSignal\">\\n"
-            "    <arg  name=\"count\" type=\"i\" direction=\"in\" />\\n"
-            "  </method>\\n"
             "</interface>\\n");
 }
 private DBusHandlerResult intfHandler__org_freedesktop_DBus_Peer( DBusConnection* conn, DBusMessage* message, void* user_data ){
@@ -492,19 +435,6 @@
                 sendReplyData!( bool, byte, short, ushort, int, uint, long, ulong, double, char[] )( conn, message, po );
             }
             break;
-        case "triggerSignal|i":
-            {
-                Struct!( int ) pi = getCallValues!( int )( message );
-                o.triggerSignal( pi.t[0] );
-                sendReply( conn, message );
-            }
-            break;
-        case "testSigI>i":
-            {
-                Struct!( int ) pi = getCallValues!( int )( message );
-                o.testSigI().opCall( pi.t[0] );
-            }
-            break;
         default:
             return DBusHandlerResult.DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
         }