Improve UUID translation in nodes

[pithos-macos] / pithos-macos / PithosActivityFacility.h

diff --git a/pithos-macos/PithosActivityFacility.h b/pithos-macos/PithosActivityFacility.h
index 912f246..2759709 100644 (file)
--- a/pithos-macos/PithosActivityFacility.h
+++ b/pithos-macos/PithosActivityFacility.h
@@ -2,7 +2,7 @@
 //  PithosActivityFacility.h
 //  pithos-macos
 //
-// Copyright 2011 GRNET S.A. All rights reserved.
+// Copyright 2011-2012 GRNET S.A. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or
 // without modification, are permitted provided that the following
@@ -37,6 +37,7 @@
 
 #import <Foundation/Foundation.h>
 #import "PithosActivity.h"
+@class PithosAccount;
 
 @protocol PithosActivityFacilityDelegate <NSObject>
 @required
@@ -54,21 +55,29 @@
     NSTimer *timer;
     BOOL pickedRunning;
     
-    id<PithosActivityFacilityDelegate> delegate;
+    id<PithosActivityFacilityDelegate> __unsafe_unretained delegate;
 }
 
-@property (nonatomic, assign) id delegate;
+@property (nonatomic, unsafe_unretained) id delegate;
 
 + (id)defaultPithosActivityFacility;
 
 - (void)reset;
+
 - (PithosActivity *)startActivityWithType:(PithosActivityType)type 
                                   message:(NSString *)message 
                                totalBytes:(NSUInteger)totalBytes 
-                             currentBytes:(NSUInteger)currentBytes;
+                             currentBytes:(NSUInteger)currentBytes 
+                            pithosAccount:(PithosAccount *)pithosAccount;
 - (PithosActivity *)startActivityWithType:(PithosActivityType)type 
-                                  message:(NSString *)message;
+                                  message:(NSString *)message 
+                               totalBytes:(NSUInteger)totalBytes 
+                             currentBytes:(NSUInteger)currentBytes;
+- (PithosActivity *)startActivityWithType:(PithosActivityType)type message:(NSString *)message pithosAccount:(PithosAccount *)pithosAccount;
+- (PithosActivity *)startActivityWithType:(PithosActivityType)type message:(NSString *)message;
+- (PithosActivity *)startAndEndActivityWithType:(PithosActivityType)type message:(NSString *)message pithosAccount:(PithosAccount *)pithosAccount;
 - (PithosActivity *)startAndEndActivityWithType:(PithosActivityType)type message:(NSString *)message;
+
 - (void)updateActivity:(PithosActivity *)activity 
            withMessage:(NSString *)message 
             totalBytes:(NSUInteger)totalBytes