krb5 commit: kfw remove status bar

[Benjamin Kaduk]

https://github.com/krb5/krb5/commit/813ae03da33fc77e1fe0706a5fbbfd4070b79b7a
commit 813ae03da33fc77e1fe0706a5fbbfd4070b79b7a
Author: Kevin Wasserman <kevin.wasserman at painless-security.com>
Date:   Sat Jul 21 19:52:20 2012 -0400

    kfw remove status bar
    
    Signed-off-by: Kevin Wasserman <kevin.wasserman at painless-security.com>
    
    ticket: 7251 (new)
    queue: kfw
    target_version: 1.10.4
    tags: pullup

 src/windows/leash/LeashView.cpp |    9 ++++++---
 src/windows/leash/MainFrm.cpp   |    9 +++++++--
 src/windows/leash/MainFrm.h     |    2 ++
 src/windows/leash/Makefile.in   |    2 +-
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/windows/leash/LeashView.cpp b/src/windows/leash/LeashView.cpp
index c30b3ec..6a28727 100644
--- a/src/windows/leash/LeashView.cpp
+++ b/src/windows/leash/LeashView.cpp
@@ -2249,24 +2249,26 @@ BOOL CLeashView::PreTranslateMessage(MSG* pMsg)
                             ticketStatusKrb5.Format("Kerb-5 Ticket Life: < 1 min");
                         }
                     }
-
+#ifndef NO_STATUS_BAR
                     if (CMainFrame::m_wndStatusBar)
                     {
                         CMainFrame::m_wndStatusBar.SetPaneInfo(1, 111112, SBPS_NORMAL, 130);
                         CMainFrame::m_wndStatusBar.SetPaneText(1, ticketStatusKrb5, SBT_POPOUT);
                     }
+#endif
                 }
             }
             else
             {
                 // not installed
                 ticketStatusKrb5.Format("Kerb-5: Not Available");
-
+#ifndef NO_STATUS_BAR
                 if (CMainFrame::m_wndStatusBar)
                 {
                     CMainFrame::m_wndStatusBar.SetPaneInfo(1, 111112, SBPS_NORMAL, 130);
                     CMainFrame::m_wndStatusBar.SetPaneText(1, ticketStatusKrb5, SBT_POPOUT);
                 }
+#endif
             }
             //KRB5
 
@@ -2474,12 +2476,13 @@ BOOL CLeashView::PreTranslateMessage(MSG* pMsg)
                             ticketStatusAfs.Format("AFS Token Life: < 1 min");
                         }
                     }
-
+#ifndef NO_STATUS_BAR
                     if (CMainFrame::m_wndStatusBar)
                     {
                         CMainFrame::m_wndStatusBar.SetPaneInfo(3, 111113, SBPS_NORMAL, 130);
                         CMainFrame::m_wndStatusBar.SetPaneText(3, ticketStatusAfs, SBT_POPOUT);
                     }
+#endif
                 }
             }
 #ifdef COMMENT
diff --git a/src/windows/leash/MainFrm.cpp b/src/windows/leash/MainFrm.cpp
index 5346502..5f1c6e6 100644
--- a/src/windows/leash/MainFrm.cpp
+++ b/src/windows/leash/MainFrm.cpp
@@ -33,7 +33,9 @@ static char THIS_FILE[] = __FILE__;
 #define MIN_RIGHT	  530
 #define MIN_BOTTOM	  280
 
+#ifndef NO_STATUS_BAR
 CMFCStatusBar CMainFrame::m_wndStatusBar;
+#endif
 CMFCToolBar   CMainFrame::m_wndToolBar;
 CImageList CMainFrame::m_imageList;
 CImageList CMainFrame::m_disabledImageList;
@@ -140,6 +142,7 @@ int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
 		return -1;      // fail to create
 	}
 
+#ifndef NO_STATUS_BAR
 	if (!m_wndStatusBar.Create(this) ||
 		!m_wndStatusBar.SetIndicators(indicators,
 		  (CLeashApp::m_hAfsDLL ? 4 : 3)))
@@ -149,6 +152,8 @@ int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
         TRACE0("Failed to create status bar\n");
 		return -1;      // fail to create
 	}
+#endif
+
 
 	// TODO: Remove this if you don't want tool tips or a resizeable toolbar
 	//m_wndToolBar.SetPaneStyle(m_wndToolBar.GetPaneStyle() |
@@ -382,7 +387,7 @@ void CMainFrame::OnClose(void)
 LRESULT CMainFrame::WindowProc(UINT message, WPARAM wParam, LPARAM lParam)
 {
     BOOL oldMin = m_isMinimum;
-    printf("CMainFrame::WindowProc() Msg: %x, WPARAM: %x, LPARAM: %x\n", message, wParam, lParam);
+    //printf("CMainFrame::WindowProc() Msg: %x, WPARAM: %x, LPARAM: %x\n", message, wParam, lParam);
 	switch(message)
 	{
     case WM_CLOSE:
@@ -422,4 +427,4 @@ void CMainFrame::OnContextHelp()
 {
 
 }
-*/
\ No newline at end of file
+*/
diff --git a/src/windows/leash/MainFrm.h b/src/windows/leash/MainFrm.h
index 749c2fa..e3d356e 100644
--- a/src/windows/leash/MainFrm.h
+++ b/src/windows/leash/MainFrm.h
@@ -45,7 +45,9 @@ protected: // create from serialization only
 // Attributes
 public:
 	static int         m_whatSide;
+#ifndef NO_STATUS_BAR
     static CMFCStatusBar  m_wndStatusBar;
+#endif
 	static CMFCToolBar    m_wndToolBar;
 	static BOOL		   m_isMinimum;
     static BOOL        m_isBeingResized;
diff --git a/src/windows/leash/Makefile.in b/src/windows/leash/Makefile.in
index eb8a566..97439fd 100644
--- a/src/windows/leash/Makefile.in
+++ b/src/windows/leash/Makefile.in
@@ -66,7 +66,7 @@ LOCALINCLUDES= -I$(BUILDTOP) -I$(BUILDTOP)\include -I$(BUILDTOP)\windows\include
 RFLAGS	= $(LOCALINCLUDES)
 RCFLAGS	= $(RFLAGS) -D_WIN32 -DLEASH_APP
 
-DEFINES = -DWINSOCK -DWIN32 -DWINDOWS -D_AFXDLL -D_MBCS -DNO_KRB4
+DEFINES = -DWINSOCK -DWIN32 -DWINDOWS -D_AFXDLL -D_MBCS -DNO_KRB4 -DNO_STATUS_BAR
 !ifdef NODEBUG
 DEFINES = $(DEFINES)
 !else