Attachment 299934 Details for Bug 439809 – what i've added to git

[patch] what i've added to git

gpk-watch-dont-show-second-bubble.patch (text/plain), 1.44 KB, created by Richard Hughes on 2008-04-01 17:59:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Richard Hughes

Created: 2008-04-01 17:59:14 UTC

Size: 1.44 KB

patch

obsolete

>commit 75847784a6c336a1ac7f9160cf5fe42e9b90aa77
>Author: Richard Hughes <richard@hughsie.com>
>Date:   Tue Apr 1 18:55:27 2008 +0100
>
>    only show the backup libnotify message if the client is not still active. fixes rh#439809
>
>diff --git a/src/gpk-watch.c b/src/gpk-watch.c
>index c6a4948..52120f3 100644
>--- a/src/gpk-watch.c
>+++ b/src/gpk-watch.c
>@@ -264,6 +264,7 @@ gpk_watch_finished_cb (PkClient *client, PkExitEnum exit, guint runtime, GpkWatc
> 	gboolean value;
> 	PkRoleEnum role;
> 	PkRestartEnum restart;
>+	GError *error = NULL;
> 	gchar *package_id;
> 	gchar *message = NULL;
> 	gchar *package;
>@@ -309,11 +310,23 @@ gpk_watch_finished_cb (PkClient *client, PkExitEnum exit, guint runtime, GpkWatc
> 
> 	/* are we accepting notifications */
> 	value = gconf_client_get_bool (watch->priv->gconf_client, PK_CONF_NOTIFY_COMPLETED, NULL);
>-	if (value == FALSE) {
>+	if (!value) {
> 		pk_debug ("not showing notification as prevented in gconf");
> 		return;
> 	}
> 
>+	/* is caller able to handle the messages itself? */
>+	ret = pk_client_is_caller_active (client, &value, &error);
>+	if (!ret) {
>+		pk_warning ("could not get caller active status: %s", error->message);
>+		g_error_free (error);
>+		return;
>+	}
>+	if (value) {
>+		pk_debug ("not showing notification as caller is still present");
>+		return;
>+	}
>+
> 	if (role == PK_ROLE_ENUM_REMOVE_PACKAGE) {
> 		package = pk_package_get_name (package_id);
> 		message = g_strdup_printf (_("Package '%s' has been removed"), package);
>

Actions: View | Diff

Attachments on bug 439809: 299934