Enlightenment CVS committal
Author : sebastid
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_main.c e_manager.c e_manager.h
Log Message:
Move setting of man->num, and fix stupid e_manager_number_get()
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_main.c,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -3 -r1.121 -r1.122
--- e_main.c 22 Aug 2005 08:42:33 -0000 1.121
+++ e_main.c 25 Aug 2005 13:48:32 -0000 1.122
@@ -760,11 +760,10 @@
E_Manager *man;
E_Container *con;
- man = e_manager_new(roots[i]);
+ man = e_manager_new(roots[i], i);
e_init_show();
if (man)
{
- man->num = i;
e_manager_show(man);
}
else
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_manager.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -3 -r1.38 -r1.39
--- e_manager.c 25 Aug 2005 13:41:26 -0000 1.38
+++ e_manager.c 25 Aug 2005 13:48:32 -0000 1.39
@@ -56,7 +56,7 @@
}
E_Manager *
-e_manager_new(Ecore_X_Window root)
+e_manager_new(Ecore_X_Window root, int num)
{
E_Manager *man;
Ecore_Event_Handler *h;
@@ -66,6 +66,7 @@
if (!man) return NULL;
managers = evas_list_append(managers, man);
man->root = root;
+ man->num = num;
ecore_x_window_size_get(man->root, &(man->w), &(man->h));
if (e_config->use_virtual_roots)
{
@@ -361,13 +362,12 @@
{
Evas_List *l;
E_Manager *man;
- int current;
if (!managers) return NULL;
- for (l = managers, current = 0; l; l = l->next, current++)
+ for (l = managers; l; l = l->next)
{
man = l->data;
- if (current == num)
+ if (man->num == num)
return man;
}
return NULL;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_manager.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- e_manager.h 25 Aug 2005 13:41:26 -0000 1.13
+++ e_manager.h 25 Aug 2005 13:48:32 -0000 1.14
@@ -28,7 +28,7 @@
EAPI int e_manager_shutdown(void);
EAPI Evas_List *e_manager_list(void);
-EAPI E_Manager *e_manager_new(Ecore_X_Window root);
+EAPI E_Manager *e_manager_new(Ecore_X_Window root, int num);
EAPI void e_manager_manage_windows(E_Manager *man);
EAPI void e_manager_show(E_Manager *man);
EAPI void e_manager_hide(E_Manager *man);
-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
