--- a/examples/csma-broadcast.cc	Mon Apr 06 13:05:59 2009 +0100
+++ b/examples/csma-broadcast.cc	Mon Apr 06 22:05:02 2009 -0700
@@ -36,7 +36,6 @@
 #include "ns3/simulator-module.h"
 #include "ns3/node-module.h"
 #include "ns3/helper-module.h"
-#include "ns3/contrib-module.h"
 
 using namespace ns3;
 
@@ -52,21 +51,11 @@
 #endif
   LogComponentEnable ("CsmaBroadcastExample", LOG_PREFIX_TIME);
 
-  // By default, this example will launch the GtkConfigStore
-  bool suppressGtkConfigStore = false;
-
   // Allow the user to override any of the defaults and the above
   // Bind()s at run-time, via command-line arguments
   CommandLine cmd;
-  cmd.AddValue ("suppressGtkConfigStore", "suppress GtkConfigStore if true", suppressGtkConfigStore);
   cmd.Parse (argc, argv);
 
-  GtkConfigStore config;
-  if (suppressGtkConfigStore == false)
-    {
-      config.ConfigureDefaults ();
-    }
-
   NS_LOG_INFO ("Create nodes.");
   NodeContainer c;
   c.Create (3);
@@ -125,11 +114,6 @@
   ascii.open ("csma-broadcast.tr");
   CsmaHelper::EnableAsciiAll (ascii);
 
-  if (suppressGtkConfigStore == false)
-    {
-      config.ConfigureAttributes ();
-    }
-
   NS_LOG_INFO ("Run Simulation.");
   Simulator::Run ();    
   Simulator::Destroy ();

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