Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
ewins.c ewins.h hints.h session.c
Log Message:
Cleanups around unused SM_CLIENT_ID property.
===================================================================
RCS file: /cvs/e/e16/e/src/ewins.c,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -3 -r1.195 -r1.196
--- ewins.c 16 Apr 2007 16:36:10 -0000 1.195
+++ ewins.c 16 Apr 2007 20:31:33 -0000 1.196
@@ -195,7 +195,7 @@
MWM_GetHints(ewin, 0);
ICCCM_GetInfo(ewin); /* NB! Need group info first */
HintsGetWindowHints(ewin);
- SessionGetInfo(ewin, 0);
+ SessionGetInfo(ewin);
}
}
@@ -1328,7 +1328,6 @@
EwinChangesStart(ewin);
HintsProcessPropertyChange(ewin, ev);
- SessionGetInfo(ewin, ev->xproperty.atom);
EwinStateUpdate(ewin);
EwinChangesProcess(ewin);
===================================================================
RCS file: /cvs/e/e16/e/src/ewins.h,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -3 -r1.71 -r1.72
--- ewins.h 7 Apr 2007 13:19:30 -0000 1.71
+++ ewins.h 16 Apr 2007 20:31:33 -0000 1.72
@@ -472,9 +472,6 @@
void ActionsHandleMotion(void);
int ActionsEnd(EWin * ewin);
-/* session.c */
-void SessionGetInfo(EWin * ewin, Atom atom_change);
-
/* size.c */
void MaxSize(EWin * ewin, const char *resize_type);
void MaxWidth(EWin * ewin, const char *resize_type);
===================================================================
RCS file: /cvs/e/e16/e/src/hints.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- hints.h 16 Apr 2007 16:48:46 -0000 1.15
+++ hints.h 16 Apr 2007 20:31:33 -0000 1.16
@@ -158,4 +158,7 @@
void MWM_GetHints(EWin * ewin, Atom atom_change);
void MWM_SetInfo(void);
+/* session.c */
+void SessionGetInfo(EWin * ewin);
+
#endif /* _HINTS_H_ */
===================================================================
RCS file: /cvs/e/e16/e/src/session.c,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -3 -r1.141 -r1.142
--- session.c 17 Jan 2007 01:10:43 -0000 1.141
+++ session.c 16 Apr 2007 20:31:33 -0000 1.142
@@ -26,6 +26,7 @@
#include "e16-ecore_hints.h"
#include "emodule.h"
#include "ewins.h"
+#include "hints.h"
#include "session.h"
#include "settings.h"
#include "snaps.h"
@@ -305,7 +306,6 @@
}
static Atom atom_sm_client_id;
-static Atom atom_wm_client_leader;
static IceConn ice_conn;
@@ -334,7 +334,6 @@
#ifdef HAVE_X11_SM_SMLIB_H
atom_sm_client_id = XInternAtom(disp, "SM_CLIENT_ID", False);
- atom_wm_client_leader = XInternAtom(disp, "WM_CLIENT_LEADER", False);
IceSetIOErrorHandler(ice_io_error_handler);
@@ -434,34 +433,22 @@
}
void
-SessionGetInfo(EWin * ewin, Atom atom_change)
+SessionGetInfo(EWin * ewin)
{
+#if 0 /* Unused */
#ifdef HAVE_X11_SM_SMLIB_H
- Ecore_X_Window win;
- int num;
-
- /* We can comply with the ICCCM because gtk is working correctly */
- if ((atom_change) &&
- (!(atom_change == atom_sm_client_id ||
- atom_change == atom_wm_client_leader)))
- return;
- if (!atom_sm_client_id || !atom_wm_client_leader)
+ if (atom_sm_client_id == None)
return;
-
- if (ewin->session_id)
- {
- Efree(ewin->session_id);
- ewin->session_id = NULL;
- }
-
- num = ecore_x_window_prop_window_get(EwinGetClientXwin(ewin),
- atom_wm_client_leader, &win, 1);
- if (num > 0)
- ewin->session_id = ecore_x_window_prop_string_get(win,
atom_sm_client_id);
+ _EFREE(ewin->session_id);
+ if (ewin->icccm.client_leader != None)
+ ewin->session_id =
+ ecore_x_window_prop_string_get(ewin->icccm.client_leader,
+ atom_sm_client_id);
#else
ewin = NULL;
- atom_change = 0;
#endif /* HAVE_X11_SM_SMLIB_H */
+#endif
+ ewin = NULL;
}
void
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
