Commit fd8c3514 authored by Havoc Pennington's avatar Havoc Pennington Committed by Havoc Pennington

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

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.
parent c2700863
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>
* AUTHORS: add myself here, bug #100789
......
......@@ -1225,14 +1225,14 @@ event_callback (XEvent *event,
*/
unmodified = (event->xbutton.state & grab_mask) == 0;
if ((unmodified && event->xbutton.button != 2) ||
if (unmodified ||
event->xbutton.button == 1)
{
if (!frame_was_receiver)
{
/* don't focus if frame received, will be
* done in frames.c if the click wasn't on
* the minimize/close button.
/* don't focus if frame received, will be lowered in
* frames.c or special-cased if the click was on a
* minimize/close button.
*/
meta_window_raise (window);
......
......@@ -34,9 +34,15 @@ ui_DATA=metacity-properties.glade
propicondir=$(datadir)/pixmaps
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
Desktop_in_files=metacity-properties.desktop.in
desktop_DATA=$(Desktop_in_files:.desktop.in=.desktop)
desktop_DATA=$(METACITY_PROPERTIES_DESKTOP)
if BUILD_CONFIG_DIALOG
CONFIG_DIALOG=metacity-properties
......@@ -57,5 +63,5 @@ if BUILD_CONFIG_DIALOG
metacity_properties_LDADD= @METACITY_PROPS_LIBS@
endif
EXTRA_DIST=$(icon_DATA) $(ui_DATA) $(propicon_DATA) $(Desktop_in_files)
EXTRA_DIST=$(icon_DATA) $(ui_DATA) $(propicon_DATA) $(METACITY_PROPERTIES_DESKTOP_IN)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment