Enlightenment CVS committal
Author : sebastid
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_border.c e_hints.c
Log Message:
ecore update.
netwm update.
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.227
retrieving revision 1.228
diff -u -3 -r1.227 -r1.228
--- e_border.c 28 May 2005 05:03:25 -0000 1.227
+++ e_border.c 28 May 2005 12:50:22 -0000 1.228
@@ -36,7 +36,7 @@
static int _e_border_cb_window_shape(void *data, int ev_type, void *ev);
static int _e_border_cb_window_focus_in(void *data, int ev_type, void *ev);
static int _e_border_cb_window_focus_out(void *data, int ev_type, void *ev);
-static int _e_border_cb_window_state(void *data, int ev_type, void *ev);
+static int _e_border_cb_window_state_request(void *data, int ev_type, void
*ev);
static int _e_border_cb_desktop_change(void *data, int ev_type, void *ev);
static int _e_border_cb_client_message(void *data, int ev_type, void *ev);
@@ -162,7 +162,7 @@
handlers = evas_list_append(handlers,
ecore_event_handler_add(ECORE_X_EVENT_WINDOW_SHAPE, _e_border_cb_window_shape,
NULL));
handlers = evas_list_append(handlers,
ecore_event_handler_add(ECORE_X_EVENT_WINDOW_FOCUS_IN,
_e_border_cb_window_focus_in, NULL));
handlers = evas_list_append(handlers,
ecore_event_handler_add(ECORE_X_EVENT_WINDOW_FOCUS_OUT,
_e_border_cb_window_focus_out, NULL));
- handlers = evas_list_append(handlers,
ecore_event_handler_add(ECORE_X_EVENT_WINDOW_STATE, _e_border_cb_window_state,
NULL));
+ handlers = evas_list_append(handlers,
ecore_event_handler_add(ECORE_X_EVENT_WINDOW_STATE_REQUEST,
_e_border_cb_window_state_request, NULL));
handlers = evas_list_append(handlers,
ecore_event_handler_add(ECORE_X_EVENT_DESKTOP_CHANGE,
_e_border_cb_desktop_change, NULL));
handlers = evas_list_append(handlers,
ecore_event_handler_add(ECORE_X_EVENT_CLIENT_MESSAGE,
_e_border_cb_client_message, NULL));
ecore_x_passive_grab_replay_func_set(_e_border_cb_grab_replay, NULL);
@@ -1986,10 +1986,10 @@
}
static int
-_e_border_cb_window_state(void *data, int ev_type, void *ev)
+_e_border_cb_window_state_request(void *data, int ev_type, void *ev)
{
E_Border *bd;
- Ecore_X_Event_Window_State *e;
+ Ecore_X_Event_Window_State_Request *e;
int i, on;
e = ev;
@@ -2792,8 +2792,7 @@
}
if (bd->client.icccm.fetch.icon_name)
{
- if (bd->client.icccm.icon_name) free(bd->client.icccm.icon_name);
- bd->client.icccm.icon_name =
ecore_x_window_prop_icon_name_get(bd->client.win);
+ e_hints_window_icon_name_get(bd);
bd->client.icccm.fetch.icon_name = 0;
}
if (bd->client.icccm.fetch.machine)
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_hints.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -3 -r1.34 -r1.35
--- e_hints.c 26 May 2005 12:38:53 -0000 1.34
+++ e_hints.c 28 May 2005 12:50:22 -0000 1.35
@@ -1025,9 +1025,14 @@
{
char *name;
+ if (bd->client.icccm.icon_name) free(bd->client.icccm.icon_name);
+
name = ecore_x_netwm_icon_name_get(bd->client.win);
- if (bd->client.icccm.icon_name)
- free(bd->client.icccm.icon_name);
+ if (!name)
+ name = ecore_x_icccm_icon_name_get(bd->client.win);
+ if (!name)
+ name = strdup("");
+
bd->client.icccm.icon_name = name;
bd->changed = 1;
}
-------------------------------------------------------
This SF.Net email is sponsored by Yahoo.
Introducing Yahoo! Search Developer Network - Create apps using Yahoo!
Search APIs Find out how you can build Yahoo! directly into your own
Applications - visit http://developer.yahoo.net/?fr=offad-ysdn-ostg-q22005
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
