fix disk failure notification

This commit is contained in:
Matthias Clasen 2010-11-05 11:41:03 -04:00
parent eceff2866f
commit 08c8d50809
2 changed files with 8 additions and 5 deletions

View File

@ -13,7 +13,7 @@
Summary: Disk management application
Name: gnome-disk-utility
Version: 2.32.0
Release: 2%{?dist}
Release: 3%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
URL: http://git.gnome.org/cgit/gnome-disk-utility
@ -205,6 +205,9 @@ fi
%{_includedir}/gnome-disk-utility/gdu-gtk/*
%changelog
* Fri Nov 5 2010 Matthias Clasen <mclasen@redhat.com> - 2.32.0-3%{?dist}
- Fix a problem with 'disk failure' notifications
* Wed Nov 3 2010 Matthias Clasen <mclasen@redhat.com> - 2.32.0-2%{?dist}
- Rebuild against libnotify 0.7.0

View File

@ -1,6 +1,6 @@
diff -up gnome-disk-utility-2.32.0/src/notification/notification-main.c.no-statusicon gnome-disk-utility-2.32.0/src/notification/notification-main.c
--- gnome-disk-utility-2.32.0/src/notification/notification-main.c.no-statusicon 2010-08-05 13:03:58.000000000 -0400
+++ gnome-disk-utility-2.32.0/src/notification/notification-main.c 2010-11-03 16:52:01.192241985 -0400
+++ gnome-disk-utility-2.32.0/src/notification/notification-main.c 2010-11-05 11:39:30.723300002 -0400
@@ -39,16 +39,12 @@ typedef struct
{
GduPool *pool;
@ -117,10 +117,10 @@ diff -up gnome-disk-utility-2.32.0/src/notification/notification-main.c.no-statu
{
- gboolean show_icon;
- gboolean old_show_icon_for_ata_smart_failures;
-
- old_show_icon_for_ata_smart_failures = data->show_icon_for_ata_smart_failures;
+ int num_drives;
- old_show_icon_for_ata_smart_failures = data->show_icon_for_ata_smart_failures;
-
- data->show_icon_for_ata_smart_failures = FALSE;
- if (g_list_length (data->ata_smart_failures) > 0)
- data->show_icon_for_ata_smart_failures = TRUE;
@ -128,7 +128,7 @@ diff -up gnome-disk-utility-2.32.0/src/notification/notification-main.c.no-statu
- show_icon = data->show_icon_for_ata_smart_failures;
-
- if (!show_icon) {
+ if (data->ata_smart_notification != NULL) {
+ if (data->ata_smart_failures == NULL) {
if (data->ata_smart_notification != NULL) {
notify_notification_close (data->ata_smart_notification, NULL);
g_object_unref (data->ata_smart_notification);