1.1 --- a/examples/csma-broadcast.cc	Mon Apr 06 13:05:59 2009 +0100
     1.2 +++ b/examples/csma-broadcast.cc	Mon Apr 06 22:05:02 2009 -0700
     1.3 @@ -36,7 +36,6 @@
     1.4  #include "ns3/simulator-module.h"
     1.5  #include "ns3/node-module.h"
     1.6  #include "ns3/helper-module.h"
     1.7 -#include "ns3/contrib-module.h"
     1.8  
     1.9  using namespace ns3;
    1.10  
    1.11 @@ -52,21 +51,11 @@
    1.12  #endif
    1.13    LogComponentEnable ("CsmaBroadcastExample", LOG_PREFIX_TIME);
    1.14  
    1.15 -  // By default, this example will launch the GtkConfigStore
    1.16 -  bool suppressGtkConfigStore = false;
    1.17 -
    1.18    // Allow the user to override any of the defaults and the above
    1.19    // Bind()s at run-time, via command-line arguments
    1.20    CommandLine cmd;
    1.21 -  cmd.AddValue ("suppressGtkConfigStore", "suppress GtkConfigStore if true", suppressGtkConfigStore);
    1.22    cmd.Parse (argc, argv);
    1.23  
    1.24 -  GtkConfigStore config;
    1.25 -  if (suppressGtkConfigStore == false)
    1.26 -    {
    1.27 -      config.ConfigureDefaults ();
    1.28 -    }
    1.29 -
    1.30    NS_LOG_INFO ("Create nodes.");
    1.31    NodeContainer c;
    1.32    c.Create (3);
    1.33 @@ -125,11 +114,6 @@
    1.34    ascii.open ("csma-broadcast.tr");
    1.35    CsmaHelper::EnableAsciiAll (ascii);
    1.36  
    1.37 -  if (suppressGtkConfigStore == false)
    1.38 -    {
    1.39 -      config.ConfigureAttributes ();
    1.40 -    }
    1.41 -
    1.42    NS_LOG_INFO ("Run Simulation.");
    1.43    Simulator::Run ();    
    1.44    Simulator::Destroy ();

     2.1 --- a/regression/tests/test-csma-broadcast.py	Mon Apr 06 13:05:59 2009 +0100
     2.2 +++ b/regression/tests/test-csma-broadcast.py	Mon Apr 06 22:05:02 2009 -0700
     2.3 @@ -2,5 +2,3 @@
     2.4  
     2.5  """Generic trace-comparison-type regression test."""
     2.6  
     2.7 -arguments = ["--suppressGtkConfigStore=1"]
     2.8 -