Merge pull request #528 from sfsam/master

splhack · web-flow · commit 03750a9e59c7 · 2017-08-07T19:25:05.000-07:00
Use proper NSImageName constant NSImageNameAdvanced in Preferences panel
diff --git a/src/MacVim/MMPreferenceController.m b/src/MacVim/MMPreferenceController.m
@@ -36,7 +36,7 @@ static void loadSymbols()
     void *ptr;
     if ((ptr = dlsym(RTLD_DEFAULT, "NSImageNamePreferencesGeneral")) != NULL)
         nsImageNamePreferencesGeneral = *(NSString**)ptr;
-    if ((ptr = dlsym(RTLD_DEFAULT, "NSImageNamePreferencesAdvanced")) != NULL)
+    if ((ptr = dlsym(RTLD_DEFAULT, "NSImageNameAdvanced")) != NULL)
         nsImageNamePreferencesAdvanced = *(NSString**)ptr;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ static void loadSymbols()`
`36`	`36`	`void *ptr;`
`37`	`37`	`if ((ptr = dlsym(RTLD_DEFAULT, "NSImageNamePreferencesGeneral")) != NULL)`
`38`	`38`	`nsImageNamePreferencesGeneral = (NSString*)ptr;`
`39`		`- if ((ptr = dlsym(RTLD_DEFAULT, "NSImageNamePreferencesAdvanced")) != NULL)`
	`39`	`+ if ((ptr = dlsym(RTLD_DEFAULT, "NSImageNameAdvanced")) != NULL)`
`40`	`40`	`nsImageNamePreferencesAdvanced = (NSString*)ptr;`
`41`	`41`	`}`
`42`	`42`