← Back to branch summary

~ubuntu-branches/ubuntu/trusty/gnustep-base/trusty-proposed

« back to all changes in this revision

Viewing changes to Source/NSNetServices.m

  • Committer: Package Import Robot
  • Author(s): Yavor Doganov
  • Date: 2011-09-15 12:31:15 UTC
  • mfrom: (1.2.11 upstream) (8.1.4 experimental)
  • Revision ID: package-import@ubuntu.com-20110915123115-rmvsia9z0211izvq
Tags: 1.22.1-1
http://bugs.debian.org/629216
* New upstream release:
  + Fixes implicit declaration of function (Closes: #629216).
* debian/rules (v_make): Set to 2.6.1.
  (install-common): Do not delete non-existent .swp file.
* debian/control.m4 (Build-Depends): Remove gobjc; gnustep-make now
  depends on it.
  (libgnustep-base-dev) <Depends>: Likewise.
  (Suggests): Remove; completely pointless.
* debian/control: Regenerate.
* debian/patches/avoid-nsl-linkage.patch: Refresh.
* debian/patches/autoreconf.patch: Regenerate.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Source/NSNetServices.m
45
45
 */
46
46
NSString * const NSNetServicesErrorDomain = @"NSNetServicesErrorDomain";
47
47
 
 
48
static Class abstractServiceClass;
48
49
static Class concreteServiceClass;
 
50
static Class abstractBrowserClass;
49
51
static Class concreteBrowserClass;
50
52
 
51
53
@implementation NSNetService
53
55
{
54
56
  if (self == [NSNetService class])
55
57
    {
 
58
      abstractServiceClass = self;
56
59
#     if GS_USE_AVAHI==1 
57
60
        concreteServiceClass = [GSAvahiNetService class];
58
61
#     else
63
66
 
64
67
+ (id) allocWithZone: (NSZone*)zone
65
68
{
66
 
  // Note: Assignging the subclass to self will make NSObject allocate the
67
 
  // correct class layout.
68
 
  self = concreteServiceClass;
 
69
  if (self == abstractServiceClass)
 
70
    {
 
71
      return [concreteServiceClass allocWithZone: zone];
 
72
    }
69
73
  return [super allocWithZone: zone];
70
74
}
71
75
 
155
159
}
156
160
 
157
161
 
158
 
- (id) delegate
 
162
- (id<NSNetServiceDelegate>) delegate
159
163
{
160
164
  return _delegate;
161
165
}
162
166
 
163
 
- (void) setDelegate: (id) delegate
 
167
- (void) setDelegate: (id<NSNetServiceDelegate>) delegate
164
168
{
165
169
  _delegate = delegate;
166
170
}
386
390
{
387
391
  if (self == [NSNetServiceBrowser class])
388
392
    {
 
393
      abstractBrowserClass = self;
389
394
#     if GS_USE_AVAHI==1 
390
395
        concreteBrowserClass = [GSAvahiNetServiceBrowser class];
391
396
#     else // Not Avahi (=GS_USE_MDNS)
396
401
 
397
402
+ (id) allocWithZone: (NSZone*)zone
398
403
{
399
 
  // Note: Assignging the subclass to self will make NSObject allocate the
400
 
  // correct class layout.
401
 
  self = concreteBrowserClass;
 
404
  if (self == abstractBrowserClass)
 
405
    {
 
406
      return [concreteBrowserClass allocWithZone: zone];
 
407
    }
402
408
  return [super allocWithZone: zone];
403
409
}
404
410
- (id) init
449
455
}
450
456
 
451
457
 
452
 
- (id) delegate
 
458
- (id<NSNetServiceBrowserDelegate>) delegate
453
459
{
454
460
  return _delegate;
455
461
}
456
462
 
457
 
- (void) setDelegate: (id) delegate
 
463
- (void) setDelegate: (id<NSNetServiceBrowserDelegate>) delegate
458
464
{
459
465
  _delegate = delegate;
460
466
}