Enlightenment CVS committal
Author : sebastid
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_container.c e_container.h e_dialog.c e_manager.c e_manager.h
e_utils.c
Log Message:
Move func to right place. All lookup functions returning a Container
should be in e_container.
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_container.c,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -3 -r1.79 -r1.80
--- e_container.c 25 Aug 2005 07:42:44 -0000 1.79
+++ e_container.c 25 Aug 2005 13:41:26 -0000 1.80
@@ -240,6 +240,24 @@
return (E_Container *)l->data;
}
+E_Container *
+e_container_number_get(E_Manager *man, int num)
+{
+ Evas_List *l;
+
+ E_OBJECT_CHECK_RETURN(man, NULL);
+ E_OBJECT_TYPE_CHECK_RETURN(man, E_MANAGER_TYPE, NULL);
+ for (l = man->containers; l; l = l->next)
+ {
+ E_Container *con;
+
+ con = l->data;
+ if (con->num == num)
+ return con;
+ }
+ return NULL;
+}
+
void
e_container_move(E_Container *con, int x, int y)
{
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_container.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -3 -r1.29 -r1.30
--- e_container.h 24 Aug 2005 04:22:52 -0000 1.29
+++ e_container.h 25 Aug 2005 13:41:26 -0000 1.30
@@ -98,6 +98,7 @@
EAPI void e_container_show(E_Container *con);
EAPI void e_container_hide(E_Container *con);
EAPI E_Container *e_container_current_get(E_Manager *man);
+EAPI E_Container *e_container_number_get(E_Manager *man, int num);
EAPI void e_container_move(E_Container *con, int x, int y);
EAPI void e_container_resize(E_Container *con, int w, int h);
EAPI void e_container_move_resize(E_Container *con, int x, int y, int
w, int h);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_dialog.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_dialog.c 28 Jul 2005 04:35:44 -0000 1.1
+++ e_dialog.c 25 Aug 2005 13:41:26 -0000 1.2
@@ -36,7 +36,7 @@
man = e_manager_current_get();
if (!man) return NULL;
con = e_container_current_get(man);
- if (!con) con = e_manager_container_number_get(man, 0);
+ if (!con) con = e_container_number_get(man, 0);
if (!con) return NULL;
}
dia = E_OBJECT_ALLOC(E_Dialog, E_DIALOG_TYPE, _e_dialog_free);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_manager.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -3 -r1.37 -r1.38
--- e_manager.c 28 Jul 2005 04:35:45 -0000 1.37
+++ e_manager.c 25 Aug 2005 13:41:26 -0000 1.38
@@ -141,7 +141,7 @@
E_ATOM_CONTAINER,
&id, 1);
if (ret == 1)
- con = e_manager_container_number_get(man, id);
+ con = e_container_number_get(man, id);
if (!con)
con = e_container_current_get(man);
@@ -356,20 +356,19 @@
return managers->data;
}
-E_Container *
-e_manager_container_number_get(E_Manager *man, int num)
+E_Manager *
+e_manager_number_get(int num)
{
Evas_List *l;
-
- E_OBJECT_CHECK_RETURN(man, NULL);
- E_OBJECT_TYPE_CHECK_RETURN(man, E_MANAGER_TYPE, NULL);
- for (l = man->containers; l; l = l->next)
+ E_Manager *man;
+ int current;
+
+ if (!managers) return NULL;
+ for (l = managers, current = 0; l; l = l->next, current++)
{
- E_Container *con;
-
- con = l->data;
- if (con->num == num)
- return con;
+ man = l->data;
+ if (current == num)
+ return man;
}
return NULL;
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_manager.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- e_manager.h 28 Jul 2005 04:35:45 -0000 1.12
+++ e_manager.h 25 Aug 2005 13:41:26 -0000 1.13
@@ -38,8 +38,7 @@
EAPI void e_manager_raise(E_Manager *man);
EAPI void e_manager_lower(E_Manager *man);
EAPI E_Manager *e_manager_current_get(void);
-
-EAPI E_Container *e_manager_container_number_get(E_Manager *man, int num);
+EAPI E_Manager *e_manager_number_get(int num);
EAPI void e_managers_keys_grab(void);
EAPI void e_managers_keys_ungrab(void);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_utils.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- e_utils.c 23 Aug 2005 03:50:02 -0000 1.23
+++ e_utils.c 25 Aug 2005 13:41:26 -0000 1.24
@@ -144,7 +144,7 @@
E_Container *con;
man = l->data;
- con = e_manager_container_number_get(man, num);
+ con = e_container_number_get(man, num);
if (con) return con;
}
return NULL;
-------------------------------------------------------
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
