diff options
| author | Matthias Clasen <maclas@gmx.de> | 2003-09-10 15:56:11 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2003-09-10 15:56:11 +0000 |
| commit | 87c0d2651ca1c3b401d238dd6fd1d0c9e311526a (patch) | |
| tree | f02df603c81769f1c0c433242587f49a738fb867 | |
| parent | 3a2808211466bd5f75435d2a3228d27201364c76 (diff) | |
| download | gtk+-87c0d2651ca1c3b401d238dd6fd1d0c9e311526a.tar.gz | |
Only remove PropertyNotify events from the stream if they have been
2003-09-10 Matthias Clasen <maclas@gmx.de>
* gtk/gtksocket.c (gtk_socket_filter_func): Only remove
PropertyNotify events from the stream if they have been handled,
in order to enable extending the plug<->socket communication via
properties.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 7 | ||||
| -rw-r--r-- | gtk/gtksocket.c | 5 |
6 files changed, 38 insertions, 2 deletions
@@ -1,3 +1,10 @@ +2003-09-10 Matthias Clasen <maclas@gmx.de> + + * gtk/gtksocket.c (gtk_socket_filter_func): Only remove + PropertyNotify events from the stream if they have been handled, + in order to enable extending the plug<->socket communication via + properties. + Wed Sep 10 01:06:44 2003 Kristian Rietveld <kris@gtk.org> Big TreeView DnD fixage, makes drops on empty models work, makes diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 76d5f998fc..38fb5ec57e 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +2003-09-10 Matthias Clasen <maclas@gmx.de> + + * gtk/gtksocket.c (gtk_socket_filter_func): Only remove + PropertyNotify events from the stream if they have been handled, + in order to enable extending the plug<->socket communication via + properties. + Wed Sep 10 01:06:44 2003 Kristian Rietveld <kris@gtk.org> Big TreeView DnD fixage, makes drops on empty models work, makes diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 76d5f998fc..38fb5ec57e 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,10 @@ +2003-09-10 Matthias Clasen <maclas@gmx.de> + + * gtk/gtksocket.c (gtk_socket_filter_func): Only remove + PropertyNotify events from the stream if they have been handled, + in order to enable extending the plug<->socket communication via + properties. + Wed Sep 10 01:06:44 2003 Kristian Rietveld <kris@gtk.org> Big TreeView DnD fixage, makes drops on empty models work, makes diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 76d5f998fc..38fb5ec57e 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +2003-09-10 Matthias Clasen <maclas@gmx.de> + + * gtk/gtksocket.c (gtk_socket_filter_func): Only remove + PropertyNotify events from the stream if they have been handled, + in order to enable extending the plug<->socket communication via + properties. + Wed Sep 10 01:06:44 2003 Kristian Rietveld <kris@gtk.org> Big TreeView DnD fixage, makes drops on empty models work, makes diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 76d5f998fc..38fb5ec57e 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +2003-09-10 Matthias Clasen <maclas@gmx.de> + + * gtk/gtksocket.c (gtk_socket_filter_func): Only remove + PropertyNotify events from the stream if they have been handled, + in order to enable extending the plug<->socket communication via + properties. + Wed Sep 10 01:06:44 2003 Kristian Rietveld <kris@gtk.org> Big TreeView DnD fixage, makes drops on empty models work, makes diff --git a/gtk/gtksocket.c b/gtk/gtksocket.c index feaa594f16..0c3068ae03 100644 --- a/gtk/gtksocket.c +++ b/gtk/gtksocket.c @@ -1389,6 +1389,7 @@ gtk_socket_filter_func (GdkXEvent *gdk_xevent, GdkEvent *event, gpointer data) { socket->have_size = FALSE; gtk_widget_queue_resize (widget); + return_val = GDK_FILTER_REMOVE; } else if ((xevent->xproperty.atom == gdk_x11_get_xatom_by_name_for_display (display, "XdndAware")) || (xevent->xproperty.atom == gdk_x11_get_xatom_by_name_for_display (display, "_MOTIF_DRAG_RECEIVER_INFO"))) @@ -1403,6 +1404,7 @@ gtk_socket_filter_func (GdkXEvent *gdk_xevent, GdkEvent *event, gpointer data) gdk_display_sync (display); gdk_error_trap_pop (); + return_val = GDK_FILTER_REMOVE; } else if (xevent->xproperty.atom == gdk_x11_get_xatom_by_name_for_display (display, "_XEMBED_INFO")) { @@ -1428,9 +1430,8 @@ gtk_socket_filter_func (GdkXEvent *gdk_xevent, GdkEvent *event, gpointer data) } } } + return_val = GDK_FILTER_REMOVE; } - - return_val = GDK_FILTER_REMOVE; } break; case ReparentNotify: |