Skip to content

Commit

Permalink
Updated OS checks
Browse files Browse the repository at this point in the history
  • Loading branch information
rmraya committed Nov 27, 2019
1 parent 9eb6689 commit aa09a39
Show file tree
Hide file tree
Showing 8 changed files with 6 additions and 6 deletions.
Binary file modified lib/conversa.jar
Binary file not shown.
Binary file removed lib/whc.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion src/com/maxprograms/conversa/Constants.java
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ private Constants() {
}

public static final String VERSION = "1.4.0";
public static final String BUILD = "20191122_1643";
public static final String BUILD = "20191127_0749";
public static final String PREFERENCES = "Conversa.pref";

}
2 changes: 1 addition & 1 deletion src/com/maxprograms/conversa/views/AboutBox.java
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public AboutBox(Shell parent, int style) {
shell = new Shell(parent, style);
if (File.separator.equals("\\")) {
shell.setImage(Conversa.getResourcemanager().getWinLogo());
} else if (System.getProperty("os.name").startsWith("Mac")) {
} else if (System.getProperty("os.name").toLowerCase().startsWith("mac")) {
shell.setImage(Conversa.getResourcemanager().getMacLogo());
} else {
shell.setImage(Conversa.getResourcemanager().getLinuxLogo());
Expand Down
2 changes: 1 addition & 1 deletion src/com/maxprograms/conversa/views/ConsoleView.java
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public ConsoleView(Shell parent, int style) {
shell.setLayout(new GridLayout());
if (File.separator.equals("\\")) {
shell.setImage(Conversa.getResourcemanager().getWinLogo());
} else if (System.getProperty("os.name").startsWith("Mac")) {
} else if (System.getProperty("os.name").toLowerCase().startsWith("mac")) {
shell.setImage(Conversa.getResourcemanager().getMacLogo());
} else {
shell.setImage(Conversa.getResourcemanager().getLinuxLogo());
Expand Down
2 changes: 1 addition & 1 deletion src/com/maxprograms/conversa/views/ConversionDialog.java
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ public ConversionDialog(Shell parent, int style) {
shell = new Shell(parent, style);
if (File.separator.equals("\\")) {
shell.setImage(Conversa.getResourcemanager().getWinLogo());
} else if (System.getProperty("os.name").startsWith("Mac")) {
} else if (System.getProperty("os.name").toLowerCase().startsWith("mac")) {
shell.setImage(Conversa.getResourcemanager().getMacLogo());
} else {
shell.setImage(Conversa.getResourcemanager().getLinuxLogo());
Expand Down
2 changes: 1 addition & 1 deletion src/com/maxprograms/conversa/views/HTMLViewer.java
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ public void handleEvent(Event event) {
e.printStackTrace();
String message = "";
if (File.separator.equals("/")) {
if (System.getProperty("os.name").startsWith("Mac")) {
if (System.getProperty("os.name").toLowerCase().startsWith("mac")) {
// Mac
message = "Error embedding browser. Check Safari's configuration.";
} else {
Expand Down
2 changes: 1 addition & 1 deletion src/com/maxprograms/conversa/views/PreferencesDialog.java
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public PreferencesDialog(Shell parent, int style) {
shell = new Shell(parent, style);
if (File.separator.equals("\\")) {
shell.setImage(Conversa.getResourcemanager().getWinLogo());
} else if (System.getProperty("os.name").startsWith("Mac")) {
} else if (System.getProperty("os.name").toLowerCase().startsWith("mac")) {
shell.setImage(Conversa.getResourcemanager().getMacLogo());
} else {
shell.setImage(Conversa.getResourcemanager().getLinuxLogo());
Expand Down

0 comments on commit aa09a39

Please sign in to comment.