Commit 845031fd authored by Yavor Doganov's avatar Yavor Doganov Committed by Eric Heintzmann

Import Debian patch 1.2.10-2.1

parent 73664a3a
......@@ -30,7 +30,6 @@
#include "GormPalettesManager.h"
#include <InterfaceBuilder/IBEditors.h>
#include <InterfaceBuilder/IBPalette.h>
#include <GNUstepBase/GSCategories.h>
#include <Foundation/NSValue.h>
#include <Foundation/NSException.h>
......@@ -691,7 +690,7 @@
}
actions = [self allActionsForClassNamed: className];
while (actions == nil && (theClass = class_get_super_class(theClass)) != nil
while (actions == nil && (theClass = class_getSuperclass(theClass)) != nil
&& theClass != [NSObject class])
{
className = NSStringFromClass(theClass);
......@@ -814,7 +813,7 @@
}
outlets = [self allOutletsForClassNamed: className];
while (outlets == nil && (theClass = class_get_super_class(theClass)) != nil
while (outlets == nil && (theClass = class_getSuperclass(theClass)) != nil
&& theClass != [NSObject class])
{
className = NSStringFromClass(theClass);
......@@ -886,7 +885,7 @@
if (theClass != nil)
{
theClass = class_get_super_class(theClass);
theClass = class_getSuperclass(theClass);
if (theClass != nil && theClass != [NSObject class])
{
NSString *name;
......
......@@ -223,17 +223,13 @@ selectCellWithString: (NSString*)title
while (c != nil && c != [NSObject class])
{
struct objc_method_list *mlist = c->methods;
while (mlist != 0)
{
struct objc_method *methods = &mlist->method_list[0];
int count = mlist->method_count;
unsigned int count;
Method *methods = class_copyMethodList(c, &count);
int i;
for (i = 0; i < count; i++)
{
SEL sSel = methods[i].method_name;
SEL sSel = method_getName(methods[i]);
NSString *set = NSStringFromSelector(sSel);
/*
......@@ -246,7 +242,7 @@ selectCellWithString: (NSString*)title
&& [sets containsObject: set] == NO)
{
char tmp[[set cStringLength]+1];
const char *tInfo = methods[i].method_types;
const char *tInfo = method_getTypeEncoding(methods[i]);
NSString *type = nil;
NSString *get;
SEL gSel;
......@@ -323,8 +319,7 @@ selectCellWithString: (NSString*)title
}
}
}
mlist = mlist->method_next;
}
free(methods);
c = [c superclass];
}
[sets sortUsingSelector: @selector(compare:)];
......
gorm.app (1.2.10-2.1) unstable; urgency=low
* Non-maintainer upload.
* Fix FTBFS with gnustep-base/1.22; patch taken from upstream SVN
(Closes: #629198).
* Fix FTBFS with gcc-4.6; do not include nonexistent header (Closes:
#618205).
-- Yavor Doganov <yavor@gnu.org> Sat, 08 Oct 2011 13:33:05 +0300
gorm.app (1.2.10-2) unstable; urgency=low
* Bump standards version to 3.9.1.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment