isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-21 23:50:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

don't read from op->data.image when the op is an icon

Browse Source 
2002-11-12  Havoc Pennington  <hp@pobox.com>

	* src/theme.c (draw_op_as_pixbuf): don't read from op->data.image
	when the op is an icon
This commit is contained in:
Havoc Pennington 2002-11-13 04:11:52 +00:00 committed by Havoc Pennington
parent 5590e8878b
commit d1aaf6a9b1
4 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2002-11-12 Havoc Pennington <hp@pobox.com>
* src/theme.c (draw_op_as_pixbuf): don't read from op->data.image
when the op is an icon
2002-11-12 Havoc Pennington <hp@redhat.com> 2002-11-12 Havoc Pennington <hp@redhat.com>
* src/stack.c (meta_stack_get_default_focus_window): never use a * src/stack.c (meta_stack_get_default_focus_window): never use a

3
src/Makefile.am
View File

@ -112,7 +112,8 @@ metacity_dialog_SOURCES= \
bin_PROGRAMS=metacity metacity-theme-viewer bin_PROGRAMS=metacity metacity-theme-viewer
libexec_PROGRAMS=metacity-dialog libexec_PROGRAMS=metacity-dialog
metacity_LDADD= @METACITY_LIBS@ EFENCE=
metacity_LDADD= $(EFENCE) @METACITY_LIBS@ $(EFENCE)
metacity_theme_viewer_LDADD= @METACITY_LIBS@ libmetacity-private.la metacity_theme_viewer_LDADD= @METACITY_LIBS@ libmetacity-private.la
metacity_dialog_LDADD=@METACITY_LIBS@ metacity_dialog_LDADD=@METACITY_LIBS@

2
src/run-metacity.sh
View File

@ -48,6 +48,8 @@ if test -n "$XINERAMA"; then
XINERAMA_FLAGS='+xinerama' XINERAMA_FLAGS='+xinerama'
fi fi
export EF_ALLOW_MALLOC_0=1
if test -z "$ONLY_WM"; then if test -z "$ONLY_WM"; then
echo "Launching Xnest" echo "Launching Xnest"
Xnest -ac $XNEST_DISPLAY -scrns $SCREENS -geometry 640x480 -bw 15 $XINERAMA_FLAGS & Xnest -ac $XNEST_DISPLAY -scrns $SCREENS -geometry 640x480 -bw 15 $XINERAMA_FLAGS &

6
src/theme.c
View File

@ -3140,15 +3140,13 @@ draw_op_as_pixbuf (const MetaDrawOp *op,
op->data.icon.alpha_spec, op->data.icon.alpha_spec,
op->data.icon.fill_type, op->data.icon.fill_type,
width, height, width, height,
op->data.image.vertical_stripes, FALSE, FALSE);
op->data.image.horizontal_stripes);
else if (info->icon) else if (info->icon)
pixbuf = scale_and_alpha_pixbuf (info->icon, pixbuf = scale_and_alpha_pixbuf (info->icon,
op->data.icon.alpha_spec, op->data.icon.alpha_spec,
op->data.icon.fill_type, op->data.icon.fill_type,
width, height, width, height,
op->data.image.vertical_stripes, FALSE, FALSE);
op->data.image.horizontal_stripes);
break; break;
case META_DRAW_TITLE: case META_DRAW_TITLE: