diff --git a/ChangeLog b/ChangeLog index 91476f19d1..8348b798c5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +Tue May 14 18:13:10 2002 Owen Taylor + + * gdk/x11/gdkdnd-x11.c (gdk_window_cache_filter): Fix + prepending at the start of the list. (#56349, + Thomas Leonard.) + + * gtk/gtksignal.h (gtk_signal_disconnect_by_func): Add + explicit casts to GSignalMatchType for C++ compatibility. + (#77601) + Tue May 14 18:02:37 2002 Owen Taylor * gtk/gtkwindow.c (gtk_window_realize): Fix diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 91476f19d1..8348b798c5 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,13 @@ +Tue May 14 18:13:10 2002 Owen Taylor + + * gdk/x11/gdkdnd-x11.c (gdk_window_cache_filter): Fix + prepending at the start of the list. (#56349, + Thomas Leonard.) + + * gtk/gtksignal.h (gtk_signal_disconnect_by_func): Add + explicit casts to GSignalMatchType for C++ compatibility. + (#77601) + Tue May 14 18:02:37 2002 Owen Taylor * gtk/gtkwindow.c (gtk_window_realize): Fix diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 91476f19d1..8348b798c5 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,13 @@ +Tue May 14 18:13:10 2002 Owen Taylor + + * gdk/x11/gdkdnd-x11.c (gdk_window_cache_filter): Fix + prepending at the start of the list. (#56349, + Thomas Leonard.) + + * gtk/gtksignal.h (gtk_signal_disconnect_by_func): Add + explicit casts to GSignalMatchType for C++ compatibility. + (#77601) + Tue May 14 18:02:37 2002 Owen Taylor * gtk/gtkwindow.c (gtk_window_realize): Fix diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 91476f19d1..8348b798c5 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,13 @@ +Tue May 14 18:13:10 2002 Owen Taylor + + * gdk/x11/gdkdnd-x11.c (gdk_window_cache_filter): Fix + prepending at the start of the list. (#56349, + Thomas Leonard.) + + * gtk/gtksignal.h (gtk_signal_disconnect_by_func): Add + explicit casts to GSignalMatchType for C++ compatibility. + (#77601) + Tue May 14 18:02:37 2002 Owen Taylor * gtk/gtkwindow.c (gtk_window_realize): Fix diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 91476f19d1..8348b798c5 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,13 @@ +Tue May 14 18:13:10 2002 Owen Taylor + + * gdk/x11/gdkdnd-x11.c (gdk_window_cache_filter): Fix + prepending at the start of the list. (#56349, + Thomas Leonard.) + + * gtk/gtksignal.h (gtk_signal_disconnect_by_func): Add + explicit casts to GSignalMatchType for C++ compatibility. + (#77601) + Tue May 14 18:02:37 2002 Owen Taylor * gtk/gtkwindow.c (gtk_window_realize): Fix diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 91476f19d1..8348b798c5 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,13 @@ +Tue May 14 18:13:10 2002 Owen Taylor + + * gdk/x11/gdkdnd-x11.c (gdk_window_cache_filter): Fix + prepending at the start of the list. (#56349, + Thomas Leonard.) + + * gtk/gtksignal.h (gtk_signal_disconnect_by_func): Add + explicit casts to GSignalMatchType for C++ compatibility. + (#77601) + Tue May 14 18:02:37 2002 Owen Taylor * gtk/gtkwindow.c (gtk_window_realize): Fix diff --git a/gdk/x11/gdkdnd-x11.c b/gdk/x11/gdkdnd-x11.c index fd61beeedd..a246267268 100644 --- a/gdk/x11/gdkdnd-x11.c +++ b/gdk/x11/gdkdnd-x11.c @@ -335,6 +335,8 @@ gdk_window_cache_filter (GdkXEvent *xev, node->prev = above_node->prev; if (node->prev) node->prev->next = node; + else + cache->children = node; node->next = above_node; above_node->prev = node; } diff --git a/gtk/gtksignal.h b/gtk/gtksignal.h index cc4ab942d2..00eb824f57 100644 --- a/gtk/gtksignal.h +++ b/gtk/gtksignal.h @@ -62,27 +62,31 @@ G_BEGIN_DECLS #define gtk_signal_handler_unblock(object,handler_id) \ g_signal_handler_unblock ((object), (handler_id)) #define gtk_signal_disconnect_by_func(object,func,data) \ - gtk_signal_compat_matched ((object), (func), (data), G_SIGNAL_MATCH_FUNC | \ - G_SIGNAL_MATCH_DATA, 0) + gtk_signal_compat_matched ((object), (func), (data), \ + (GSignalMatchType)(G_SIGNAL_MATCH_FUNC | \ + G_SIGNAL_MATCH_DATA), 0) #define gtk_signal_disconnect_by_data(object,data) \ gtk_signal_compat_matched ((object), 0, (data), G_SIGNAL_MATCH_DATA, 0) #define gtk_signal_handler_block_by_func(object,func,data) \ - gtk_signal_compat_matched ((object), (func), (data), G_SIGNAL_MATCH_FUNC | \ - G_SIGNAL_MATCH_DATA, 1) + gtk_signal_compat_matched ((object), (func), (data), \ + (GSignalMatchType)(G_SIGNAL_MATCH_FUNC | \ + G_SIGNAL_MATCH_DATA), 1) #define gtk_signal_handler_block_by_data(object,data) \ gtk_signal_compat_matched ((object), 0, (data), G_SIGNAL_MATCH_DATA, 1) #define gtk_signal_handler_unblock_by_func(object,func,data) \ - gtk_signal_compat_matched ((object), (func), (data), G_SIGNAL_MATCH_FUNC | \ - G_SIGNAL_MATCH_DATA, 2) + gtk_signal_compat_matched ((object), (func), (data), \ + (GSignalMatchType)(G_SIGNAL_MATCH_FUNC | \ + G_SIGNAL_MATCH_DATA), 2) #define gtk_signal_handler_unblock_by_data(object,data) \ gtk_signal_compat_matched ((object), 0, (data), G_SIGNAL_MATCH_DATA, 2) #define gtk_signal_handler_pending(object,signal_id,may_be_blocked) \ g_signal_has_handler_pending ((object), (signal_id), 0, (may_be_blocked)) #define gtk_signal_handler_pending_by_func(object,signal_id,may_be_blocked,func,data) \ - (g_signal_handler_find ((object), G_SIGNAL_MATCH_ID | \ - G_SIGNAL_MATCH_FUNC | \ - G_SIGNAL_MATCH_DATA | \ - ((may_be_blocked) ? 0 : G_SIGNAL_MATCH_UNBLOCKED),\ + (g_signal_handler_find ((object), \ + (GSignalMatchType)(G_SIGNAL_MATCH_ID | \ + G_SIGNAL_MATCH_FUNC | \ + G_SIGNAL_MATCH_DATA | \ + ((may_be_blocked) ? 0 : G_SIGNAL_MATCH_UNBLOCKED)),\ (signal_id), 0, 0, (func), (data)) != 0)