diff --git a/Grafx2.xcodeproj/xx.pbxuser b/Grafx2.xcodeproj/xx.pbxuser
index ac8a7053..0452f338 100644
--- a/Grafx2.xcodeproj/xx.pbxuser
+++ b/Grafx2.xcodeproj/xx.pbxuser
@@ -165,8 +165,8 @@
PBXFileDataSource_Warnings_ColumnID,
);
};
- PBXPerProjectTemplateStateSaveDate = 258909867;
- PBXWorkspaceStateSaveDate = 258909867;
+ PBXPerProjectTemplateStateSaveDate = 259247013;
+ PBXWorkspaceStateSaveDate = 259247013;
};
sourceControlManager = F5B19B690EA4BD79003F4BA4 /* Source Control */;
userBuildSettings = {
diff --git a/Grafx2.xcodeproj/xx.perspective b/Grafx2.xcodeproj/xx.perspective
index 8aca1e3d..1efbc4d9 100644
--- a/Grafx2.xcodeproj/xx.perspective
+++ b/Grafx2.xcodeproj/xx.perspective
@@ -494,7 +494,7 @@
418
RubberWindowFrame
- 146 -297 1487 657 0 0 1024 746
+ -504 88 1487 657 0 0 1024 746
Module
PBXSmartGroupTreeModule
@@ -533,7 +533,7 @@
Frame
{{0, 0}, {1047, 0}}
RubberWindowFrame
- 146 -297 1487 657 0 0 1024 746
+ -504 88 1487 657 0 0 1024 746
Module
PBXNavigatorGroup
@@ -551,7 +551,7 @@
ContentConfiguration
PBXBuildLogShowsTranscriptDefaultKey
- {{0, 107}, {1047, 477}}
+ {{0, 15}, {1047, 569}}
PBXProjectModuleGUID
XCMainBuildResultsModuleGUID
PBXProjectModuleLabel
@@ -566,7 +566,7 @@
Frame
{{10, 27}, {1047, 584}}
RubberWindowFrame
- 146 -297 1487 657 0 0 1024 746
+ -504 88 1487 657 0 0 1024 746
Module
PBXBuildResultsModule
@@ -646,14 +646,14 @@
TableOfContents
- F5CDCE430F6EB68600B31F63
+ F5B724900F73CBB1004960D2
1CA23EE50692099D00951B8B
- F5CDCE440F6EB68600B31F63
+ F5B724910F73CBB1004960D2
F5A33EC20EC89C3000F8052D
- F5CDCE450F6EB68600B31F63
+ F5B724920F73CBB1004960D2
XCMainBuildResultsModuleGUID
1CA23EE80692099D00951B8B
- F5CDCE460F6EB68600B31F63
+ F5B724930F73CBB1004960D2
ToolbarConfiguration
xcode.toolbar.config.buildAndRun
@@ -827,7 +827,7 @@
/Users/xx/Grafx2/Grafx2.xcodeproj
WindowString
- 146 -297 1487 657 0 0 1024 746
+ -504 88 1487 657 0 0 1024 746
WindowTools
diff --git a/main.c b/main.c
index 50724e8c..0d1a6239 100644
--- a/main.c
+++ b/main.c
@@ -377,9 +377,6 @@ int Initialisation_du_programme(int argc,char * argv[])
Brouillon_Loupe_Decalage_X=0;
Brouillon_Loupe_Decalage_Y=0;
- SDL_putenv("SDL_VIDEO_WINDOW_POS=center");
- SDL_putenv("SDL_VIDEO_CENTERED=1");
-
// SDL
if(SDL_Init(SDL_INIT_TIMER|SDL_INIT_VIDEO|SDL_INIT_JOYSTICK) < 0)
{
diff --git a/mountlist.c b/mountlist.c
index baa431f1..c936ed3f 100644
--- a/mountlist.c
+++ b/mountlist.c
@@ -20,7 +20,7 @@
#if(!defined(__WIN32__))&&(!defined(__amigaos4__))&&(!defined(__AROS__))&&(!defined(__MORPHOS__))
// We don't use autoconf and all that in grafx2, so let's do the config here ...
-#if defined(__macosx__)||defined(__FreeBSD__) // MacOS X is POSIX compliant
+#if defined(__macosx__) || defined(__FreeBSD__) // MacOS X is POSIX compliant
#define MOUNTED_GETMNTINFO
#elif defined(__BEOS__) || defined(__HAIKU__)
#define MOUNTED_FS_STAT_DEV
@@ -191,7 +191,7 @@
|| strcmp (Fs_type, "cifs") == 0)))
#endif
-#if MOUNTED_GETMNTINFO
+#ifdef MOUNTED_GETMNTINFO
# if ! HAVE_STRUCT_STATFS_F_FSTYPENAME
static char *
@@ -439,7 +439,11 @@ read_file_system_list (bool need_fs_type)
me = malloc (sizeof *me);
me->me_devname = strdup (fsp->f_mntfromname);
me->me_mountdir = strdup (fsp->f_mntonname);
+#if defined(__macosx__)
+ me->me_type = fsp->f_fstypename;
+#else
me->me_type = fsp->fs_typename;
+#endif
me->me_type_malloced = 0;
me->me_dummy = ME_DUMMY (me->me_devname, me->me_type);
me->me_remote = ME_REMOTE (me->me_devname, me->me_type);