diff options
author | 2007-01-20 20:01:44 +0000 | |
---|---|---|
committer | 2007-01-20 20:01:44 +0000 | |
commit | e2cddbead01a670fc1389b6d7269b66a9e34e264 (patch) | |
tree | d851af4155a8f911c1117511fa3ee2b0546f6997 /x11-libs | |
parent | New gtk+ version (diff) | |
download | pauldv-e2cddbead01a670fc1389b6d7269b66a9e34e264.tar.gz pauldv-e2cddbead01a670fc1389b6d7269b66a9e34e264.tar.bz2 pauldv-e2cddbead01a670fc1389b6d7269b66a9e34e264.zip |
Forgot to copy the new patches for 2.10.7-r1
svn path=/trunk/overlay/; revision=24
Diffstat (limited to 'x11-libs')
-rw-r--r-- | x11-libs/gtk+/Manifest | 8 | ||||
-rw-r--r-- | x11-libs/gtk+/files/gtk+-2.10.7-mozilla-dnd-fix.patch | 72 | ||||
-rw-r--r-- | x11-libs/gtk+/files/gtk+-2.10.7-textview-fix.patch | 23 |
3 files changed, 103 insertions, 0 deletions
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest index 5073cd3..e45e348 100644 --- a/x11-libs/gtk+/Manifest +++ b/x11-libs/gtk+/Manifest @@ -10,6 +10,14 @@ AUX gtk+-1.2.10-m4.patch 220 RMD160 c3f0ac9022a32aeef80ccf77493779fd58884b10 SHA MD5 0ec83a4bf20f79d85eb2976b58c39465 files/gtk+-1.2.10-m4.patch 220 RMD160 c3f0ac9022a32aeef80ccf77493779fd58884b10 files/gtk+-1.2.10-m4.patch 220 SHA256 88f45c2f0413f29d62ca138c87b41d24a73b47456f5b469277843de827717324 files/gtk+-1.2.10-m4.patch 220 +AUX gtk+-2.10.7-mozilla-dnd-fix.patch 2899 RMD160 2cc33847d78fe0c207bc79f514546113d740ca2c SHA1 5f385f6fcd05cb21c33e0fbbbaa98389ee24019e SHA256 9ec24dbe7e652aaee7d6118adffb4919ee0b3d7887587649cb475f3e69f5d729 +MD5 ffd8534d7546dad5d54fd70be4af97f7 files/gtk+-2.10.7-mozilla-dnd-fix.patch 2899 +RMD160 2cc33847d78fe0c207bc79f514546113d740ca2c files/gtk+-2.10.7-mozilla-dnd-fix.patch 2899 +SHA256 9ec24dbe7e652aaee7d6118adffb4919ee0b3d7887587649cb475f3e69f5d729 files/gtk+-2.10.7-mozilla-dnd-fix.patch 2899 +AUX gtk+-2.10.7-textview-fix.patch 937 RMD160 32e9a321151742e29dc15f891c91218bfd94fe49 SHA1 adeb81cfde35424e107a04250d58dcb413adfd57 SHA256 9f251fe7d50a7e9280d331bece4956ceb12044ac64a01cc6effcb28ec672baae +MD5 4af2fc5215284f8bf11c5fe9f71c3c9c files/gtk+-2.10.7-textview-fix.patch 937 +RMD160 32e9a321151742e29dc15f891c91218bfd94fe49 files/gtk+-2.10.7-textview-fix.patch 937 +SHA256 9f251fe7d50a7e9280d331bece4956ceb12044ac64a01cc6effcb28ec672baae files/gtk+-2.10.7-textview-fix.patch 937 AUX gtk+-2.2.1-disable_icons_smooth_alpha.patch 1383 RMD160 f2557ee984df766bce0b5e5ea8c41962a2ccff13 SHA1 5be2ba7cdac1bf48fdca5dc49d2adf96480452f0 SHA256 f4b916c7d26ba60b5d5af63ff694a5203f0dcd31b7310fb375c324fc1df72e05 MD5 d94ff41d82a8f0c56dd68a2fa71ef2fc files/gtk+-2.2.1-disable_icons_smooth_alpha.patch 1383 RMD160 f2557ee984df766bce0b5e5ea8c41962a2ccff13 files/gtk+-2.2.1-disable_icons_smooth_alpha.patch 1383 diff --git a/x11-libs/gtk+/files/gtk+-2.10.7-mozilla-dnd-fix.patch b/x11-libs/gtk+/files/gtk+-2.10.7-mozilla-dnd-fix.patch new file mode 100644 index 0000000..9188972 --- /dev/null +++ b/x11-libs/gtk+/files/gtk+-2.10.7-mozilla-dnd-fix.patch @@ -0,0 +1,72 @@ +This patch is applied upstream to fix http://bugzilla.gnome.org/show_bug.cgi?id=122688 +As this regresses mozilla products drag-and-drop (bug 162362) we are reverse applying +it as what it fixed is a corner case while mozilla case is a big problem. +The real problem is inside mozilla code, see http://bugzilla.gnome.org/show_bug.cgi?id=394525 +but we can't fix this for binary thunderbird/firefox/seamonkey packages + +--- /branches/gtk-2-10/gtk/gtkdnd.c 2006/11/05 08:55:47 16711 ++++ branches/gtk-2-10/gtk/gtkdnd.c 2006/11/06 17:16:37 16712 +@@ -285,6 +285,9 @@ + static gboolean gtk_drag_grab_broken_event_cb (GtkWidget *widget, + GdkEventGrabBroken *event, + gpointer data); ++static void gtk_drag_grab_notify_cb (GtkWidget *widget, ++ gboolean was_grabbed, ++ gpointer data); + static gboolean gtk_drag_button_release_cb (GtkWidget *widget, + GdkEventButton *event, + gpointer data); +@@ -2331,6 +2334,8 @@ + + g_signal_connect (info->ipc_widget, "grab_broken_event", + G_CALLBACK (gtk_drag_grab_broken_event_cb), info); ++ g_signal_connect (info->ipc_widget, "grab_notify", ++ G_CALLBACK (gtk_drag_grab_notify_cb), info); + g_signal_connect (info->ipc_widget, "button_release_event", + G_CALLBACK (gtk_drag_button_release_cb), info); + g_signal_connect (info->ipc_widget, "motion_notify_event", +@@ -3762,6 +3767,9 @@ + gtk_drag_grab_broken_event_cb, + info); + g_signal_handlers_disconnect_by_func (info->ipc_widget, ++ gtk_drag_grab_notify_cb, ++ info); ++ g_signal_handlers_disconnect_by_func (info->ipc_widget, + gtk_drag_button_release_cb, + info); + g_signal_handlers_disconnect_by_func (info->ipc_widget, +@@ -3926,6 +3934,9 @@ + gtk_drag_grab_broken_event_cb, + info); + g_signal_handlers_disconnect_by_func (info->ipc_widget, ++ gtk_drag_grab_notify_cb, ++ info); ++ g_signal_handlers_disconnect_by_func (info->ipc_widget, + gtk_drag_button_release_cb, + info); + g_signal_handlers_disconnect_by_func (info->ipc_widget, +@@ -4117,6 +4128,24 @@ + return TRUE; + } + ++static void ++gtk_drag_grab_notify_cb (GtkWidget *widget, ++ gboolean was_grabbed, ++ gpointer data) ++{ ++ GtkDragSourceInfo *info = (GtkDragSourceInfo *)data; ++ ++ if (!was_grabbed) ++ { ++ /* We have to block callbacks to avoid recursion here, because ++ gtk_drag_cancel calls gtk_grab_remove (via gtk_drag_end) */ ++ g_signal_handlers_block_by_func (widget, gtk_drag_grab_notify_cb, data); ++ gtk_drag_cancel (info, gtk_get_current_event_time ()); ++ g_signal_handlers_unblock_by_func (widget, gtk_drag_grab_notify_cb, data); ++ } ++} ++ ++ + /************************************************************* + * gtk_drag_button_release_cb: + * "button_release_event" callback during drag. diff --git a/x11-libs/gtk+/files/gtk+-2.10.7-textview-fix.patch b/x11-libs/gtk+/files/gtk+-2.10.7-textview-fix.patch new file mode 100644 index 0000000..b6ff18f --- /dev/null +++ b/x11-libs/gtk+/files/gtk+-2.10.7-textview-fix.patch @@ -0,0 +1,23 @@ +Don't crash in GtkSourceView/gedit with "Display line numbers" +http://bugzilla.gnome.org/show_bug.cgi?id=393813 + +--- /trunk/gtk/gtktextview.c 2007/01/07 05:34:40 17100 ++++ trunk/gtk/gtktextview.c 2007/01/07 07:19:07 17101 +@@ -8182,7 +8182,7 @@ + width, 0); + /* if the widget is already realized we need to realize the child manually */ + if (GTK_WIDGET_REALIZED (text_view)) +- text_window_realize (*winp, GTK_WIDGET (text_view)->window); ++ text_window_realize (*winp, GTK_WIDGET (text_view)); + } + else + { +@@ -8222,7 +8222,7 @@ + + /* if the widget is already realized we need to realize the child manually */ + if (GTK_WIDGET_REALIZED (text_view)) +- text_window_realize (*winp, GTK_WIDGET (text_view)->window); ++ text_window_realize (*winp, GTK_WIDGET (text_view)); + } + else + { |