Pastebin launched a little side project called VERYVIRAL.com, check it out ;-) Want more features on Pastebin? Sign Up, it's FREE!
Guest

Untitled

By: a guest on Oct 4th, 2012  |  syntax: Diff  |  size: 7.46 KB  |  views: 206  |  expires: Never
download  |  raw  |  embed  |  report abuse  |  print
Text below is selected. Please press Ctrl+C to copy to your clipboard. (⌘+C on Mac)
  1. diff -r f47f5f979d9b -r 72f9d6de7aec .hgignore
  2. --- a/.hgignore Wed Apr 13 00:22:18 2011 +0300
  3. +++ b/.hgignore Thu Oct 04 02:01:39 2012 -0700
  4. @@ -3,3 +3,6 @@
  5.  glob:*.mode1
  6.  glob:*.mode1v3
  7.  glob:*.pbxuser
  8. +glob:*.xcuserdatad
  9. +glob:*.xcworkspacedata
  10. +build
  11. diff -r f47f5f979d9b -r 72f9d6de7aec Xee.xcodeproj/project.pbxproj
  12. --- a/Xee.xcodeproj/project.pbxproj     Wed Apr 13 00:22:18 2011 +0300
  13. +++ b/Xee.xcodeproj/project.pbxproj     Thu Oct 04 02:01:39 2012 -0700
  14. @@ -161,7 +161,7 @@
  15.                 1BE4C12C08E22FB500859EE2 /* pngwrite.c in Sources */ = {isa = PBXBuildFile; fileRef = 1BE4C11D08E22FB500859EE2 /* pngwrite.c */; };
  16.                 1BE4C12D08E22FB500859EE2 /* pngwtran.c in Sources */ = {isa = PBXBuildFile; fileRef = 1BE4C11E08E22FB500859EE2 /* pngwtran.c */; };
  17.                 1BE4C12E08E22FB500859EE2 /* pngwutil.c in Sources */ = {isa = PBXBuildFile; fileRef = 1BE4C11F08E22FB500859EE2 /* pngwutil.c */; };
  18. -               1BE4C13208E2303200859EE2 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 1BE4C13108E2303200859EE2 /* libz.dylib */; };
  19. +               1BE4C13208E2303200859EE2 /* libz.1.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 1BE4C13108E2303200859EE2 /* libz.1.dylib */; };
  20.                 1BE4C17008E23B6C00859EE2 /* dgif_lib.c in Sources */ = {isa = PBXBuildFile; fileRef = 1BE4C16908E23B6C00859EE2 /* dgif_lib.c */; };
  21.                 1BE4C17108E23B6C00859EE2 /* egif_lib.c in Sources */ = {isa = PBXBuildFile; fileRef = 1BE4C16A08E23B6C00859EE2 /* egif_lib.c */; };
  22.                 1BE4C17208E23B6C00859EE2 /* gif_err.c in Sources */ = {isa = PBXBuildFile; fileRef = 1BE4C16B08E23B6C00859EE2 /* gif_err.c */; };
  23. @@ -536,7 +536,7 @@
  24.                 1BE4C11D08E22FB500859EE2 /* pngwrite.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = pngwrite.c; sourceTree = "<group>"; };
  25.                 1BE4C11E08E22FB500859EE2 /* pngwtran.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = pngwtran.c; sourceTree = "<group>"; };
  26.                 1BE4C11F08E22FB500859EE2 /* pngwutil.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = pngwutil.c; sourceTree = "<group>"; };
  27. -               1BE4C13108E2303200859EE2 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = /usr/lib/libz.1.2.3.dylib; sourceTree = "<absolute>"; };
  28. +               1BE4C13108E2303200859EE2 /* libz.1.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.1.dylib; path = /usr/lib/libz.1.dylib; sourceTree = "<absolute>"; };
  29.                 1BE4C16908E23B6C00859EE2 /* dgif_lib.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = dgif_lib.c; sourceTree = "<group>"; };
  30.                 1BE4C16A08E23B6C00859EE2 /* egif_lib.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = egif_lib.c; sourceTree = "<group>"; };
  31.                 1BE4C16B08E23B6C00859EE2 /* gif_err.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = gif_err.c; sourceTree = "<group>"; };
  32. @@ -725,7 +725,7 @@
  33.                                 8D15AC340486D014006FF6A4 /* Cocoa.framework in Frameworks */,
  34.                                 1B68CEC80885F4B1001971C8 /* OpenGL.framework in Frameworks */,
  35.                                 1B68CEDA0885F5D7001971C8 /* QuickTime.framework in Frameworks */,
  36. -                               1BE4C13208E2303200859EE2 /* libz.dylib in Frameworks */,
  37. +                               1BE4C13208E2303200859EE2 /* libz.1.dylib in Frameworks */,
  38.                                 1B3D30D909351D7A00345FD0 /* Carbon.framework in Frameworks */,
  39.                                 1BFF73290B6AF5C500E0900B /* IOKit.framework in Frameworks */,
  40.                                 1BCA0AA70E9EBBC50016D207 /* libcrypto.dylib in Frameworks */,
  41. @@ -1296,7 +1296,7 @@
  42.                         children = (
  43.                                 1BECC3C41082A779000385AB /* Local frameworks */,
  44.                                 1BCA0AA60E9EBBC50016D207 /* libcrypto.dylib */,
  45. -                               1BE4C13108E2303200859EE2 /* libz.dylib */,
  46. +                               1BE4C13108E2303200859EE2 /* libz.1.dylib */,
  47.                                 1058C7A7FEA54F5311CA2CBB /* Cocoa.framework */,
  48.                                 1B3D30D809351D7A00345FD0 /* Carbon.framework */,
  49.                                 1B68CED90885F5D7001971C8 /* QuickTime.framework */,
  50. @@ -1335,6 +1335,7 @@
  51.                         isa = PBXProject;
  52.                         buildConfigurationList = 1B74977908D33EA2003CCA48 /* Build configuration list for PBXProject "Xee" */;
  53.                         compatibilityVersion = "Xcode 2.4";
  54. +                       developmentRegion = English;
  55.                         hasScannedForEncodings = 1;
  56.                         knownRegions = (
  57.                                 English,
  58. @@ -1773,7 +1774,8 @@
  59.                         isa = XCBuildConfiguration;
  60.                         buildSettings = {
  61.                                 ALWAYS_SEARCH_USER_PATHS = NO;
  62. -                               ARCHS = "$(NATIVE_ARCH)";
  63. +                               ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)";
  64. +                               ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
  65.                                 COPY_PHASE_STRIP = NO;
  66.                                 FRAMEWORK_SEARCH_PATHS = (
  67.                                         "$(inherited)",
  68. @@ -1788,7 +1790,6 @@
  69.                                 GCC_OPTIMIZATION_LEVEL = 0;
  70.                                 GCC_PRECOMPILE_PREFIX_HEADER = YES;
  71.                                 GCC_PREFIX_HEADER = Xee_Prefix.pch;
  72. -                               GCC_VERSION = 4.0;
  73.                                 GCC_WARN_ABOUT_RETURN_TYPE = YES;
  74.                                 GCC_WARN_UNUSED_VARIABLE = YES;
  75.                                 IBC_STRIP_NIBS = NO;
  76. @@ -1799,7 +1800,6 @@
  77.                                 OTHER_LDFLAGS = "";
  78.                                 PREBINDING = NO;
  79.                                 PRODUCT_NAME = Xee;
  80. -                               SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
  81.                                 WRAPPER_EXTENSION = app;
  82.                                 ZERO_LINK = NO;
  83.                         };
  84. @@ -1809,10 +1809,8 @@
  85.                         isa = XCBuildConfiguration;
  86.                         buildSettings = {
  87.                                 ALWAYS_SEARCH_USER_PATHS = NO;
  88. -                               ARCHS = (
  89. -                                       ppc,
  90. -                                       i386,
  91. -                               );
  92. +                               ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)";
  93. +                               ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
  94.                                 COPY_PHASE_STRIP = YES;
  95.                                 FRAMEWORK_SEARCH_PATHS = (
  96.                                         "$(inherited)",
  97. @@ -1825,7 +1823,6 @@
  98.                                 GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
  99.                                 GCC_PRECOMPILE_PREFIX_HEADER = YES;
  100.                                 GCC_PREFIX_HEADER = Xee_Prefix.pch;
  101. -                               GCC_VERSION = 4.0;
  102.                                 GCC_WARN_ABOUT_RETURN_TYPE = YES;
  103.                                 GCC_WARN_UNUSED_VARIABLE = YES;
  104.                                 IBC_STRIP_NIBS = NO;
  105. @@ -1835,7 +1832,6 @@
  106.                                 OTHER_LDFLAGS = "";
  107.                                 PREBINDING = NO;
  108.                                 PRODUCT_NAME = Xee;
  109. -                               SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
  110.                                 WRAPPER_EXTENSION = app;
  111.                                 ZERO_LINK = NO;
  112.                         };
  113. @@ -1845,9 +1841,8 @@
  114.                         isa = XCBuildConfiguration;
  115.                         buildSettings = {
  116.                                 FRAMEWORK_SEARCH_PATHS = "";
  117. -                               GCC_VERSION = 4.0;
  118.                                 MACOSX_DEPLOYMENT_TARGET = 10.4;
  119. -                               SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
  120. +                               SDKROOT = macosx10.7;
  121.                         };
  122.                         name = Debug;
  123.                 };
  124. @@ -1855,9 +1850,8 @@
  125.                         isa = XCBuildConfiguration;
  126.                         buildSettings = {
  127.                                 FRAMEWORK_SEARCH_PATHS = "";
  128. -                               GCC_VERSION = 4.0;
  129.                                 MACOSX_DEPLOYMENT_TARGET = 10.4;
  130. -                               SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
  131. +                               SDKROOT = macosx10.7;
  132.                         };
  133.                         name = Release;
  134.                 };
  135. diff -r f47f5f979d9b -r 72f9d6de7aec XeeControllerImageActions.m
  136. --- a/XeeControllerImageActions.m       Wed Apr 13 00:22:18 2011 +0300
  137. +++ b/XeeControllerImageActions.m       Thu Oct 04 02:01:39 2012 -0700
  138. @@ -11,6 +11,8 @@
  139.  float XeeZoomLevels[]={0.03125,0.044,0.0625,0.09,0.125,0.18,0.25,0.35,0.5,0.70,1,1.5,2,3,4,6,8,11,16,23,32};
  140.  int XeeNumberOfZoomLevels=21;
  141.  
  142. +#import <QuickTime/ImageCompression.h>
  143. +#import <QuickTime/QuickTimeComponents.h>
  144.  
  145.  
  146.  @implementation XeeController (ImageActions)
  147. @@ -32,8 +34,6 @@
  148.         }
  149.         else NSBeep();
  150.  }
  151. -#import <QuickTime/ImageCompression.h>
  152. -#import <QuickTime/QuickTimeComponents.h>
  153.  
  154.  -(void)pasteboard:(NSPasteboard *)pboard provideDataForType:(NSString *)type
  155.  {
  156. diff -r f47f5f979d9b -r 72f9d6de7aec Xee_Prefix.pch
  157. --- a/Xee_Prefix.pch    Wed Apr 13 00:22:18 2011 +0300
  158. +++ b/Xee_Prefix.pch    Thu Oct 04 02:01:39 2012 -0700
  159. @@ -19,7 +19,7 @@
  160.  -(float)magnification;
  161.  @end
  162.  
  163. -#define kEventMouseScroll 11
  164. +//#define kEventMouseScroll 11
  165.  
  166.  @interface NSEvent()
  167.  -(const void *)eventRef;