Enlightenment CVS committal
Author : mej
Project : eterm
Module : Eterm
Dir : eterm/Eterm/src
Modified Files:
Tag: ETERM-0_10
icon.h pixmap.c startup.c startup.h
Log Message:
Mon Oct 27 21:49:04 2003 Michael Jennings (mej)
Merge.
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/src/icon.h,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -3 -r1.3 -r1.3.2.1
--- icon.h 19 Apr 2000 06:46:03 -0000 1.3
+++ icon.h 28 Oct 2003 02:49:36 -0000 1.3.2.1
@@ -1,4 +1,5 @@
static unsigned long icon_data[] = {
+0x00000030, 0x00000030,
0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
0x00000000,
0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
0x00000000,
0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
0x00000000,
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/src/pixmap.c,v
retrieving revision 1.78.2.8
retrieving revision 1.78.2.9
diff -u -3 -r1.78.2.8 -r1.78.2.9
--- pixmap.c 24 Aug 2003 15:16:44 -0000 1.78.2.8
+++ pixmap.c 28 Oct 2003 02:49:36 -0000 1.78.2.9
@@ -21,7 +21,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-static const char cvs_ident[] = "$Id: pixmap.c,v 1.78.2.8 2003/08/24 15:16:44 mej Exp
$";
+static const char cvs_ident[] = "$Id: pixmap.c,v 1.78.2.9 2003/10/28 02:49:36 mej Exp
$";
#include "config.h"
#include "feature.h"
@@ -2188,7 +2188,7 @@
if (temp_im == NULL) {
w = h = 48;
- temp_im = imlib_create_image_using_data(48, 48, (DATA32 *) icon_data);
+ temp_im = imlib_create_image_using_data(48, 48, (DATA32 *) (icon_data + 2));
imlib_context_set_image(temp_im);
imlib_image_set_has_alpha(1);
}
@@ -2205,7 +2205,12 @@
#else
wm_hints->flags |= IconPixmapHint | IconMaskHint;
#endif
+
+ /* Set the EWMH icon hint for stupid GNOME WM's. */
+ XChangeProperty(Xdisplay, TermWin.parent, props[PROP_EWMH_ICON], XA_CARDINAL, 32,
PropModeReplace, (unsigned char *) icon_data, sizeof(icon_data));
+
imlib_free_image_and_decache();
+
/* Only set the hints ourselves if we were passed a NULL pointer for pwm_hints */
if (!pwm_hints) {
XSetWMHints(Xdisplay, TermWin.parent, wm_hints);
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/src/startup.c,v
retrieving revision 1.29.2.6
retrieving revision 1.29.2.7
diff -u -3 -r1.29.2.6 -r1.29.2.7
--- startup.c 24 Aug 2003 15:16:45 -0000 1.29.2.6
+++ startup.c 28 Oct 2003 02:49:36 -0000 1.29.2.7
@@ -21,7 +21,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-static const char cvs_ident[] = "$Id: startup.c,v 1.29.2.6 2003/08/24 15:16:45 mej
Exp $";
+static const char cvs_ident[] = "$Id: startup.c,v 1.29.2.7 2003/10/28 02:49:36 mej
Exp $";
#include "config.h"
#include "feature.h"
@@ -135,7 +135,7 @@
/* Get all our properties set up. */
MEMSET(props, 0, sizeof(props));
- props[PROP_DESKTOP] = XInternAtom(Xdisplay, "_WIN_WORKSPACE", False);
+ props[PROP_DESKTOP] = XInternAtom(Xdisplay, "_NET_WM_DESKTOP", False);
props[PROP_TRANS_PIXMAP] = XInternAtom(Xdisplay, "_XROOTPMAP_ID", False);
props[PROP_TRANS_COLOR] = XInternAtom(Xdisplay, "_XROOTCOLOR_PIXEL", False);
props[PROP_SELECTION_DEST] = XInternAtom(Xdisplay, "VT_SELECTION", False);
@@ -146,6 +146,7 @@
props[PROP_DELETE_WINDOW] = XInternAtom(Xdisplay, "WM_DELETE_WINDOW", False);
props[PROP_DND_PROTOCOL] = XInternAtom(Xdisplay, "DndProtocol", False);
props[PROP_DND_SELECTION] = XInternAtom(Xdisplay, "DndSelection", False);
+ props[PROP_EWMH_ICON] = XInternAtom(Xdisplay, "_NET_WM_ICON", False);
if ((theme_dir = conf_parse_theme(&rs_theme, THEME_CFG, PARSE_TRY_ALL)) != NULL) {
char *tmp;
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/src/startup.h,v
retrieving revision 1.14.2.3
retrieving revision 1.14.2.4
diff -u -3 -r1.14.2.3 -r1.14.2.4
--- startup.h 3 Mar 2003 06:21:00 -0000 1.14.2.3
+++ startup.h 28 Oct 2003 02:49:36 -0000 1.14.2.4
@@ -102,6 +102,7 @@
PROP_DELETE_WINDOW,
PROP_DND_PROTOCOL,
PROP_DND_SELECTION,
+ PROP_EWMH_ICON,
NUM_PROPS
};
-------------------------------------------------------
This SF.net email is sponsored by: The SF.net Donation Program.
Do you like what SourceForge.net is doing for the Open
Source Community? Make a contribution, and help us add new
features and functionality. Click here: http://sourceforge.net/donate/
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
