isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-25 01:20:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

only install .desktop file for metacity-properties if we actually install

Browse Source 
2002-12-13  Havoc Pennington  <hp@redhat.com>

	* src/tools/Makefile.am (Desktop_in_files): only install .desktop
	file for metacity-properties if we actually install
	metacity-properties

	* src/display.c (event_callback): not focusing on button 2 click
	was crack, revert that change.
This commit is contained in:
Havoc Pennington 2002-12-13 22:20:31 +00:00 committed by Havoc Pennington
parent c2700863ca
commit fd8c3514d6
3 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2002-12-13 Havoc Pennington <hp@redhat.com>
* src/tools/Makefile.am (Desktop_in_files): only install .desktop
file for metacity-properties if we actually install
metacity-properties
* src/display.c (event_callback): not focusing on button 2 click
was crack, revert that change.
2002-12-09 Havoc Pennington <hp@pobox.com> 2002-12-09 Havoc Pennington <hp@pobox.com>
* AUTHORS: add myself here, bug #100789 * AUTHORS: add myself here, bug #100789

8
src/display.c
View File

@ -1225,14 +1225,14 @@ event_callback (XEvent *event,
*/ */
unmodified = (event->xbutton.state & grab_mask) == 0; unmodified = (event->xbutton.state & grab_mask) == 0;
if ((unmodified && event->xbutton.button != 2) || if (unmodified ||
event->xbutton.button == 1) event->xbutton.button == 1)
{ {
if (!frame_was_receiver) if (!frame_was_receiver)
{ {
/* don't focus if frame received, will be /* don't focus if frame received, will be lowered in
* done in frames.c if the click wasn't on * frames.c or special-cased if the click was on a
* the minimize/close button. * minimize/close button.
*/ */
meta_window_raise (window); meta_window_raise (window);

12
src/tools/Makefile.am
View File

@ -34,9 +34,15 @@ ui_DATA=metacity-properties.glade
propicondir=$(datadir)/pixmaps propicondir=$(datadir)/pixmaps
propicon_DATA=metacity-properties.png propicon_DATA=metacity-properties.png
METACITY_PROPERTIES_DESKTOP_IN=metacity-properties.desktop.in
if BUILD_CONFIG_DIALOG
METACITY_PROPERTIES_DESKTOP=metacity-properties.desktop
else
METACITY_PROPERTIES_DESKTOP=
endif
desktopdir=$(datadir)/control-center-2.0/capplets desktopdir=$(datadir)/control-center-2.0/capplets
Desktop_in_files=metacity-properties.desktop.in desktop_DATA=$(METACITY_PROPERTIES_DESKTOP)
desktop_DATA=$(Desktop_in_files:.desktop.in=.desktop)
if BUILD_CONFIG_DIALOG if BUILD_CONFIG_DIALOG
CONFIG_DIALOG=metacity-properties CONFIG_DIALOG=metacity-properties
@ -57,5 +63,5 @@ if BUILD_CONFIG_DIALOG
metacity_properties_LDADD= @METACITY_PROPS_LIBS@ metacity_properties_LDADD= @METACITY_PROPS_LIBS@
endif endif
EXTRA_DIST=$(icon_DATA) $(ui_DATA) $(propicon_DATA) $(Desktop_in_files) EXTRA_DIST=$(icon_DATA) $(ui_DATA) $(propicon_DATA) $(METACITY_PROPERTIES_DESKTOP_IN)