Akatsuki-Misaki/dde-dock
1
0
Fork 0
mirror of https://github.com/linuxdeepin/dde-dock.git synced 2025-06-04 17:33:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

dock:: fix desktop action won't work for new style desktop.

Browse Source 
g_desktop_app_info_launch_action won't work for new style desktop, even
if the desktop environment is gnome-shell.

Change-Id: I2a1621b6ea299cc977e1ee7dcef425df5f859468
This commit is contained in:
liliqiang 2015-06-04 10:35:29 +08:00
parent 01506bb727
commit 364286950f
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
dock/desktop.go
View File

@ -78,7 +78,10 @@ func (dai *DesktopAppInfo) ListActions() []string {
return actions
}
func getGroupName(actionGropuName string) string {
func getGroupName(gioSupported bool, actionGropuName string) string {
if gioSupported {
return "Desktop Action " + actionGropuName
}
return actionGropuName + " Shortcut Group"
}
@ -92,30 +95,31 @@ func (dai *DesktopAppInfo) GetActionName(actionGroup string) string {
langs := GetLanguageNames()
str := ""
for _, lang := range langs {
str, _ = dai.KeyFile.GetLocaleString(getGroupName(actionGroup), "Name", lang)
str, _ = dai.KeyFile.GetLocaleString(getGroupName(dai.gioSupported, actionGroup), "Name", lang)
if str != "" {
return str
}
}
if str == "" {
str, _ = dai.KeyFile.GetString(getGroupName(actionGroup), "Name")
str, _ = dai.KeyFile.GetString(getGroupName(dai.gioSupported, actionGroup), "Name")
}
return str
}
func (dai *DesktopAppInfo) LaunchAction(actionGroup string, ctx gio.AppLaunchContextLike) {
logger.Debug(dai.GetFilename())
if dai.gioSupported {
logger.Debug("[LaunchAction]", dai.GetFilename(), "gio support")
dai.DesktopAppInfo.LaunchAction(actionGroup, ctx)
return
}
logger.Info(dai.GetFilename())
// LaunchAction won't work for new style desktop, fuck gio.
// if dai.gioSupported {
// logger.Info("[LaunchAction]", dai.GetFilename(), "gio support")
// dai.DesktopAppInfo.LaunchAction(actionGroup, ctx)
// return
// }
logger.Debug("LaunchAction")
exec, _ := dai.KeyFile.GetString(getGroupName(actionGroup), glib.KeyFileDesktopKeyExec)
logger.Debug("exec:", exec)
logger.Info("LaunchAction")
exec, _ := dai.KeyFile.GetString(getGroupName(dai.gioSupported, actionGroup), glib.KeyFileDesktopKeyExec)
logger.Infof("exec: %q", exec)
a, err := gio.AppInfoCreateFromCommandline(
exec,
"",