From 816a6cfdd486b7040723ff2065cb567f47ac212c Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Fri, 5 Aug 2011 20:02:27 +0400 Subject: [PATCH] WM_CLASS should match .desktop file name (Gnome 3 compatibility) --- .../com/intellij/ide/actions/CreateDesktopEntryAction.java | 3 +-- platform/platform-impl/src/com/intellij/ui/AppUIUtil.java | 6 ++++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/ide/actions/CreateDesktopEntryAction.java b/platform/platform-impl/src/com/intellij/ide/actions/CreateDesktopEntryAction.java index 9e0c116f6b69..47a89fd0d6a4 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/CreateDesktopEntryAction.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/CreateDesktopEntryAction.java @@ -47,7 +47,6 @@ import java.io.InputStreamReader; public class CreateDesktopEntryAction extends AnAction { private static final Logger LOG = Logger.getInstance("#com.intellij.ide.actions.CreateDesktopEntryAction"); - private static final String VENDOR_PREFIX = "jetbrains-"; private static final int MIN_ICON_SIZE = 32; @Override @@ -144,7 +143,7 @@ public class CreateDesktopEntryAction extends AnAction { content = StringUtil.replace(content, "$ICON$", iconPath); content = StringUtil.replace(content, "$WM_CLASS$", wmClass); - final String entryName = VENDOR_PREFIX + wmClass + ".desktop"; + final String entryName = wmClass + ".desktop"; final File entryFile = new File(FileUtil.getTempDirectory(), entryName); FileUtil.writeToFile(entryFile, content); diff --git a/platform/platform-impl/src/com/intellij/ui/AppUIUtil.java b/platform/platform-impl/src/com/intellij/ui/AppUIUtil.java index 4e7496b5f2f1..0bcd2d1b00ed 100644 --- a/platform/platform-impl/src/com/intellij/ui/AppUIUtil.java +++ b/platform/platform-impl/src/com/intellij/ui/AppUIUtil.java @@ -36,6 +36,8 @@ import java.util.List; * @author yole */ public class AppUIUtil { + private static final String VENDOR_PREFIX = "jetbrains-"; + private AppUIUtil() { } public static void updateFrameIcon(final Frame frame) { @@ -83,8 +85,8 @@ public class AppUIUtil { } public static String getFrameClass() { - final String name = ApplicationNamesInfo.getInstance().getProductName(); - final String wmClass = StringUtil.replaceChar(name.toLowerCase(), ' ', '-'); + final String name = ApplicationNamesInfo.getInstance().getProductName().toLowerCase(); + final String wmClass = VENDOR_PREFIX + StringUtil.replaceChar(name, ' ', '-'); return PlatformUtils.isCommunity() ? wmClass + "-ce" : wmClass; } }