r35501 - in /desktop/unstable/gtk+3.0/debian: changelog patches/072_statusicon_icon_size.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Sat Jun 30 15:00:13 2012
New Revision: 35501

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=35501
Log:
debian/patches/072_statusicon_icon_size.patch: Fix how we determine the
icon size for the statusicon. This could lead to a crash in
notification-daemon caused by an assertion failure. Closes: #669883
Thanks to Fernando Lemos for the patch and Brad Jorsch for the excellent
debugging.

Added:
    desktop/unstable/gtk+3.0/debian/patches/072_statusicon_icon_size.patch
Modified:
    desktop/unstable/gtk+3.0/debian/changelog
    desktop/unstable/gtk+3.0/debian/patches/series

Modified: desktop/unstable/gtk+3.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/changelog?rev=35501&op=diff
==============================================================================
--- desktop/unstable/gtk+3.0/debian/changelog [utf-8] (original)
+++ desktop/unstable/gtk+3.0/debian/changelog [utf-8] Sat Jun 30 15:00:13 2012
@@ -1,3 +1,13 @@
+gtk+3.0 (3.4.2-2) UNRELEASED; urgency=low
+
+  * debian/patches/072_statusicon_icon_size.patch: Fix how we determine the
+    icon size for the statusicon. This could lead to a crash in
+    notification-daemon caused by an assertion failure. Closes: #669883
+    Thanks to Fernando Lemos for the patch and Brad Jorsch for the excellent
+    debugging.
+
+ -- Michael Biebl <biebl at debian.org>  Sat, 30 Jun 2012 16:48:53 +0200
+
 gtk+3.0 (3.4.2-1) unstable; urgency=low
 
   * New upstream release.

Added: desktop/unstable/gtk+3.0/debian/patches/072_statusicon_icon_size.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/patches/072_statusicon_icon_size.patch?rev=35501&op=file
==============================================================================
--- desktop/unstable/gtk+3.0/debian/patches/072_statusicon_icon_size.patch (added)
+++ desktop/unstable/gtk+3.0/debian/patches/072_statusicon_icon_size.patch [utf-8] Sat Jun 30 15:00:13 2012
@@ -1,0 +1,47 @@
+From b4f092f17d93a9343c917e3a20b906b693965bda Mon Sep 17 00:00:00 2001
+From: Fernando Lemos <fernandotcl at gmail.com>
+Date: Tue, 15 May 2012 10:28:37 -0400
+Subject: [PATCH] statusicon: use absolute delta to find the nearest icon size
+
+Otherwise, if we only look at (pixel_size - stock_size), we miss the
+case when the pixel size is smaller than any provided stock size.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=673749
+
+statusicon: Fix implicit declaration warning
+
+gtkstatusicon.c:1333:4: warning: implicit declaration of function 'abs' [-Wimplicit-function-declaration]
+
+Added in commit c8378099600e4279cb5c608b546bbe778c451233
+---
+ gtk/gtkstatusicon.c |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/gtk/gtkstatusicon.c b/gtk/gtkstatusicon.c
+index 8bcb638..5c8a591 100644
+--- a/gtk/gtkstatusicon.c
++++ b/gtk/gtkstatusicon.c
+@@ -28,6 +28,7 @@
+ #include "config.h"
+ 
+ #include <string.h>
++#include <stdlib.h>
+ 
+ #include "gtkstatusicon.h"
+ 
+@@ -1328,10 +1329,9 @@ round_pixel_size (GtkWidget *widget,
+ 
+   for (s = GTK_ICON_SIZE_MENU; s <= GTK_ICON_SIZE_DIALOG; s++)
+     {
+-      if (gtk_icon_size_lookup_for_settings (settings, s, &w, &h) &&
+-	  w <= pixel_size && h <= pixel_size)
++      if (gtk_icon_size_lookup_for_settings (settings, s, &w, &h))
+ 	{
+-	  d = MAX (pixel_size - w, pixel_size - h);
++	  d = MAX (abs (pixel_size - w), abs (pixel_size - h));
+ 	  if (d < dist)
+ 	    {
+ 	      dist = d;
+-- 
+1.7.10
+

Modified: desktop/unstable/gtk+3.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/patches/series?rev=35501&op=diff
==============================================================================
--- desktop/unstable/gtk+3.0/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gtk+3.0/debian/patches/series [utf-8] Sat Jun 30 15:00:13 2012
@@ -10,3 +10,4 @@
 061_multiarch_module_fallback.patch
 070_revert-widget-set-up-signals-after-initializing.patch
 071_fix-installation-of-HTML-images.patch
+072_statusicon_icon_size.patch