rpms/gtk2/FC-6 gtk+-2.10.4-close-loader.patch, NONE, 1.1 gtk+-2.10.4-icon-theme-crash.patch, NONE, 1.1 gtk+-2.10.4-message-dialog-a11y.patch, NONE, 1.1 gtk+-2.10.4-mnemonic-clipping.patch, NONE, 1.1 gtk+-2.10.4-printernames.patch, 1.1, 1.2 gtk2.spec, 1.193, 1.194
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Sun Dec 10 04:38:34 UTC 2006
Author: mclasen
Update of /cvs/dist/rpms/gtk2/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv13641
Modified Files:
gtk+-2.10.4-printernames.patch gtk2.spec
Added Files:
gtk+-2.10.4-close-loader.patch
gtk+-2.10.4-icon-theme-crash.patch
gtk+-2.10.4-message-dialog-a11y.patch
gtk+-2.10.4-mnemonic-clipping.patch
Log Message:
Add collected patches
gtk+-2.10.4-close-loader.patch:
gdk-pixbuf-loader.c | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 deletions(-)
--- NEW FILE gtk+-2.10.4-close-loader.patch ---
--- gtk+-2.10.6/gdk-pixbuf/gdk-pixbuf-loader.c.close-loader 2006-07-16 22:37:29.000000000 -0400
+++ gtk+-2.10.6/gdk-pixbuf/gdk-pixbuf-loader.c 2006-12-09 23:11:10.000000000 -0500
@@ -455,10 +472,7 @@
eaten = gdk_pixbuf_loader_eat_header_write (loader, buf, count, error);
if (eaten <= 0)
- {
- gdk_pixbuf_loader_ensure_error (loader, error);
- return FALSE;
- }
+ goto fail;
count -= eaten;
buf += eaten;
@@ -466,16 +480,25 @@
if (count > 0 && priv->image_module->load_increment)
{
- gboolean retval;
- retval = priv->image_module->load_increment (priv->context, buf, count,
- error);
- if (!retval)
- gdk_pixbuf_loader_ensure_error (loader, error);
-
- return retval;
+ if (!priv->image_module->load_increment (priv->context, buf, count,
+ error))
+ goto fail;
}
return TRUE;
+
+ fail:
+ gdk_pixbuf_loader_ensure_error (loader, error);
+
+ priv->closed = TRUE;
+
+ if (priv->image_module && priv->holds_threadlock)
+ {
+ _gdk_pixbuf_unlock (priv->image_module);
+ priv->holds_threadlock = FALSE;
+ }
+
+ return FALSE;
}
/**
gtk+-2.10.4-icon-theme-crash.patch:
gtkicontheme.c | 2 ++
1 files changed, 2 insertions(+)
--- NEW FILE gtk+-2.10.4-icon-theme-crash.patch ---
--- gtk+-2.10.4/gtk/gtkicontheme.c.icon-theme-crash 2006-08-15 14:25:35.000000000 -0400
+++ gtk+-2.10.4/gtk/gtkicontheme.c 2006-12-04 12:46:15.000000000 -0500
@@ -950,6 +950,8 @@
if (!dirs)
{
g_warning ("Theme file for %s has no directories\n", theme_name);
+ priv->themes = g_list_remove (priv->themes, theme);
+ g_free (theme->name);
g_free (theme->display_name);
g_free (theme);
g_key_file_free (theme_file);
gtk+-2.10.4-message-dialog-a11y.patch:
gtkmessagedialog.c | 15 +++++++++++++++
1 files changed, 15 insertions(+)
--- NEW FILE gtk+-2.10.4-message-dialog-a11y.patch ---
--- gtk+-2.10.4/gtk/gtkmessagedialog.c.message-dialog-a11y 2006-05-14 00:25:29.000000000 -0400
+++ gtk+-2.10.4/gtk/gtkmessagedialog.c 2006-12-04 12:55:00.000000000 -0500
@@ -29,6 +29,7 @@
#include <string.h>
#include "gtkmessagedialog.h"
+#include "gtkaccessible.h"
#include "gtklabel.h"
#include "gtkhbox.h"
#include "gtkvbox.h"
@@ -308,6 +309,7 @@
{
GtkMessageDialogPrivate *priv = GTK_MESSAGE_DIALOG_GET_PRIVATE (dialog);
const gchar *stock_id = NULL;
+ AtkObject *atk_obj;
priv->message_type = type;
@@ -340,6 +342,19 @@
if (stock_id)
gtk_image_set_from_stock (GTK_IMAGE (dialog->image), stock_id,
GTK_ICON_SIZE_DIALOG);
+
+ atk_obj = gtk_widget_get_accessible (GTK_WIDGET (dialog));
+ if (GTK_IS_ACCESSIBLE (atk_obj))
+ {
+ atk_object_set_role (atk_obj, ATK_ROLE_ALERT);
+ if (stock_id)
+ {
+ GtkStockItem item;
+
+ gtk_stock_lookup (stock_id, &item);
+ atk_object_set_name (atk_obj, item.label);
+ }
+ }
}
static void
gtk+-2.10.4-mnemonic-clipping.patch:
gtkrc.c | 7 +++++++
1 files changed, 7 insertions(+)
--- NEW FILE gtk+-2.10.4-mnemonic-clipping.patch ---
--- gtk+-2.10.4/gtk/gtkrc.c.mnemonic-clipping 2006-12-07 09:48:20.000000000 -0500
+++ gtk+-2.10.4/gtk/gtkrc.c 2006-12-07 09:48:36.000000000 -0500
@@ -889,15 +889,22 @@
" text[PRELIGHT] = \"#ffffff\"\n"
"}\n"
"\n"
+ /* Make transparent tray icons work */
"style \"gtk-default-tray-icon-style\" {\n"
" bg_pixmap[NORMAL] = \"<parent>\"\n"
"}\n"
"\n"
+ /* Work around clipping of accelerator underlines */
+ "style \"gtk-default-label-style\" {\n"
+ " GtkWidget::draw-border = {0,0,0,1}\n"
+ "}\n"
+ "\n"
"class \"GtkProgressBar\" style : gtk \"gtk-default-progress-bar-style\"\n"
"class \"GtkTrayIcon\" style : gtk \"gtk-default-tray-icon-style\"\n"
"widget \"gtk-tooltips*\" style : gtk \"gtk-default-tooltips-style\"\n"
"widget_class \"*<GtkMenuItem>*\" style : gtk \"gtk-default-menu-item-style\"\n"
"widget_class \"*<GtkMenuBar>*<GtkMenuItem>\" style : gtk \"gtk-default-menu-bar-item-style\"\n"
+ "class \"GtkLabel\" style : gtk \"gtk-default-label-style\"\n"
);
}
gtk+-2.10.4-printernames.patch:
gtkprintbackendcups.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Index: gtk+-2.10.4-printernames.patch
===================================================================
RCS file: /cvs/dist/rpms/gtk2/FC-6/gtk+-2.10.4-printernames.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gtk+-2.10.4-printernames.patch 25 Nov 2006 05:26:42 -0000 1.1
+++ gtk+-2.10.4-printernames.patch 10 Dec 2006 04:38:32 -0000 1.2
@@ -1,5 +1,5 @@
---- gtk+-2.10.4/modules/printbackends/cups/gtkprintbackendcups.c.cupslongnames 2006-11-24 14:15:28.000000000 +0000
-+++ gtk+-2.10.4/modules/printbackends/cups/gtkprintbackendcups.c 2006-11-24 14:15:39.000000000 +0000
+--- gtk+-2.10.4/modules/printbackends/cups/gtkprintbackendcups.c.shortname 2006-11-25 00:06:07.000000000 -0500
++++ gtk+-2.10.4/modules/printbackends/cups/gtkprintbackendcups.c 2006-11-25 00:06:24.000000000 -0500
@@ -1076,11 +1076,11 @@
resource);
#endif
Index: gtk2.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk2/FC-6/gtk2.spec,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -r1.193 -r1.194
--- gtk2.spec 25 Nov 2006 05:27:49 -0000 1.193
+++ gtk2.spec 10 Dec 2006 04:38:32 -0000 1.194
@@ -40,6 +40,10 @@
Patch10: gtk+-2.10.4-strncpy.patch
Patch11: gtk+-2.10.4-panel-crash.patch
Patch12: gtk+-2.10.4-printernames.patch
+Patch13: gtk+-2.10.4-icon-theme-crash.patch
+Patch14: gtk+-2.10.4-message-dialog-a11y.patch
+Patch15: gtk+-2.10.4-mnemonic-clipping.patch
+Patch16: gtk+-2.10.4-close-loader.patch
BuildPrereq: atk-devel >= %{atk_version}
BuildPrereq: pango-devel >= %{pango_version}
@@ -132,6 +136,10 @@
%patch10 -p1 -b .strncpy
%patch11 -p1 -b .panel-crash
%patch12 -p1 -b .printernames
+%patch13 -p1 -b .icon-theme-crash
+%patch14 -p1 -b .message-dialog-ally
+%patch15 -p1 -b .mnemonic-clipping
+%patch16 -p1 -b .close-loader
for i in config.guess config.sub ; do
test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
@@ -305,6 +313,14 @@
%doc tmpdocs/examples
%changelog
+* Sat Dec 9 2006 Matthias Clasen <mclasen at redhat.com> - 2.10.4-7
+- Fix error handling in pixbuf loaders (#218755)
+- Fix clipping of mnemonic underlines (#218615)
+- Fix a crash in the handling of invalid icon themes (#218247)
+- Give accessible names to message dialogs (#215472)
+- Make the print dialog work when the 'BrowseShortNames Off' cups
+ option is used (#217220)
+
* Sat Nov 25 2006 Matthias Clasen <mclasen at redhat.com> - 2.10.4-6
- Fix a recent-files related crash
- Fix a problem with the handling of printer names
More information about the fedora-cvs-commits
mailing list