From: <enl...@li...> - 2005-06-03 19:46:47
|
Enlightenment CVS committal Author : sebastid Project : e17 Module : libs/ecore Dir : e17/libs/ecore/src/lib/ecore_x Modified Files: Ecore_X.h ecore_x_netwm.c Log Message: Stupid me. =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_x/Ecore_X.h,v retrieving revision 1.128 retrieving revision 1.129 diff -u -3 -r1.128 -r1.129 --- Ecore_X.h 3 Jun 2005 19:00:01 -0000 1.128 +++ Ecore_X.h 3 Jun 2005 19:46:40 -0000 1.129 @@ -845,7 +845,8 @@ ECORE_X_WINDOW_TYPE_UTILITY, ECORE_X_WINDOW_TYPE_SPLASH, ECORE_X_WINDOW_TYPE_DIALOG, - ECORE_X_WINDOW_TYPE_NORMAL + ECORE_X_WINDOW_TYPE_NORMAL, + ECORE_X_WINDOW_TYPE_UNKNOWN } Ecore_X_Window_Type; typedef enum _Ecore_X_Action { =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_x/ecore_x_netwm.c,v retrieving revision 1.26 retrieving revision 1.27 diff -u -3 -r1.26 -r1.27 --- ecore_x_netwm.c 3 Jun 2005 19:26:41 -0000 1.26 +++ ecore_x_netwm.c 3 Jun 2005 19:46:40 -0000 1.27 @@ -1103,7 +1103,7 @@ return ECORE_X_WINDOW_TYPE_NORMAL; */ else - return 0; + return ECORE_X_WINDOW_TYPE_UNKNOWN; } static Ecore_X_Atom @@ -1165,22 +1165,11 @@ atoms = (Ecore_X_Atom *) data; - /* - * FIXME: Why does nautilus and gkrellm report NORMAL as the - * first atom, and not the last? - for (i = 0; i < num; ++i) - { - char *s; - s = XGetAtomName(_ecore_x_disp, atoms[i]); - printf("window type: %s\n", s); - XFree(s); - } - */ ret = ECORE_X_WINDOW_TYPE_NORMAL; for (i = 0; i < num; ++i) { type = _ecore_x_netwm_window_type_type_get(atoms[i]); - if (type) + if (type != ECORE_X_WINDOW_TYPE_UNKNOWN) { ret = type; break; |