Enlightenment CVS committal
Author : sebastid
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_apps.c e_border.c e_border.h e_entry.c e_hints.c e_zone.c
Log Message:
Call the netwm property by it's right name.
Let the startup id be unique (almost).
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_apps.c,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -3 -r1.87 -r1.88
--- e_apps.c 28 Sep 2005 23:14:42 -0000 1.87
+++ e_apps.c 29 Sep 2005 15:01:04 -0000 1.88
@@ -1519,7 +1519,6 @@
_e_apps_cb_exit(void *data, int type, void *event)
{
Ecore_Event_Exe_Exit *ev;
- Evas_List *l;
E_App_Instance *ai;
E_App *a;
@@ -1557,14 +1556,14 @@
E_App_Instance *inst;
ev = event;
- if (ev->border->client.netwm.e_start_launch_id <= 0) return 1;
+ if (ev->border->client.netwm.startup_id <= 0) return 1;
for (l = _e_apps_start_pending; l; l = l->next)
{
a = l->data;
for (ll = a->instances; ll; ll = ll->next)
{
inst = ll->data;
- if (inst->launch_id == ev->border->client.netwm.e_start_launch_id)
+ if (inst->launch_id == ev->border->client.netwm.startup_id)
{
if (inst->expire_timer)
{
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.437
retrieving revision 1.438
diff -u -3 -r1.437 -r1.438
--- e_border.c 29 Sep 2005 12:48:32 -0000 1.437
+++ e_border.c 29 Sep 2005 15:01:04 -0000 1.438
@@ -2103,7 +2103,7 @@
}
if (!a)
{
- a = e_app_launch_id_pid_find(bd->client.netwm.e_start_launch_id,
+ a = e_app_launch_id_pid_find(bd->client.netwm.startup_id,
bd->client.netwm.pid);
}
if (a)
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_border.h,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -3 -r1.118 -r1.119
--- e_border.h 28 Sep 2005 17:36:35 -0000 1.118
+++ e_border.h 29 Sep 2005 15:01:04 -0000 1.119
@@ -238,9 +238,8 @@
} state;
Ecore_X_Window_Type type;
-
- int e_start_launch_id;
-
+ int startup_id;
+
struct {
unsigned char name : 1;
unsigned char icon_name : 1;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_entry.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e_entry.c 25 Sep 2005 21:33:48 -0000 1.3
+++ e_entry.c 29 Sep 2005 15:01:04 -0000 1.4
@@ -69,8 +69,6 @@
Evas_Object *e_entry_add (Evas *evas)
{
- Evas_Object *o;
-
if (!e_entry_smart)
{
e_entry_smart = evas_smart_new("e_entry",
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_hints.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -3 -r1.73 -r1.74
--- e_hints.c 21 Sep 2005 04:53:12 -0000 1.73
+++ e_hints.c 29 Sep 2005 15:01:04 -0000 1.74
@@ -403,12 +403,13 @@
((bd->client.icccm.client_leader > 0) &&
ecore_x_netwm_startup_id_get(bd->client.icccm.client_leader, &str) && (str))
)
{
+ printf("launch_id: %s %s\n", e_border_name_get(bd), str);
if (!strncmp(str, "E_START|", 8))
{
int id;
id = atoi(str + 8);
- if (id > 0) bd->client.netwm.e_start_launch_id = id;
+ if (id > 0) bd->client.netwm.startup_id = id;
}
free(str);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_zone.c,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -3 -r1.75 -r1.76
--- e_zone.c 22 Sep 2005 20:20:34 -0000 1.75
+++ e_zone.c 29 Sep 2005 15:01:04 -0000 1.76
@@ -527,7 +527,8 @@
int
e_zone_app_exec(E_Zone *zone, E_App *a)
{
- static int launch_id = 1;
+ static int startup_id = 1;
+ int ret;
char *p1, *p2;
char *penv_display;
char *penv_ld_preload;
@@ -574,19 +575,17 @@
e_util_env_set("E_CONTAINER", buf);
snprintf(buf, sizeof(buf), "%i", zone->container->manager->num);
e_util_env_set("E_MANAGER", buf);
- snprintf(buf, sizeof(buf), "%i", launch_id);
+ snprintf(buf, sizeof(buf), "%i", startup_id);
e_util_env_set("E_LAUNCH_ID", buf);
snprintf(buf, sizeof(buf), "%s/enlightenment/preload", e_prefix_lib_get());
e_util_env_set("LD_PRELOAD_PATH", buf);
snprintf(buf, sizeof(buf), "%s/enlightenment/preload/e_hack.so",
e_prefix_lib_get());
*/
- snprintf(buf, sizeof(buf), "E_START|%i", launch_id);
+ snprintf(buf, sizeof(buf), "E_START|%i", startup_id++);
e_util_env_set("DESKTOP_STARTUP_ID", buf);
- if (launch_id == 0) launch_id = 1;
/* execute */
- if (!e_app_exec(a, launch_id)) launch_id = 0;
- launch_id++;
-
+ ret = e_app_exec(a, startup_id);
+
/* reset env vars */
if (penv_display)
{
@@ -605,7 +604,7 @@
free(penv_ld_preload_path);
}
*/
- return launch_id;
+ return ret;
}
/* local subsystem functions */
-------------------------------------------------------
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
