From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1ONsDW-0003p1-6C for garchives@archives.gentoo.org; Sun, 13 Jun 2010 18:47:34 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 714E3E0CC5; Sun, 13 Jun 2010 18:47:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 12C91E0CC5 for ; Sun, 13 Jun 2010 18:47:33 +0000 (UTC) Received: from corvid.gentoo.org (corvid.gentoo.org [208.92.234.79]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id 73D1C1B4046 for ; Sun, 13 Jun 2010 18:47:32 +0000 (UTC) Received: by corvid.gentoo.org (Postfix, from userid 2262) id 8806D2CF44; Sun, 13 Jun 2010 18:47:29 +0000 (UTC) From: "Pacho Ramos (pacho)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, pacho@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in x11-libs/gtk+/files: gtk+-2.20.1-GtkOffscreenWindow.patch gtk+-2.20.1-gail_cell_type.patch gtk+-2.20.1-gtkrange.patch gtk+-2.20.1-libpixbufloader-warning.patch gtk+-2.20.1-libpng-fix.patch X-VCS-Repository: gentoo-x86 X-VCS-Files: gtk+-2.20.1-GtkOffscreenWindow.patch gtk+-2.20.1-gail_cell_type.patch gtk+-2.20.1-gtkrange.patch gtk+-2.20.1-libpixbufloader-warning.patch gtk+-2.20.1-libpng-fix.patch X-VCS-Directories: x11-libs/gtk+/files X-VCS-Committer: pacho X-VCS-Committer-Name: Pacho Ramos Content-Type: text/plain; charset=utf8 Message-Id: <20100613184729.8806D2CF44@corvid.gentoo.org> Date: Sun, 13 Jun 2010 18:47:29 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: a960212e-cff8-432c-8f79-518b15cd72eb X-Archives-Hash: 5af61a6a9c01d250d0e51ad4b96431bb pacho 10/06/13 18:47:29 Added: gtk+-2.20.1-GtkOffscreenWindow.patch gtk+-2.20.1-gail_cell_type.patch gtk+-2.20.1-gtkrange.patch gtk+-2.20.1-libpixbufloader-warning.patch gtk+-2.20.1-libpng-fix.patch Log: Really adding needed patches, thanks Kaleb Elwert and Lars Wendler for = reporting. (Portage version: 2.1.8.3/cvs/Linux x86_64) Revision Changes Path 1.1 x11-libs/gtk+/files/gtk+-2.20.1-GtkOffscreenWindow.p= atch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/file= s/gtk+-2.20.1-GtkOffscreenWindow.patch?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/file= s/gtk+-2.20.1-GtkOffscreenWindow.patch?rev=3D1.1&content-type=3Dtext/plai= n Index: gtk+-2.20.1-GtkOffscreenWindow.patch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D >From 4cf1f2c55c8d27052e43da932a5d5444bf1ed1f6 Mon Sep 17 00:00:00 2001 From: Cody Russell Date: Tue, 01 Jun 2010 15:32:18 +0000 Subject: Bug 608218 - GtkOffscreenWindow causes bad window with GtkEntry We now exit early from gdk_window_register_dnd() to avoid crashing if the window type is GDK_WINDOW_OFFSCREEN and does not support dnd operations. This makes it possible to use any dnd-enabled widgets, such as GtkEntry, within a GtkOffscreenWindow. --- diff --git a/gdk/x11/gdkdnd-x11.c b/gdk/x11/gdkdnd-x11.c index 4b7fd85..c0ad26d 100644 --- a/gdk/x11/gdkdnd-x11.c +++ b/gdk/x11/gdkdnd-x11.c @@ -3879,6 +3879,9 @@ gdk_window_register_dnd (GdkWindow *window) =20 g_return_if_fail (window !=3D NULL); =20 + if (gdk_window_get_window_type (window) =3D=3D GDK_WINDOW_OFFSCREEN) + return; + base_precache_atoms (display); =20 if (g_object_get_data (G_OBJECT (window), "gdk-dnd-registered") !=3D N= ULL) -- cgit v0.8.3.1 1.1 x11-libs/gtk+/files/gtk+-2.20.1-gail_cell_type.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/file= s/gtk+-2.20.1-gail_cell_type.patch?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/file= s/gtk+-2.20.1-gail_cell_type.patch?rev=3D1.1&content-type=3Dtext/plain Index: gtk+-2.20.1-gail_cell_type.patch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D >From 5d6ebcc17703e20560d55e34c8bef87d27ef0127 Mon Sep 17 00:00:00 2001 From: Mike Gorse Date: Fri, 21 May 2010 14:40:46 +0000 Subject: Implement action interface for gailcell. Bug #580889. --- diff --git a/modules/other/gail/gailbooleancell.c b/modules/other/gail/ga= ilbooleancell.c index 5c86d04..0aefcfa 100644 --- a/modules/other/gail/gailbooleancell.c +++ b/modules/other/gail/gailbooleancell.c @@ -36,8 +36,7 @@ gchar *gail_boolean_cell_property_list[] =3D { NULL }; =20 -G_DEFINE_TYPE_WITH_CODE (GailBooleanCell, gail_boolean_cell, GAIL_TYPE_R= ENDERER_CELL, - gail_cell_type_add_action_interface (g_define_t= ype_id)) +G_DEFINE_TYPE (GailBooleanCell, gail_boolean_cell, GAIL_TYPE_RENDERER_CE= LL) =20 static void=20 gail_boolean_cell_class_init (GailBooleanCellClass *klass) diff --git a/modules/other/gail/gailcell.c b/modules/other/gail/gailcell.= c index 35e531e..bc8dd13 100644 --- a/modules/other/gail/gailcell.c +++ b/modules/other/gail/gailcell.c @@ -37,7 +37,7 @@ static gint gail_cell_get_index_in_parent (AtkO= bject *obj); =20 /* AtkAction */ =20 -static void gail_cell_atk_action_interface_init=20 +static void atk_action_interface_init=20 (AtkActionIface *= iface); static ActionInfo * _gail_cell_get_action_info (GailCell *= cell, gint index); @@ -76,6 +76,7 @@ static void gail_cell_get_extents (AtkC= omponent *componen static gboolean gail_cell_grab_focus (AtkComponent *c= omponent); =20 G_DEFINE_TYPE_WITH_CODE (GailCell, gail_cell, ATK_TYPE_OBJECT, + G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION, atk_act= ion_interface_init) G_IMPLEMENT_INTERFACE (ATK_TYPE_COMPONENT, atk_= component_interface_init)) =20 static void =20 @@ -285,7 +286,7 @@ gail_cell_get_index_in_parent (AtkObject *obj) } =20 static void -gail_cell_atk_action_interface_init (AtkActionIface *iface) +atk_action_interface_init (AtkActionIface *iface) { iface->get_n_actions =3D gail_cell_action_get_n_actions; iface->do_action =3D gail_cell_action_do_action; @@ -298,14 +299,6 @@ gail_cell_atk_action_interface_init (AtkActionIface = *iface) void gail_cell_type_add_action_interface (GType type) { - const GInterfaceInfo atk_action_info =3D - { - (GInterfaceInitFunc) gail_cell_atk_action_interface_init, - (GInterfaceFinalizeFunc) NULL, - NULL - }; - g_type_add_interface_static (type, ATK_TYPE_ACTION, - &atk_action_info); } =20 gboolean -- cgit v0.8.3.1 1.1 x11-libs/gtk+/files/gtk+-2.20.1-gtkrange.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/file= s/gtk+-2.20.1-gtkrange.patch?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/file= s/gtk+-2.20.1-gtkrange.patch?rev=3D1.1&content-type=3Dtext/plain Index: gtk+-2.20.1-gtkrange.patch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D >From 84f88bbb1d2e12b1c582e87fa098b823e91bbf33 Mon Sep 17 00:00:00 2001 From: Jan Arne Petersen Date: Tue, 18 May 2010 06:46:42 +0000 Subject: GtkRange: Redraw if GtkRange is a GtkScale and value is drawn. * gtk/gtkrange.c: (gtk_range_adjustment_value_change): Queue the draw also if the range is a scale and the value is drawn, fixing bug #533946 (Markus Brinkmann), when two HScales use one adjustment. --- diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c index 552eac7..a4fcee4 100644 --- a/gtk/gtkrange.c +++ b/gtk/gtkrange.c @@ -35,6 +35,7 @@ #include "gtkmarshalers.h" #include "gtkorientable.h" #include "gtkrange.h" +#include "gtkscale.h" #include "gtkscrollbar.h" #include "gtkprivate.h" #include "gtkintl.h" @@ -2618,7 +2619,8 @@ gtk_range_adjustment_value_changed (GtkAdjustment *= adjustment, gtk_range_calc_layout (range, range->adjustment->value); =20 /* now check whether the layout changed */ - if (layout_changed (range->layout, &layout)) + if (layout_changed (range->layout, &layout) || + (GTK_IS_SCALE (range) && GTK_SCALE (range)->draw_value)) { gtk_widget_queue_draw (GTK_WIDGET (range)); /* setup a timer to ensure the range isn't lagging too much behind= the scroll position */ -- cgit v0.8.3.1 1.1 x11-libs/gtk+/files/gtk+-2.20.1-libpixbufloader-warn= ing.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/file= s/gtk+-2.20.1-libpixbufloader-warning.patch?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/file= s/gtk+-2.20.1-libpixbufloader-warning.patch?rev=3D1.1&content-type=3Dtext= /plain Index: gtk+-2.20.1-libpixbufloader-warning.patch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D >From a6c4833d9a307a1905516fb497dfaf0f141e1c0d Mon Sep 17 00:00:00 2001 From: Javier Jard=C3=B3n Date: Tue, 04 May 2010 13:27:08 +0000 Subject: Remove the definition of libpixbufloader_gdip_png_la_* libstatic-pixbufloader-gdip-png.la should not be built or at least not included in STATIC_GDIPLUS_LIBS as we don't want to use the GDI+-based loader for PNG, because if we do, we can't get (or was it set?) the options of a PNG pixbuf that for instance some code in GIMP wants to do. Fixes https://bugzilla.gnome.org/show_bug.cgi?id=3D607839 --- diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am index cf1769b..52fd710 100644 --- a/gdk-pixbuf/Makefile.am +++ b/gdk-pixbuf/Makefile.am @@ -244,9 +244,6 @@ libstatic_pixbufloader_gdip_gif_la_SOURCES =3D \ libstatic_pixbufloader_gdip_jpeg_la_SOURCES =3D \ io-gdip-jpeg.c =20 -libstatic_pixbufloader_gdip_png_la_SOURCES =3D \ - io-gdip-png.c - libstatic_pixbufloader_gdip_tiff_la_SOURCES =3D \ io-gdip-tiff.c =20 @@ -327,17 +324,6 @@ libpixbufloader_gdip_jpeg_la_SOURCES =3D \ io-gdip-jpeg.c libpixbufloader_gdip_jpeg_la_LIBADD =3D $(module_libs) $(libole32) =20 -libpixbufloader_gdip_png_la_LDFLAGS =3D -avoid-version -module -no-undef= ined -libpixbufloader_gdip_png_la_SOURCES =3D \ - io-gdip-native.h \ - io-gdip-propertytags.h \ - io-gdip-utils.h \ - io-gdip-utils.c \ - io-gdip-animation.c \ - io-gdip-animation.h \ - io-gdip-png.c -libpixbufloader_gdip_png_la_LIBADD =3D $(module_libs) $(libole32) - libpixbufloader_gdip_tiff_la_LDFLAGS =3D -avoid-version -module -no-unde= fined libpixbufloader_gdip_tiff_la_SOURCES =3D \ io-gdip-native.h \ -- cgit v0.8.3.1 1.1 x11-libs/gtk+/files/gtk+-2.20.1-libpng-fix.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/file= s/gtk+-2.20.1-libpng-fix.patch?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/file= s/gtk+-2.20.1-libpng-fix.patch?rev=3D1.1&content-type=3Dtext/plain Index: gtk+-2.20.1-libpng-fix.patch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D commit 006d5718fa927d9d3509fca1a1c1ca6522110b57 Author: Matthias Clasen Date: Wed May 12 15:02:02 2010 -0400 Another attempt to handle pngs changing int types diff --git a/gdk-pixbuf/io-png.c b/gdk-pixbuf/io-png.c index 43db70a..844064a 100644 --- a/gdk-pixbuf/io-png.c +++ b/gdk-pixbuf/io-png.c @@ -261,7 +261,7 @@ gdk_pixbuf__png_image_load (FILE *f, GError **error) gchar *icc_profile_base64; const gchar *icc_profile_title; const gchar *icc_profile; - gulong icc_profile_size; + png_uint_32 icc_profile_size; guint32 retval; gint compression_type; =20 @@ -344,7 +344,7 @@ gdk_pixbuf__png_image_load (FILE *f, GError **error) (png_charpp) &icc_profile_title, &compres= sion_type, (png_charpp) &icc_profile, (png_uint_32*)= &icc_profile_size); if (retval !=3D 0) { - icc_profile_base64 =3D g_base64_encode ((const guchar *)= icc_profile, icc_profile_size); + icc_profile_base64 =3D g_base64_encode ((const guchar *)= icc_profile, (gsize)icc_profile_size); gdk_pixbuf_set_option (pixbuf, "icc-profile", icc_profil= e_base64); g_free (icc_profile_base64); } @@ -607,7 +607,7 @@ png_info_callback (png_structp png_read_ptr, gchar *icc_profile_base64; const gchar *icc_profile_title; const gchar *icc_profile; - gulong icc_profile_size; + png_uint_32 icc_profile_size; guint32 retval; gint compression_type; =20 @@ -679,9 +679,9 @@ png_info_callback (png_structp png_read_ptr, /* Extract embedded ICC profile */ retval =3D png_get_iCCP (png_read_ptr, png_info_ptr, (png_charpp) &icc_profile_title, &compres= sion_type, - (png_charpp) &icc_profile, (png_uint_32*)= &icc_profile_size); + (png_charpp) &icc_profile, &icc_profile_s= ize); if (retval !=3D 0) { - icc_profile_base64 =3D g_base64_encode ((const guchar *)= icc_profile, icc_profile_size); + icc_profile_base64 =3D g_base64_encode ((const guchar *)= icc_profile, (gsize)icc_profile_size); gdk_pixbuf_set_option (lc->pixbuf, "icc-profile", icc_pr= ofile_base64); g_free (icc_profile_base64); }