1998-12-11 Owen Taylor <otaylor@redhat.com>

* gdesktop.c (window_button_press): Ehen cancelling editing
	account for clicks on other GMC windows.

gnome/ChangeLog

@@ -1,3 +1,8 @@
+1998-12-11  Owen Taylor  <otaylor@redhat.com>
+
+	* gdesktop.c (window_button_press): Ehen cancelling editing
+	account for clicks on other GMC windows.
+
 1998-12-11  Federico Mena Quintero  <federico@nuclecu.unam.mx>
 
 	* gdesktop.c (click_proxy_filter): Doh.  We may get DestroyNotify
@@ -46,6 +51,7 @@
 	* gdesktop-icon.c (desktop_icon_reshape): Set the position and
 	size fields as computed for layout.
 
+>>>>>>> 1.192
 1998-12-11  Owen Taylor  <otaylor@redhat.com>
 
 	* gdesktop.c (editing_started): Grab on the window for the

gnome/gdesktop.c

@@ -693,13 +693,24 @@ static gint
 window_button_press (GtkWidget *widget, GdkEventButton *event, gpointer data)
 {
 	struct desktop_icon_info *dii;
+	GtkWidget *parent;
 
 	dii = data;
 
-	/* We should only get this while editing. But check anyways */
+	/* We should only get this while editing. But check anyways -
+	 * we ignore events in a child of our a event widget
+	 */
+	parent = gtk_get_event_widget ((GdkEvent *)event);
+	if (parent)
+		parent = parent->parent;
 
-	if ((event->window == widget->window) &&
-	    GNOME_ICON_TEXT_ITEM (DESKTOP_ICON (dii->dicon)->text)->editing) {
+	while (parent) {
+		if (widget == parent)
+			return FALSE;
+		parent = parent->parent;
+	}
+	
+	if (GNOME_ICON_TEXT_ITEM (DESKTOP_ICON (dii->dicon)->text)->editing) {
 		gnome_icon_text_item_stop_editing (
 			GNOME_ICON_TEXT_ITEM (
 				DESKTOP_ICON (dii->dicon)->text), TRUE);