resi
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

formatting 

SVN revision: 78421
This commit is contained in:
Mike Blumenkrantz 2012-10-25 07:47:26 +00:00
parent ebef167dab
commit 10903ffc60
2 changed files with 163 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/bin/e_init.c
View File

@ -148,7 +148,7 @@ e_init_client_data(Ecore_Ipc_Event_Client_Data *e)
num = e->size / sizeof(Ecore_X_Window);
initwins = e->data;
for (i = 0; i < num; i+= 2)
for (i = 0; i < num; i += 2)
{
Eina_List *l;
E_Manager *man;
@ -220,3 +220,4 @@ _e_init_cb_exe_event_del(void *data __UNUSED__, int type __UNUSED__, void *event
}
return ECORE_CALLBACK_RENEW;
}

30
src/bin/e_init_main.c
View File

@ -106,10 +106,14 @@ main(int argc, char **argv)
);
exit(0);
}
else if (!theme) theme = argv[i];
else if (font_hinting < 0) font_hinting = atoi(argv[i]);
else if (!title) title = argv[i];
else if (!verstr) verstr = argv[i];
else if (!theme)
theme = argv[i];
else if (font_hinting < 0)
font_hinting = atoi(argv[i]);
else if (!title)
title = argv[i];
else if (!verstr)
verstr = argv[i];
else fpath = eina_list_append(fpath, argv[i]);
}
@ -186,8 +190,8 @@ _e_ipc_cb_server_add(void *data __UNUSED__, int type __UNUSED__, void *event)
e = event;
server = e->server;
ecore_ipc_server_send(server,
7/*E_IPC_DOMAIN_INIT*/,
1/*hello*/,
7 /*E_IPC_DOMAIN_INIT*/,
1 /*hello*/,
0, 0, 0,
initwins, initwins_num * sizeof(Ecore_X_Window));
ecore_ipc_server_flush(server);
@ -208,16 +212,18 @@ _e_ipc_cb_server_data(void *data __UNUSED__, int type __UNUSED__, void *event)
Ecore_Ipc_Event_Server_Data *e;
e = event;
if (e->major != 7/*E_IPC_DOMAIN_INIT*/) return ECORE_CALLBACK_PASS_ON;
if (e->major != 7 /*E_IPC_DOMAIN_INIT*/) return ECORE_CALLBACK_PASS_ON;
switch (e->minor)
{
case 1:
if (e->data) e_init_status_set(e->data);
break;
case 2:
/* quit now */
e_init_done();
break;
default:
break;
}
@ -395,14 +401,13 @@ e_init_done(void)
_e_init_timeout_timer = ecore_timer_add(60.0, _e_init_cb_timeout, NULL);
}
static void
_e_init_cb_signal_disable(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
{
if (!server) return;
ecore_ipc_server_send(server,
7/*E_IPC_DOMAIN_INIT*/,
2/*set splash*/,
7 /*E_IPC_DOMAIN_INIT*/,
2 /*set splash*/,
0, 0, 0,
NULL, 0);
ecore_ipc_server_flush(server);
@ -413,8 +418,8 @@ _e_init_cb_signal_enable(void *data __UNUSED__, Evas_Object *obj __UNUSED__, con
{
if (!server) return;
ecore_ipc_server_send(server,
7/*E_IPC_DOMAIN_INIT*/,
2/*set splash*/,
7 /*E_IPC_DOMAIN_INIT*/,
2 /*set splash*/,
1, 0, 0,
NULL, 0);
ecore_ipc_server_flush(server);
@ -503,3 +508,4 @@ _e_init_evas_new(Ecore_X_Window root, int w, int h, Ecore_X_Window *winret)
return ee;
}