From: aredridel <aredridel@pld-linux.org>
Date: Sat, 13 Nov 2004 04:39:21 +0000 (+0000)
Subject: - updated
X-Git-Tag: auto/ac/GWorkspace-0_6_5-4~1
X-Git-Url: http://git.pld-linux.org/?p=packages%2FGWorkspace.git;a=commitdiff_plain;h=2a82e7bcfe75f0f4f6ca0a215b6403ef97f40d52

- updated

Changed files:
    GWorkspace-initWithArguments.patch -> 1.2
---

diff --git a/GWorkspace-initWithArguments.patch b/GWorkspace-initWithArguments.patch
index d812e81..9fe1057 100644
--- a/GWorkspace-initWithArguments.patch
+++ b/GWorkspace-initWithArguments.patch
@@ -1,6 +1,6 @@
 diff -ur orig-GWorkspace-0.6.5/ClipBook/main.m GWorkspace-0.6.5/ClipBook/main.m
 --- orig-GWorkspace-0.6.5/ClipBook/main.m	2003-10-28 05:46:19.000000000 -0700
-+++ GWorkspace-0.6.5/ClipBook/main.m	2004-11-09 02:44:47.754466335 -0700
++++ GWorkspace-0.6.5/ClipBook/main.m	2004-11-09 02:50:21.897824882 -0700
 @@ -33,8 +33,15 @@
  int main(int argc, char **argv, char **env)
  {
@@ -21,7 +21,7 @@ diff -ur orig-GWorkspace-0.6.5/ClipBook/main.m GWorkspace-0.6.5/ClipBook/main.m
  	
 diff -ur orig-GWorkspace-0.6.5/Desktop/main.m GWorkspace-0.6.5/Desktop/main.m
 --- orig-GWorkspace-0.6.5/Desktop/main.m	2004-05-26 06:07:30.000000000 -0600
-+++ GWorkspace-0.6.5/Desktop/main.m	2004-11-09 02:44:47.754466335 -0700
++++ GWorkspace-0.6.5/Desktop/main.m	2004-11-09 02:50:21.897824882 -0700
 @@ -32,8 +32,15 @@
  int main(int argc, char **argv, char **env)
  {
@@ -42,7 +42,7 @@ diff -ur orig-GWorkspace-0.6.5/Desktop/main.m GWorkspace-0.6.5/Desktop/main.m
  
 diff -ur orig-GWorkspace-0.6.5/Finder/main.m GWorkspace-0.6.5/Finder/main.m
 --- orig-GWorkspace-0.6.5/Finder/main.m	2004-04-13 17:23:41.000000000 -0600
-+++ GWorkspace-0.6.5/Finder/main.m	2004-11-09 02:44:47.754466335 -0700
++++ GWorkspace-0.6.5/Finder/main.m	2004-11-09 02:50:21.898824742 -0700
 @@ -35,8 +35,15 @@
  int main(int argc, char **argv, char **env)
  {
@@ -63,7 +63,7 @@ diff -ur orig-GWorkspace-0.6.5/Finder/main.m GWorkspace-0.6.5/Finder/main.m
  	createMenu();
 diff -ur orig-GWorkspace-0.6.5/GWNet/main.m GWorkspace-0.6.5/GWNet/main.m
 --- orig-GWorkspace-0.6.5/GWNet/main.m	2004-01-20 06:21:31.000000000 -0700
-+++ GWorkspace-0.6.5/GWNet/main.m	2004-11-09 02:44:47.754466335 -0700
++++ GWorkspace-0.6.5/GWNet/main.m	2004-11-09 02:50:21.898824742 -0700
 @@ -35,8 +35,15 @@
  int main(int argc, char **argv, char **env)
  {
@@ -84,7 +84,7 @@ diff -ur orig-GWorkspace-0.6.5/GWNet/main.m GWorkspace-0.6.5/GWNet/main.m
  	createMenu();
 diff -ur orig-GWorkspace-0.6.5/GWorkspace/main.m GWorkspace-0.6.5/GWorkspace/main.m
 --- orig-GWorkspace-0.6.5/GWorkspace/main.m	2004-05-17 04:42:29.000000000 -0600
-+++ GWorkspace-0.6.5/GWorkspace/main.m	2004-11-09 02:44:47.755466195 -0700
++++ GWorkspace-0.6.5/GWorkspace/main.m	2004-11-09 02:50:21.898824742 -0700
 @@ -38,8 +38,15 @@
  int main(int argc, char **argv, char **env)
  {
@@ -105,7 +105,7 @@ diff -ur orig-GWorkspace-0.6.5/GWorkspace/main.m GWorkspace-0.6.5/GWorkspace/mai
  	createMenu();
 diff -ur orig-GWorkspace-0.6.5/Inspector/main.m GWorkspace-0.6.5/Inspector/main.m
 --- orig-GWorkspace-0.6.5/Inspector/main.m	2004-02-19 18:03:49.000000000 -0700
-+++ GWorkspace-0.6.5/Inspector/main.m	2004-11-09 02:44:47.755466195 -0700
++++ GWorkspace-0.6.5/Inspector/main.m	2004-11-09 02:50:21.898824742 -0700
 @@ -35,8 +35,15 @@
  int main(int argc, char **argv, char **env)
  {
@@ -126,7 +126,7 @@ diff -ur orig-GWorkspace-0.6.5/Inspector/main.m GWorkspace-0.6.5/Inspector/main.
  	createMenu();
 diff -ur orig-GWorkspace-0.6.5/Operation/main.m GWorkspace-0.6.5/Operation/main.m
 --- orig-GWorkspace-0.6.5/Operation/main.m	2004-03-08 06:09:17.000000000 -0700
-+++ GWorkspace-0.6.5/Operation/main.m	2004-11-09 02:44:47.755466195 -0700
++++ GWorkspace-0.6.5/Operation/main.m	2004-11-09 02:50:21.899824603 -0700
 @@ -35,8 +35,15 @@
  int main(int argc, char **argv, char **env)
  {
@@ -147,8 +147,14 @@ diff -ur orig-GWorkspace-0.6.5/Operation/main.m GWorkspace-0.6.5/Operation/main.
  	createMenu();
 diff -ur orig-GWorkspace-0.6.5/Utilities/findfile/findfile.m GWorkspace-0.6.5/Utilities/findfile/findfile.m
 --- orig-GWorkspace-0.6.5/Utilities/findfile/findfile.m	2003-09-26 04:25:38.000000000 -0600
-+++ GWorkspace-0.6.5/Utilities/findfile/findfile.m	2004-11-09 02:46:37.008216133 -0700
-@@ -434,6 +434,11 @@
++++ GWorkspace-0.6.5/Utilities/findfile/findfile.m	2004-11-09 02:54:24.510959690 -0700
+@@ -429,11 +429,16 @@
+ 
+ @end
+ 
+-int main(int argc, char** argv)
++int main(int argc, char** argv, char** env)
+ {
  	FindFile *findfile;
    
    CREATE_AUTORELEASE_POOL (pool);
@@ -160,10 +166,18 @@ diff -ur orig-GWorkspace-0.6.5/Utilities/findfile/findfile.m GWorkspace-0.6.5/Ut
  	findfile = [[FindFile alloc] init];
    
    if (findfile) {
-Only in GWorkspace-0.6.5/Utilities/findfile: findfile.m~
 diff -ur orig-GWorkspace-0.6.5/Utilities/fswatcher/fswatcher.m GWorkspace-0.6.5/Utilities/fswatcher/fswatcher.m
 --- orig-GWorkspace-0.6.5/Utilities/fswatcher/fswatcher.m	2004-04-14 04:33:21.000000000 -0600
-+++ GWorkspace-0.6.5/Utilities/fswatcher/fswatcher.m	2004-11-09 02:45:58.866540145 -0700
++++ GWorkspace-0.6.5/Utilities/fswatcher/fswatcher.m	2004-11-09 02:54:08.381211163 -0700
+@@ -625,7 +625,7 @@
+ @end
+ 
+ 
+-int main(int argc, char** argv)
++int main(int argc, char** argv, char** env)
+ {
+ 	FSWatcher *fsw;
+ 
 @@ -641,6 +641,10 @@
  	  default:
  	    exit(0);
@@ -175,34 +189,31 @@ diff -ur orig-GWorkspace-0.6.5/Utilities/fswatcher/fswatcher.m GWorkspace-0.6.5/
    
    CREATE_AUTORELEASE_POOL (pool);
  	fsw = [[FSWatcher alloc] init];
-Only in GWorkspace-0.6.5/Utilities/fswatcher: fswatcher.m~
 diff -ur orig-GWorkspace-0.6.5/Utilities/thumbnailer/main.m GWorkspace-0.6.5/Utilities/thumbnailer/main.m
 --- orig-GWorkspace-0.6.5/Utilities/thumbnailer/main.m	2003-09-26 04:25:38.000000000 -0600
-+++ GWorkspace-0.6.5/Utilities/thumbnailer/main.m	2004-11-09 02:47:13.995053320 -0700
++++ GWorkspace-0.6.5/Utilities/thumbnailer/main.m	2004-11-09 02:54:42.041512685 -0700
 @@ -679,6 +679,10 @@
  	  default:
  	    exit(0);
  	}
 +
 +#ifdef GS_PASS_ARGUMENTS
-+  [NSProcessInfo initializeWithArguments: argv count: argc environment: env];
++  [NSProcessInfo initializeWithArguments: argv count: argc environment: env_c];
 +#endif
    
    pool = [NSAutoreleasePool new];
  	thumbnailer = [[Thumbnailer alloc] init];
-Only in GWorkspace-0.6.5/Utilities/thumbnailer: main.m~
 diff -ur orig-GWorkspace-0.6.5/Utilities/wopen/wopen.m GWorkspace-0.6.5/Utilities/wopen/wopen.m
 --- orig-GWorkspace-0.6.5/Utilities/wopen/wopen.m	2003-07-12 07:42:09.000000000 -0600
-+++ GWorkspace-0.6.5/Utilities/wopen/wopen.m	2004-11-09 02:47:40.528349665 -0700
++++ GWorkspace-0.6.5/Utilities/wopen/wopen.m	2004-11-09 02:54:56.042558347 -0700
 @@ -37,6 +37,10 @@
    NSString *fullPath = nil;
    BOOL isDir = NO;
    id gworkspace = nil;
 +
 +#ifdef GS_PASS_ARGUMENTS
-+  [NSProcessInfo initializeWithArguments: argv count: argc environment: env];
++  [NSProcessInfo initializeWithArguments: argv count: argc environment: env_c];
 +#endif
     
    pool = [NSAutoreleasePool new];
    fm = [NSFileManager defaultManager];
-Only in GWorkspace-0.6.5/Utilities/wopen: wopen.m~