From b83c70175d03273773a9e6aec9d9ec26b52a4c72 Mon Sep 17 00:00:00 2001
From: Jonathan Moore Liles <j.liles@unix.net>
Date: Fri, 22 Feb 2013 17:25:22 -0800
Subject: [PATCH] Remove some unnecessary NTK calls.

---
 mixer/src/main.C                      | 9 ---------
 sequencer/src/main.C                  | 7 -------
 session-manager/src/nsm-proxy-gui.C   | 6 ------
 session-manager/src/session-manager.C | 6 ------
 timeline/src/main.C                   | 7 -------
 5 files changed, 35 deletions(-)

diff --git a/mixer/src/main.C b/mixer/src/main.C
index 8e3acff..cd233c9 100644
--- a/mixer/src/main.C
+++ b/mixer/src/main.C
@@ -32,8 +32,6 @@
 #include <FL/fl_ask.H>
 #include <FL/Fl_Shared_Image.H>
 #include <FL/Fl_Pack.H>
-#include "FL/themes.H"
-#include "FL/Fl_Theme.H"
 #include "Thread.H"
 #include "debug.h"
 
@@ -266,13 +264,6 @@ main ( int argc, char **argv )
         }
     }
 
-    if ( ! no_ui )
-    {
-        fl_register_themes();
-
-        Fl_Theme::set();
-    }
-
     Plugin_Module::spawn_discover_thread();
     
     mixer->init_osc( osc_port );
diff --git a/sequencer/src/main.C b/sequencer/src/main.C
index fc16bc5..2b50508 100644
--- a/sequencer/src/main.C
+++ b/sequencer/src/main.C
@@ -38,9 +38,6 @@
 #include "../icons/icon-16x16.xpm"
 #endif
 
-#include "FL/Fl_Theme.H"
-#include "FL/themes.H"
-
 // extern const char *BUILD_ID;
 // extern const char *VERSION;
 
@@ -280,10 +277,6 @@ main ( int argc, char **argv )
 #endif
     ui->main_window->show( 0, 0 );
 
-    fl_register_themes();
-
-    Fl_Theme::set();
-
     instance_name = strdup( APP_NAME );
 
     const char *nsm_url = getenv( "NSM_URL" );
diff --git a/session-manager/src/nsm-proxy-gui.C b/session-manager/src/nsm-proxy-gui.C
index ba49b5d..e2a89dc 100644
--- a/session-manager/src/nsm-proxy-gui.C
+++ b/session-manager/src/nsm-proxy-gui.C
@@ -26,8 +26,6 @@
 #define APP_TITLE "NSM Proxy"
 
 #include "NSM_Proxy_UI.H"
-#include "FL/Fl_Theme.H"
-#include "FL/themes.H"
 #include <lo/lo.h>
 #include <signal.h>
 #include <stdio.h>
@@ -179,10 +177,6 @@ main ( int argc, char **argv )
     
     w->show();
 
-    fl_register_themes();
-
-    Fl_Theme::set();
-    
     Fl::lock();
 
     Fl::run();
diff --git a/session-manager/src/session-manager.C b/session-manager/src/session-manager.C
index e04e9e9..58c4540 100644
--- a/session-manager/src/session-manager.C
+++ b/session-manager/src/session-manager.C
@@ -48,8 +48,6 @@
 
 #define APP_NAME "Non Session Manager"
 
-#include "FL/themes.H"
-
 #ifdef HAVE_XPM
 #include "FL/Fl.H"
 #include "FL/x.H"
@@ -1150,10 +1148,6 @@ main (int argc, char **argv )
         o->show( 0, NULL );
     }
     
-    fl_register_themes();
-    
-    Fl_Theme::set();
-
     static struct option long_options[] = 
         {
             { "nsm-url", required_argument, 0, 'n' },
diff --git a/timeline/src/main.C b/timeline/src/main.C
index ed2c42b..f3dd40a 100644
--- a/timeline/src/main.C
+++ b/timeline/src/main.C
@@ -43,9 +43,6 @@
 #include "TLE.H"
 #include "Timeline.H"
 
-#include "FL/themes.H"
-#include "FL/Fl_Theme.H"
-
 #include "Project.H"
 #include "Transport.H"
 #include "Engine/Engine.H"
@@ -253,10 +250,6 @@ main ( int argc, char **argv )
 #endif        
     tle->main_window->show( 0, NULL );
    
-    fl_register_themes();
-
-    Fl_Theme::set();
-        
     char *nsm_url = getenv( "NSM_URL" );
 
     if ( nsm_url )