[56910] trunk/dports/x11/gtk2/files/patch-gnome-bug-531599.diff

[nox at macports.org]

Revision: 56910
          http://trac.macports.org/changeset/56910
Author:   nox at macports.org
Date:     2009-09-03 06:45:17 -0700 (Thu, 03 Sep 2009)
Log Message:
-----------
gtk2: Fix patch for +quartz variant (closes #21009).

Modified Paths:
--------------
    trunk/dports/x11/gtk2/files/patch-gnome-bug-531599.diff

Modified: trunk/dports/x11/gtk2/files/patch-gnome-bug-531599.diff
===================================================================
--- trunk/dports/x11/gtk2/files/patch-gnome-bug-531599.diff	2009-09-03 13:14:16 UTC (rev 56909)
+++ trunk/dports/x11/gtk2/files/patch-gnome-bug-531599.diff	2009-09-03 13:45:17 UTC (rev 56910)
@@ -1,4 +1,5 @@
 Taken from http://bugzilla.gnome.org/show_bug.cgi?id=531599
+Updated for gtk+-2.16.6
 
 Index: gtk/gtkaccelgroup.c
 ===================================================================
@@ -55,22 +56,12 @@
  	    event->keyval == GDK_ISO_Enter ||
 Index: gtk/gtkfilechooserdefault.c
 ===================================================================
---- gtk/gtkfilechooserdefault.c	(revision 20074)
-+++ gtk/gtkfilechooserdefault.c	(working copy)
-@@ -3692,7 +3692,8 @@ tree_view_keybinding_cb (GtkWidget      
+--- gtk/gtkfilechooserdefault.c.orig	2009-09-03 15:37:08.000000000 +0200
++++ gtk/gtkfilechooserdefault.c	2009-09-03 15:42:12.000000000 +0200
+@@ -4092,7 +4092,7 @@
  #ifdef G_OS_UNIX
         || event->keyval == GDK_asciitilde
  #endif
--       ) && ! (event->state & (~GDK_SHIFT_MASK & gtk_accelerator_get_default_mod_mask ())))
-+       ) && ! (event->state & (~gtk_accelerator_get_input_mod_mask () & 
-+                               gtk_accelerator_get_default_mod_mask ())))
-     {
-       location_popup_handler (impl, event->string);
-       return TRUE;
-@@ -4070,7 +4071,7 @@ trap_activate_cb (GtkWidget   *widget,
- #ifdef G_OS_UNIX
-        || event->keyval == GDK_asciitilde
- #endif
 -       ) && ! (event->state & (~GDK_SHIFT_MASK & modifiers)))
 +       ) && ! (event->state & (~gtk_accelerator_get_input_mod_mask () & modifiers)))
      {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090903/ec7d259a/attachment.html>