[mate-notification-daemon/epel7] try fix rhbz (#890728)

Wolfgang Ulbrich raveit65 at fedoraproject.org
Fri Oct 3 15:12:21 UTC 2014


commit 01a6ef81b87c5a8b4a1e81df0a55c7bb61961152
Author: raveit65 <chat-to-me at raveit.de>
Date:   Fri Oct 3 17:12:04 2014 +0200

    try fix rhbz (#890728)

 mate-notification-daemon.spec                      |   13 +++++--
 ...mon_check-value-type-of-notification-hint.patch |   35 ------------------
 ...daemon_do-not-draw-pie-if-timeout-is-zero.patch |   38 ++++++++++++++++++++
 3 files changed, 47 insertions(+), 39 deletions(-)
---
diff --git a/mate-notification-daemon.spec b/mate-notification-daemon.spec
index 50dba6f..dfe558f 100644
--- a/mate-notification-daemon.spec
+++ b/mate-notification-daemon.spec
@@ -15,7 +15,7 @@
 Name:           mate-notification-daemon
 Version:        %{branch}.0
 #Release:        0.2%{?git_rel}%{?dist}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Notification daemon for MATE Desktop
 License:        GPLv2+
 URL:            http://mate-desktop.org
@@ -34,9 +34,9 @@ BuildRequires:  libwnck-devel
 BuildRequires:  mate-common
 BuildRequires:  mate-desktop-devel
 
-# fix rhbz (#1046716)
-# https://github.com/mate-desktop/mate-notification-daemon/pull/26
-Patch0:         mate-notification-daemon_check-value-type-of-notification-hint.patch
+# rhbz (#890728)
+# http://git.mate-desktop.org/mate-notification-daemon/commit/?id=8ed79a3
+Patch0:         mate-notification-daemon_do-not-draw-pie-if-timeout-is-zero.patch
 
 Provides:       desktop-notification-daemon
 
@@ -46,6 +46,8 @@ Notification daemon for MATE Desktop
 %prep
 %setup -q%{!?rel_build:n %{name}-%{commit}}
 
+%patch0 -p1 -b .do-not-draw-pie-if-timeout-is-zero
+
 # needed for git snapshots
 #NOCONFIGURE=1 ./autogen.sh
 
@@ -98,6 +100,9 @@ fi
 
 
 %changelog
+* Fri Oct 03 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.8.0-2
+- try fix rhbz (#890728)
+
 * Wed Mar 05 2014 Dan Mashal <dan.mashal at fedoraproject.org> - 1.8.0-1
 - Update to 1.8.0
 
diff --git a/mate-notification-daemon_do-not-draw-pie-if-timeout-is-zero.patch b/mate-notification-daemon_do-not-draw-pie-if-timeout-is-zero.patch
new file mode 100644
index 0000000..cbaa663
--- /dev/null
+++ b/mate-notification-daemon_do-not-draw-pie-if-timeout-is-zero.patch
@@ -0,0 +1,38 @@
+From 8ed79a30694b2249b6a9407d190a68f770c58e12 Mon Sep 17 00:00:00 2001
+From: Denis Gorodnichev <denis.gorodnichev at gmail.com>
+Date: Wed, 01 Oct 2014 13:03:13 +0000
+Subject: don't draw pie if timeout is zero
+
+Closes https://github.com/mate-desktop/mate-notification-daemon/pull/38
+---
+diff --git a/src/themes/coco/coco-theme.c b/src/themes/coco/coco-theme.c
+index 3101ecc..584c3a6 100644
+--- a/src/themes/coco/coco-theme.c
++++ b/src/themes/coco/coco-theme.c
+@@ -144,6 +144,9 @@ fill_background(GtkWidget *widget, WindowData *windata, cairo_t *cr)
+ static void
+ draw_pie(GtkWidget *pie, WindowData *windata, cairo_t *cr)
+ {
++	if (windata->timeout == 0)
++		return;
++
+ 	gdouble arc_angle = 1.0 - (gdouble)windata->remaining / (gdouble)windata->timeout;
+ 	cairo_set_source_rgba (cr, 1.0, 0.4, 0.0, 0.3);
+ 	cairo_move_to(cr, PIE_RADIUS, PIE_RADIUS);
+diff --git a/src/themes/nodoka/nodoka-theme.c b/src/themes/nodoka/nodoka-theme.c
+index cf9f70d..3d2a597 100644
+--- a/src/themes/nodoka/nodoka-theme.c
++++ b/src/themes/nodoka/nodoka-theme.c
+@@ -481,6 +481,9 @@ draw_border(GtkWidget *widget, WindowData *windata, cairo_t *cr)
+ static void
+ draw_pie(GtkWidget *pie, WindowData *windata, cairo_t *cr)
+ {
++	if (windata->timeout == 0)
++		return;
++
+ 	gdouble arc_angle = 1.0 - (gdouble)windata->remaining / (gdouble)windata->timeout;
+ 	cairo_set_source_rgba (cr, 1.0, 0.4, 0.0, 0.3);
+ 	cairo_move_to(cr, PIE_RADIUS, PIE_RADIUS);
+--
+cgit 
+


More information about the scm-commits mailing list