diff options
| author | Christophe Cornu <ccornu> | 2004-03-02 23:01:23 +0000 |
|---|---|---|
| committer | Christophe Cornu <ccornu> | 2004-03-02 23:01:23 +0000 |
| commit | eedae6220cf1c851bcccedcfff33e38bfce51fa4 (patch) | |
| tree | 9a9d5a73a4f7b00512df6933668257f5029c2099 /bundles/org.eclipse.swt/Eclipse SWT Program/motif/org/eclipse/swt/program/Program.java | |
| parent | dd7a4ef251453dc2eb3a210e467eec1edf642a27 (diff) | |
| download | eclipse.platform.swt-eedae6220cf1c851bcccedcfff33e38bfce51fa4.tar.gz eclipse.platform.swt-eedae6220cf1c851bcccedcfff33e38bfce51fa4.tar.xz eclipse.platform.swt-eedae6220cf1c851bcccedcfff33e38bfce51fa4.zip | |
53549
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT Program/motif/org/eclipse/swt/program/Program.java')
| -rwxr-xr-x | bundles/org.eclipse.swt/Eclipse SWT Program/motif/org/eclipse/swt/program/Program.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Program/motif/org/eclipse/swt/program/Program.java b/bundles/org.eclipse.swt/Eclipse SWT Program/motif/org/eclipse/swt/program/Program.java index a331834572..f4a758dcaa 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT Program/motif/org/eclipse/swt/program/Program.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Program/motif/org/eclipse/swt/program/Program.java @@ -253,7 +253,7 @@ static int getDesktop(Display display) { Integer desktopValue = (Integer)display.getData(DESKTOP_DATA); if (desktopValue != null) return desktopValue.intValue(); int desktop = DESKTOP_UNKNOWN; - if (isGnomeDesktop(display)) { + if (isGnomeDesktop(display) && gnome_init()) { desktop = DESKTOP_GNOME; display.setData(DESKTOP_DATA, new Integer(desktop)); return desktop; @@ -483,7 +483,6 @@ static Program gnome_getProgram(Display display, String mimeType) { static boolean gnome_init() { try { - Library.loadLibrary("swt-gnome"); return GNOME.gnome_vfs_init(); } catch (Throwable e) { return false; @@ -494,7 +493,7 @@ static boolean isGnomeDesktop(Display display) { int xDisplay = display.xDisplay; byte[] name = Converter.wcsToMbcs(null, "_WIN_SUPPORTING_WM_CHECK", true); int atom_set = OS.XInternAtom(xDisplay, name, true); - return atom_set != OS.None ? gnome_init() : false; + return atom_set != OS.None; } static String kde_convertQStringAndFree(int qString) { |