Attachment 104174 Details for Bug 144309 – file.shar

file.shar

file.shar (text/plain), 1.54 KB, created by Robert Jenssen on 2010-02-26 04:40:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Robert Jenssen

Created: 2010-02-26 04:40:01 UTC

Size: 1.54 KB

patch

obsolete

># This is a shell archive.  Save it in a file, remove anything before
># this line, and then unpack it by entering "sh file".  Note, it may
># create directories; files and directories will be owned by you and
># have default permissions.
>#
># This archive contains:
>#
>#	patch-src-xfns.c
>#
>echo x - patch-src-xfns.c
>sed 's/^X//' >patch-src-xfns.c << '2c720cb11c97be933bf88812f3b0dfda'
>X--- src/xfns.c.orig	2009-08-31 00:03:02.000000000 +0100
>X+++ src/xfns.c	2009-08-31 00:21:39.000000000 +0100
>X@@ -468,8 +468,10 @@
>X       if (!FRAME_X_P (f) || FRAME_X_DISPLAY_INFO (f) != dpyinfo)
>X 	continue;
>X       x = f->output_data.x;
>X-      /* Match if the window is this frame's menubar.  */
>X #ifdef USE_GTK
>X+      /* Match if the window is this frame's window (button presses are no longer
>X+         caught by the menubar) or a menu in the menubar.
>X+       */
>X       if (x->menubar_widget)
>X         {
>X           GtkWidget *gwdesc = xg_win_to_widget (dpyinfo->display, wdesc);
>X@@ -477,13 +479,14 @@
>X 
>X           BLOCK_INPUT;
>X           if (gwdesc != 0
>X-              && (gwdesc == x->menubar_widget
>X+              && (gwdesc == gtk_widget_get_parent (gtk_widget_get_parent (x->menubar_widget))
>X                   || gtk_widget_get_parent (gwdesc) == x->menubar_widget))
>X             found = 1;
>X           UNBLOCK_INPUT;
>X           if (found) return f;
>X         }
>X #else
>X+      /* Match if the window is in this frame's menubar */
>X       if (x->menubar_widget
>X 	  && lw_window_is_in_menubar (wdesc, x->menubar_widget))
>X 	return f;
>2c720cb11c97be933bf88812f3b0dfda
>exit

Actions: View

Attachments on bug 144309: 104174