← Back to branch summary

~ubuntu-branches/ubuntu/utopic/sweethome3d/utopic-proposed

« back to all changes in this revision

Viewing changes to debian/patches/01noMacOSX

  • Committer: Package Import Robot
  • Author(s): Gabriele Giacone
  • Date: 2012-11-21 00:41:38 UTC
  • Revision ID: package-import@ubuntu.com-20121121004138-zr3l8v909ckvnoia
Tags: 3.7+dfsg-2
http://bugs.debian.org/695528
https://launchpad.net/bugs/996714
* Fix home path added to application folder property (Closes: #695528).
* Make video feature removal more explicit (LP: #996714).

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/01noMacOSX
4
4
 
5
5
--- a/src/com/eteks/sweethome3d/tools/OperatingSystem.java
6
6
+++ b/src/com/eteks/sweethome3d/tools/OperatingSystem.java
7
 
@@ -29,7 +29,7 @@
 
7
@@ -29,7 +29,7 @@ import java.util.Timer;
8
8
 import java.util.TimerTask;
9
9
 import java.util.UUID;
10
10
 
13
13
 import com.eteks.sweethome3d.model.Home;
14
14
 
15
15
 /**
16
 
@@ -216,9 +216,10 @@
 
16
@@ -216,9 +216,10 @@ public class OperatingSystem {
17
17
    */
18
18
   public static File getDefaultApplicationFolder() throws IOException {
19
19
     File userApplicationFolder; 
26
26
       userApplicationFolder = new File(System.getProperty("user.home"), "Application Data");
27
27
       // If user Application Data directory doesn't exist, use user home
28
28
       if (!userApplicationFolder.exists()) {
29
 
@@ -239,10 +240,10 @@
 
29
@@ -239,10 +240,10 @@ public class OperatingSystem {
30
30
    * This class requires some classes of <code>com.apple.eio</code> package  
31
31
    * to compile.
32
32
    */
41
41
 }
42
42
--- a/src/com/eteks/sweethome3d/SweetHome3D.java
43
43
+++ b/src/com/eteks/sweethome3d/SweetHome3D.java
44
 
@@ -395,7 +395,6 @@
 
44
@@ -401,7 +401,6 @@ public class SweetHome3D extends HomeApp
45
45
     }
46
46
     if (OperatingSystem.isMacOSX()) {
47
47
       // Bind to application menu at last