Fix GModel loading that was broken since the last restructuring of the

NIB loading code.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@31204 72102866-910b-0410-8b05-ffd578937521

ChangeLog

@@ -1,3 +1,8 @@
+2010-08-29 Fred Kiefer <FredKiefer@gmx.de>
+
+	* Source/GSGModelLoader.m: Add hack to get GModel loading working again.
+	* Source/GSGormLoader.m: Remove an astray semicolon.
+
 2010-08-27  Wolfgang Lux  <wolfgang.lux@gmail.com>
 
 	* Source/NSOutlineView.m (-collapseItem:collapseChildren:,

Source/GSGModelLoader.m

@@ -1,6 +1,6 @@
-/** <title>GSGormLoader</title>
+/** <title>GSGModelLoader</title>
 
-   <abstract>Gorm model loader</abstract>
+   <abstract>GModel loader</abstract>
 
    Copyright (C) 1997, 1999 Free Software Foundation, Inc.
 
@@ -91,6 +91,22 @@ Class gmodel_class(void)
   return 2.0;
 }
 
+- (NSData *) dataForFile: (NSString *)fileName
+{
+  // Horrible hack
+  return (NSData*)fileName;
+}
+
+- (BOOL) loadModelData: (NSData *)data
+     externalNameTable: (NSDictionary *)context
+              withZone: (NSZone *)zone
+{
+  // Horrible hack
+  return [self loadModelFile: (NSString *)data
+           externalNameTable: context
+                    withZone: zone];
+}
+
 - (BOOL) loadModelFile: (NSString *)fileName
      externalNameTable: (NSDictionary *)context
               withZone: (NSZone *)zone;

Source/GSGormLoader.m

@@ -61,7 +61,7 @@
 
 - (BOOL) loadModelData: (NSData *)data
      externalNameTable: (NSDictionary *)context
-              withZone: (NSZone *)zone;
+              withZone: (NSZone *)zone
 {
   BOOL		loaded = NO;
   NSUnarchiver *unarchiver = nil;