r21314 - in /desktop/experimental/epiphany-webkit/debian: changelog patches/04_avoid_using_newer_gtk.patch patches/series

[kov at users.alioth.debian.org]

Author: kov
Date: Thu Sep 10 22:02:22 2009
New Revision: 21314

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=21314
Log:
Import patch from upstream to avoid requiring new GTK+ (Closes: #545983)

Added:
    desktop/experimental/epiphany-webkit/debian/patches/04_avoid_using_newer_gtk.patch
Modified:
    desktop/experimental/epiphany-webkit/debian/changelog
    desktop/experimental/epiphany-webkit/debian/patches/series

Modified: desktop/experimental/epiphany-webkit/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-webkit/debian/changelog?rev=21314&op=diff
==============================================================================
--- desktop/experimental/epiphany-webkit/debian/changelog [utf-8] (original)
+++ desktop/experimental/epiphany-webkit/debian/changelog [utf-8] Thu Sep 10 22:02:22 2009
@@ -3,8 +3,11 @@
   * debian/control.in:
   - Added missing build-dep on libnss3-dev (used in the password importer)
     (Closes: #545980)
-
- -- Gustavo Noronha Silva <kov at debian.org>  Wed, 09 Sep 2009 19:42:33 -0300
+  * debian/patches/04_avoid_using_newer_gtk.patch:
+  - Import patch from upstream, to avoid using a newer GTK+
+    (Closes: #545983)
+
+ -- Gustavo Noronha Silva <kov at debian.org>  Thu, 10 Sep 2009 18:45:46 -0300
 
 epiphany-webkit (2.27.92-1) experimental; urgency=low
 

Added: desktop/experimental/epiphany-webkit/debian/patches/04_avoid_using_newer_gtk.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-webkit/debian/patches/04_avoid_using_newer_gtk.patch?rev=21314&op=file
==============================================================================
--- desktop/experimental/epiphany-webkit/debian/patches/04_avoid_using_newer_gtk.patch (added)
+++ desktop/experimental/epiphany-webkit/debian/patches/04_avoid_using_newer_gtk.patch [utf-8] Thu Sep 10 22:02:22 2009
@@ -1,0 +1,32 @@
+commit be2dcb8174d199d25d75ef382df81e663e7fe6c7
+Author: Xan Lopez <xan at gnome.org>
+Date:   Wed Sep 9 02:04:34 2009 +0300
+
+    ephy-dialog.c: do not use bleeding edge GTK+ API
+
+diff --git a/lib/ephy-dialog.c b/lib/ephy-dialog.c
+index 3d2226d..88f3ed6 100644
+--- a/lib/ephy-dialog.c
++++ b/lib/ephy-dialog.c
+@@ -146,18 +146,18 @@ set_sensitivity (PropertyInfo *info, gboolean sensitive)
+ 
+ 		for (l = list; l != NULL; l = l->next)
+ 		{
+-			sensitive = gtk_widget_is_sensitive (GTK_WIDGET (l->data)) && sensitive;
++			sensitive = GTK_WIDGET_IS_SENSITIVE (GTK_WIDGET (l->data)) && sensitive;
+ 			gtk_widget_set_sensitive (GTK_WIDGET (l->data), sensitive);
+ 		}
+ 	}
+ 	else if (info->widget_type == PT_EDITABLE)
+ 	{
+-		sensitive = gtk_widget_is_sensitive (info->widget) && sensitive;
++		sensitive = GTK_WIDGET_IS_SENSITIVE (info->widget) && sensitive;
+ 		gtk_editable_set_editable (GTK_EDITABLE (info->widget), sensitive);
+ 	}
+ 	else
+ 	{
+-		sensitive = gtk_widget_is_sensitive (info->widget) && sensitive;
++		sensitive = GTK_WIDGET_IS_SENSITIVE (info->widget) && sensitive;
+ 		gtk_widget_set_sensitive (info->widget, sensitive);
+ 	}
+ }

Modified: desktop/experimental/epiphany-webkit/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-webkit/debian/patches/series?rev=21314&op=diff
==============================================================================
--- desktop/experimental/epiphany-webkit/debian/patches/series [utf-8] (original)
+++ desktop/experimental/epiphany-webkit/debian/patches/series [utf-8] Thu Sep 10 22:02:22 2009
@@ -2,6 +2,7 @@
 01_bookmarks_menu.patch
 02_ac_init.patch
 03_dbus.patch
+04_avoid_using_newer_gtk.patch
 05_libexecdir.patch
 07_bookmarks.patch
 09_download_dialog.patch