Attachment 302387 Details for Bug 442398 – patch

[patch] patch

do-not-show.patch (text/plain), 2.36 KB, created by Matthias Clasen on 2008-04-14 20:37:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthias Clasen

Created: 2008-04-14 20:37:29 UTC

Size: 2.36 KB

patch

obsolete

>diff --git a/src/gpk-notify.c b/src/gpk-notify.c
>index 50b47f0..fab0d6e 100644
>--- a/src/gpk-notify.c
>+++ b/src/gpk-notify.c
>@@ -317,7 +317,7 @@ gpk_notify_update_system_finished_cb (PkClient *client, PkExitEnum exit_code, gu
> 	}
> 
> 	/* are we accepting notifications */
>-	value = gconf_client_get_bool (notify->priv->gconf_client, GPK_CONF_NOTIFY_MESSAGE, NULL);
>+	value = gconf_client_get_bool (notify->priv->gconf_client, GPK_CONF_NOTIFY_RESTART, NULL);
> 	if (value == FALSE) {
> 		pk_debug ("not showing notification as prevented in gconf");
> 		return;
>@@ -403,14 +403,21 @@ gpk_notify_update_system (GpkNotify *notify)
> 	if (ret) {
> 		gpk_smart_icon_set_icon_name (notify->priv->sicon, NULL);
> 	} else {
>-		message = g_strdup_printf (_("The error was: %s"), error->message);
>-		pk_warning ("%s", message);
>+		/* are we accepting notifications */
>+		value = gconf_client_get_bool (notify->priv->gconf_client, GPK_CONF_NOTIFY_RESTART, NULL);
>+		if (value == FALSE) 
>+			pk_debug ("not showing notification as prevented in gconf");
>+		}
>+		else {
>+			message = g_strdup_printf (_("The error was: %s"), error->message);
>+			pk_warning ("%s", message);
>+			gpk_smart_icon_notify_new (notify->priv->sicon, _("Failed to update system"), message,
>+					      "process-stop", GPK_NOTIFY_URGENCY_LOW, GPK_NOTIFY_TIMEOUT_SHORT);
>+			g_free (message);
>+			gpk_smart_icon_notify_button (notify->priv->sicon, GPK_NOTIFY_BUTTON_DO_NOT_SHOW_AGAIN, GPK_CONF_NOTIFY_ERROR);
>+			gpk_smart_icon_notify_show (notify->priv->sicon);
>+		}
> 		g_error_free (error);
>-		gpk_smart_icon_notify_new (notify->priv->sicon, _("Failed to update system"), message,
>-				      "process-stop", GPK_NOTIFY_URGENCY_LOW, GPK_NOTIFY_TIMEOUT_SHORT);
>-		g_free (message);
>-		gpk_smart_icon_notify_button (notify->priv->sicon, GPK_NOTIFY_BUTTON_DO_NOT_SHOW_AGAIN, GPK_CONF_NOTIFY_ERROR);
>-		gpk_smart_icon_notify_show (notify->priv->sicon);
> 	}
> 	return ret;
> }
>@@ -539,7 +546,7 @@ gpk_notify_auto_update_message (GpkNotify *notify)
> 	g_return_if_fail (GPK_IS_NOTIFY (notify));
> 
> 	/* are we accepting notifications */
>-        value = gconf_client_get_bool (notify->priv->gconf_client, GPK_CONF_NOTIFY_MESSAGE, NULL);
>+        value = gconf_client_get_bool (notify->priv->gconf_client, GPK_CONF_NOTIFY_STARTED, NULL);
>         if (value == FALSE) {
>                 pk_debug ("not showing notification as prevented in gconf");
>                 return;

Actions: View | Diff

Attachments on bug 442398: 302387 | 302524