1.1 --- a/examples/csma-broadcast.cc	Fri Apr 03 20:09:07 2009 +0200
     1.2 +++ b/examples/csma-broadcast.cc	Sat Apr 04 13:48:13 2009 -0700
     1.3 @@ -52,13 +52,20 @@
     1.4  #endif
     1.5    LogComponentEnable ("CsmaBroadcastExample", LOG_PREFIX_TIME);
     1.6  
     1.7 +  // By default, this example will launch the GtkConfigStore
     1.8 +  bool suppressGtkConfigStore = false;
     1.9 +
    1.10    // Allow the user to override any of the defaults and the above
    1.11    // Bind()s at run-time, via command-line arguments
    1.12    CommandLine cmd;
    1.13 +  cmd.AddValue ("suppressGtkConfigStore", "suppress GtkConfigStore if true", suppressGtkConfigStore);
    1.14    cmd.Parse (argc, argv);
    1.15  
    1.16    GtkConfigStore config;
    1.17 -  config.ConfigureDefaults ();
    1.18 +  if (suppressGtkConfigStore == false)
    1.19 +    {
    1.20 +      config.ConfigureDefaults ();
    1.21 +    }
    1.22  
    1.23    NS_LOG_INFO ("Create nodes.");
    1.24    NodeContainer c;
    1.25 @@ -118,7 +125,10 @@
    1.26    ascii.open ("csma-broadcast.tr");
    1.27    CsmaHelper::EnableAsciiAll (ascii);
    1.28  
    1.29 -  config.ConfigureAttributes ();
    1.30 +  if (suppressGtkConfigStore == false)
    1.31 +    {
    1.32 +      config.ConfigureAttributes ();
    1.33 +    }
    1.34  
    1.35    NS_LOG_INFO ("Run Simulation.");
    1.36    Simulator::Run ();    

     2.1 --- a/regression/tests/test-csma-broadcast.py	Fri Apr 03 20:09:07 2009 +0200
     2.2 +++ b/regression/tests/test-csma-broadcast.py	Sat Apr 04 13:48:13 2009 -0700
     2.3 @@ -2,3 +2,5 @@
     2.4  
     2.5  """Generic trace-comparison-type regression test."""
     2.6  
     2.7 +arguments = ["--suppressGtkConfigStore=1"]
     2.8 +