Not Logged In
|
Login
|
Register
Home
|
News
|
Projects
|
Releases
Bugs
|
RFE
|
Repositories
|
Help
projects
/
xestiaab
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
cfd6ee4
)
Idented properly code in common/mime.cpp
author
Steve Brokenshire
<sbrokenshire@xestia.co.uk>
Fri, 11 Mar 2016 16:46:49 +0000
(16:46 +0000)
committer
Steve Brokenshire
<sbrokenshire@xestia.co.uk>
Fri, 11 Mar 2016 16:46:49 +0000
(16:46 +0000)
source/common/mime.cpp
patch
|
blob
|
history
diff --git
a/source/common/mime.cpp
b/source/common/mime.cpp
index
55bba94
..
cf571e1
100644
(file)
--- a/
source/common/mime.cpp
+++ b/
source/common/mime.cpp
@@
-20,56
+20,56
@@
wxString GetMIME(wxString FilenameInc){
wxString GetMIME(wxString FilenameInc){
- wxString MIMEResult;
+
wxString MIMEResult;
- // Check if file exists first before doing anything with it.
+
// Check if file exists first before doing anything with it.
- if (!wxFileExists(FilenameInc)){
+
if (!wxFileExists(FilenameInc)){
- // File doesn't exist so return.
+
// File doesn't exist so return.
- wxMessageBox(_("The file with the filename given doesn't exist."), _("Error opening picture/audio file"), wxICON_ERROR);
- return wxEmptyString;
+
wxMessageBox(_("The file with the filename given doesn't exist."), _("Error opening picture/audio file"), wxICON_ERROR);
+
return wxEmptyString;
- }
+
}
#if defined(__WIN32__)
#if defined(__WIN32__)
- // TODO: Sort out Win32.
+
// TODO: Sort out Win32.
#else
#include <stdio.h>
#else
#include <stdio.h>
- FILE *MIMEIn;
+
FILE *MIMEIn;
- char MIMEData[512];
+
char MIMEData[512];
- // Build Command Line.
+
// Build Command Line.
- wxString FilenameIncEscaped = FilenameInc;
- FilenameIncEscaped.Replace(wxT(" "), wxT("\\ "));
- wxString FileCommandLine;
+
wxString FilenameIncEscaped = FilenameInc;
+
FilenameIncEscaped.Replace(wxT(" "), wxT("\\ "));
+
wxString FileCommandLine;
- FileCommandLine.Append("file -b --mime-type ");
- FileCommandLine.Append(FilenameIncEscaped);
+
FileCommandLine.Append("file -b --mime-type ");
+
FileCommandLine.Append(FilenameIncEscaped);
- if (!(MIMEIn = popen(FileCommandLine.mb_str(), "r"))){
+
if (!(MIMEIn = popen(FileCommandLine.mb_str(), "r"))){
- wxMessageBox(_("The file with the filename given doesn't exist."), _("Error opening picture/audio file"), wxICON_ERROR);
- return wxEmptyString;
+
wxMessageBox(_("The file with the filename given doesn't exist."), _("Error opening picture/audio file"), wxICON_ERROR);
+
return wxEmptyString;
- }
+
}
- while(fgets(MIMEData, sizeof(MIMEData), MIMEIn) != NULL){
- MIMEResult.Append(wxString::FromUTF8(MIMEData));
- }
- pclose(MIMEIn);
+
while(fgets(MIMEData, sizeof(MIMEData), MIMEIn) != NULL){
+
MIMEResult.Append(wxString::FromUTF8(MIMEData));
+
}
+
pclose(MIMEIn);
- MIMEResult.Trim();
+
MIMEResult.Trim();
#endif
#endif
- return MIMEResult;
+
return MIMEResult;
}
\ No newline at end of file
}
\ No newline at end of file
Yn Maystri
© 2006 - 2019 Xestia Software Development
Software
Xestia Address Book
Xestia Calendar
Development
Xestia Gelforn
Everything else
About
News
Privacy Policy