From e0230375c8740e82dbde65630d8de245359b892c Mon Sep 17 00:00:00 2001 From: David Walter Seikel Date: Wed, 13 Sep 2006 13:51:39 +0000 Subject: [PATCH] Add the rest of the info from .eaps. SVN revision: 25815 --- .../src/lib/ecore_desktop/Ecore_Desktop.h | 6 +++++- .../src/lib/ecore_desktop/ecore_desktop.c | 18 ++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/legacy/ecore/src/lib/ecore_desktop/Ecore_Desktop.h b/legacy/ecore/src/lib/ecore_desktop/Ecore_Desktop.h index 6bdaf5ff82..07c8540ec5 100644 --- a/legacy/ecore/src/lib/ecore_desktop/Ecore_Desktop.h +++ b/legacy/ecore/src/lib/ecore_desktop/Ecore_Desktop.h @@ -54,7 +54,11 @@ struct _Ecore_Desktop char *URL; char *file; char *deletiondate; - char *window_class; + char *window_class; /* window class */ + char *window_name; /* window name */ + char *window_title; /* window title */ + char *window_role; /* window role */ + unsigned char wait_exit : 1; /* wait for app to exit before execing next */ unsigned char startup : 1; unsigned char hidden : 1; unsigned char no_display : 1; diff --git a/legacy/ecore/src/lib/ecore_desktop/ecore_desktop.c b/legacy/ecore/src/lib/ecore_desktop/ecore_desktop.c index 0ddf6e88d3..9b2869a5f9 100644 --- a/legacy/ecore/src/lib/ecore_desktop/ecore_desktop.c +++ b/legacy/ecore/src/lib/ecore_desktop/ecore_desktop.c @@ -289,6 +289,12 @@ ecore_desktop_get(const char *file, const char *lang) free(tmp); } } + result->window_name = + (char *)ecore_hash_get(result->group, "X-Enlightenment-WindowName"); + result->window_title = + (char *)ecore_hash_get(result->group, "X-Enlightenment-WindowTitle"); + result->window_role = + (char *)ecore_hash_get(result->group, "X-Enlightenment-WindowRole"); result->icon = @@ -358,6 +364,11 @@ ecore_desktop_get(const char *file, const char *lang) "StartupNotify"); if (value) result->startup = (strcmp(value, "true") == 0); + value = + (char *)ecore_hash_get(result->group, + "X-Enlightenment-WaitExit"); + if (value) + result->wait_exit = (strcmp(value, "true") == 0); value = (char *)ecore_hash_get(result->group, "NoDisplay"); @@ -526,7 +537,14 @@ ecore_desktop_save(Ecore_Desktop * desktop) if (desktop->icon_path) ecore_hash_set(desktop->group, strdup("X-Enlightenment-IconPath"), strdup(desktop->icon_path)); if (desktop->window_class) ecore_hash_set(desktop->group, strdup("StartupWMClass"), strdup(desktop->window_class)); if (desktop->categories) ecore_hash_set(desktop->group, strdup("Categories"), strdup(desktop->categories)); + if (desktop->window_name) ecore_hash_set(desktop->group, strdup("X-Enlightenment-WindowName"), strdup(desktop->window_name)); + if (desktop->window_title) ecore_hash_set(desktop->group, strdup("X-Enlightenment-WindowTitle"), strdup(desktop->window_title)); + if (desktop->window_role) ecore_hash_set(desktop->group, strdup("X-Enlightenment-WindowRole"), strdup(desktop->window_role)); ecore_hash_remove(desktop->group, "X-KDE-StartupNotify"); + if (desktop->wait_exit) + ecore_hash_set(desktop->group, strdup("X-Enlightenment-WaitExit"), strdup("true")); + else + ecore_hash_remove(desktop->group, "X-Enlightenment-WaitExit"); if (desktop->startup) ecore_hash_set(desktop->group, strdup("StartupNotify"), strdup("true")); else