From 1cd2bc7548666663411a17f49de651d2bbb5aadf Mon Sep 17 00:00:00 2001
From: Bjorn Winckler <bjorn.winckler@gmail.com>
Date: Fri, 24 Aug 2007 08:09:46 +0000
Subject: [PATCH] Code cleanup

git-svn-id: http://macvim.googlecode.com/svn/trunk@188 96c4425d-ca35-0410-94e5-3396d5c13a8f
---
 MMBackend.h  | 2 --
 MMBackend.m  | 8 +-------
 MacVim.h     | 6 +-----
 MacVim.m     | 4 ----
 gui_macvim.m | 8 ++++----
 5 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/MMBackend.h b/MMBackend.h
index 562e26a13f..f30850f093 100644
--- a/MMBackend.h
+++ b/MMBackend.h
@@ -17,10 +17,8 @@
     NSMutableData   *drawData;
     NSConnection    *connection;
     id              frontendProxy;
-    NSString        *browseForFileString;
     NSDictionary    *colorDict;
     BOOL            inputReceived;
-    BOOL            receivedKillTaskMsg;
     BOOL            tabBarVisible;
     int             backgroundColor;
     int             foregroundColor;
diff --git a/MMBackend.m b/MMBackend.m
index 99b9bfa49c..de05cc6243 100644
--- a/MMBackend.m
+++ b/MMBackend.m
@@ -895,13 +895,7 @@ static int specialKeyToNSKey(int key);
 
 - (void)handleMessage:(int)msgid data:(NSData *)data
 {
-    if (KillTaskMsgID == msgid) {
-        //NSLog(@"VimTask received kill message; exiting now.");
-        // Set this flag here so that exit does not send TaskExitedMsgID back
-        // to MMVimController.
-        receivedKillTaskMsg = YES;
-        getout(0);
-    } else if (InsertTextMsgID == msgid) {
+    if (InsertTextMsgID == msgid) {
         if (!data) return;
         NSString *key = [[NSString alloc] initWithData:data
                                               encoding:NSUTF8StringEncoding];
diff --git a/MacVim.h b/MacVim.h
index f585f1226d..d97b120559 100644
--- a/MacVim.h
+++ b/MacVim.h
@@ -75,11 +75,7 @@
 extern char *MessageStrings[];
 
 enum {
-    CheckinMsgID = 1,
-    ConnectedMsgID,
-    KillTaskMsgID,
-    TaskExitedMsgID,
-    OpenVimWindowMsgID,
+    OpenVimWindowMsgID = 1,
     InsertTextMsgID,
     KeyDownMsgID,
     CmdKeyMsgID,
diff --git a/MacVim.m b/MacVim.m
index e31ca47995..b8aa07822f 100644
--- a/MacVim.m
+++ b/MacVim.m
@@ -13,10 +13,6 @@
 char *MessageStrings[] = 
 {
     "INVALID MESSAGE ID",
-    "CheckinMsgID",
-    "ConnectedMsgID",
-    "KillTaskMsgID",
-    "TaskExitedMsgID",
     "OpenVimWindowMsgID",
     "InsertTextMsgID",
     "KeyDownMsgID",
diff --git a/gui_macvim.m b/gui_macvim.m
index 5ef871b915..c9bdd65452 100644
--- a/gui_macvim.m
+++ b/gui_macvim.m
@@ -14,7 +14,7 @@
 #import "vim.h"
 
 
-static BOOL gui_cocoa_is_valid_action(NSString *action);
+static BOOL gui_macvim_is_valid_action(NSString *action);
 
 
 // -- Initialization --------------------------------------------------------
@@ -641,7 +641,7 @@ gui_mch_add_menu_item(vimmenu_T *menu, int idx)
             action = [parts objectAtIndex:1];
             action = [action stringByTrimmingCharactersInSet:
                     [NSCharacterSet whitespaceAndNewlineCharacterSet]];
-            if (!gui_cocoa_is_valid_action(action))
+            if (!gui_macvim_is_valid_action(action))
                 action = nil;
         }
     }
@@ -925,7 +925,7 @@ ex_action(eap)
 
     NSString *name = [NSString stringWithCString:(char*)eap->arg
                                         encoding:NSUTF8StringEncoding];
-    if (gui_cocoa_is_valid_action(name)) {
+    if (gui_macvim_is_valid_action(name)) {
         [[MMBackend sharedInstance] executeActionWithName:name];
     } else {
         EMSG2(_("E???: \"%s\" is not a valid action"), eap->arg);
@@ -1301,7 +1301,7 @@ mch_set_mouse_shape(int shape)
 
 
     static BOOL
-gui_cocoa_is_valid_action(NSString *action)
+gui_macvim_is_valid_action(NSString *action)
 {
     static NSDictionary *actionDict = nil;