diff --git a/ChangeLog b/ChangeLog
index 152105edb..349f3a14d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-27 23:10  Alexander Malmberg <alexander@malmberg.org>
+
+	* Source/GSNibTemplates.m: Replace calls to
+	GSGetInstanceMethodNotInherited with calls to GSGetMethod.
+
 2004-06-25  Gregory John Casamento <greg_casamento@yahoo.com>
 
 	* Source/GSNibCompatibility.m: Print a message when .gorm files are
@@ -71,7 +76,6 @@
 	* Source/GSDragView.m: (-_handleEventDuringDragging:) Get mouse
 	location on periodic event.
 
->>>>>>> 1.2286
 2004-06-19  Fred Kiefer <FredKiefer@gmx.de>
 
 	* Headers/Additions/GNUstepGUI/GSDisplayServer.h: Added new method
@@ -83,7 +87,6 @@
 	(-_windowAcceptingDnDunder:windowRef:) with new GSDisplayServer
 	method.	
 	
->>>>>>> 1.2283
 2004-06-17  Fred Kiefer <FredKiefer@gmx.de>
 
        * Source/NSComboBoxCell.m: buttonCellFrameFromRect(),
diff --git a/Source/GSNibTemplates.m b/Source/GSNibTemplates.m
index 0390e477e..070ed48e3 100644
--- a/Source/GSNibTemplates.m
+++ b/Source/GSNibTemplates.m
@@ -606,7 +606,7 @@ static const int currentVersion = 1; // GSNibItem version number...
 
       if(![self respondsToSelector: @selector(isInInterfaceBuilder)])
       {
-	if(GSGetInstanceMethodNotInherited([obj class], @selector(initWithContentRect:styleMask:backing:defer:)) != NULL)
+	if(GSGetMethod([obj class], @selector(initWithContentRect:styleMask:backing:defer:), NO, NO) != NULL)
 	  {
 	    // if we are not in interface builder, call 
 	    // designated initializer per spec...
@@ -648,7 +648,7 @@ static const int currentVersion = 1; // GSNibItem version number...
     {
       if(![self respondsToSelector: @selector(isInInterfaceBuilder)])
       {
-	if(GSGetInstanceMethodNotInherited([obj class],@selector(initWithFrame:)) != NULL)
+	if(GSGetMethod([obj class],@selector(initWithFrame:), NO, NO) != NULL)
 	  {
 	    NSRect theFrame = [obj frame];
 	    obj =  [obj initWithFrame: theFrame];
@@ -677,7 +677,7 @@ static const int currentVersion = 1; // GSNibItem version number...
     {
       if(![self respondsToSelector: @selector(isInInterfaceBuilder)])
       {
-	if(GSGetInstanceMethodNotInherited([obj class],@selector(initWithFrame:)) != NULL)
+	if(GSGetMethod([obj class],@selector(initWithFrame:), NO, NO) != NULL)
 	  {
 	    NSRect theFrame = [obj frame]; 
 	    obj = [obj initWithFrame: theFrame];
@@ -706,7 +706,7 @@ static const int currentVersion = 1; // GSNibItem version number...
     {
       if(![self respondsToSelector: @selector(isInInterfaceBuilder)])
       {
-	if(GSGetInstanceMethodNotInherited([obj class],@selector(initWithFrame:textContainer:)) != NULL)
+	if(GSGetMethod([obj class],@selector(initWithFrame:textContainer:), NO, NO) != NULL)
 	  {
 	    NSRect theFrame = [obj frame];
 	    id textContainer = [obj textContainer];
@@ -737,7 +737,7 @@ static const int currentVersion = 1; // GSNibItem version number...
     {
       if(![self respondsToSelector: @selector(isInInterfaceBuilder)])
       {
-	if(GSGetInstanceMethodNotInherited([obj class],@selector(initWithTitle:)) != NULL)
+	if(GSGetMethod([obj class],@selector(initWithTitle:), NO, NO) != NULL)
 	  {
 	    NSString *theTitle = [obj title]; 
 	    obj = [obj initWithTitle: theTitle];
@@ -768,7 +768,7 @@ static const int currentVersion = 1; // GSNibItem version number...
       /* 
       if(![self respondsToSelector: @selector(isInInterfaceBuilder)])
       {
-	if(GSGetInstanceMethodNotInherited([obj class],@selector(initWithFrame:)) != NULL)
+	if(GSGetMethod([obj class],@selector(initWithFrame:), NO, NO) != NULL)
 	  {
 	    NSRect theFrame = [obj frame]; 
 	    obj = [obj initWithFrame: theFrame];
@@ -797,7 +797,7 @@ static const int currentVersion = 1; // GSNibItem version number...
     {
       if(![self respondsToSelector: @selector(isInInterfaceBuilder)])
       {
-	if(GSGetInstanceMethodNotInherited([obj class],@selector(init)) != NULL)
+	if(GSGetMethod([obj class],@selector(init), NO, NO) != NULL)
 	  {
 	    obj = [self init];
 	  }