[gnome-packagekit/gnome-2-30] Ensure we process font requests by correctly processing the session ignore blacklist
- From: Richard Hughes <rhughes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-packagekit/gnome-2-30] Ensure we process font requests by correctly processing the session ignore blacklist
- Date: Wed, 7 Apr 2010 08:59:22 +0000 (UTC)
commit ef22a5dcdd9a4f1fe9f7b470be77c3783b570787
Author: Richard Hughes <richard hughsie com>
Date: Tue Apr 6 16:24:54 2010 +0100
Ensure we process font requests by correctly processing the session ignore blacklist
src/gpk-dbus-task.c | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/src/gpk-dbus-task.c b/src/gpk-dbus-task.c
index 3ba46c5..6dc9101 100644
--- a/src/gpk-dbus-task.c
+++ b/src/gpk-dbus-task.c
@@ -2141,25 +2141,31 @@ out:
/**
* gpk_dbus_task_install_check_exec_ignored:
+ *
+ * Returns %FALSE if the executed program is in the ignored list.
**/
static gboolean
gpk_dbus_task_install_check_exec_ignored (GpkDbusTask *dtask)
{
gchar *ignored_str;
gchar **ignored = NULL;
- gboolean ret = FALSE;
+ gboolean ret = TRUE;
+ GError *error = NULL;
guint i;
/* check it's not session wide banned in gconf */
- ignored_str = gconf_client_get_string (dtask->priv->gconf_client, GPK_CONF_IGNORED_DBUS_REQUESTS, NULL);
- if (ignored_str == NULL)
+ ignored_str = gconf_client_get_string (dtask->priv->gconf_client, GPK_CONF_IGNORED_DBUS_REQUESTS, &error);
+ if (ignored_str == NULL) {
+ egg_warning ("failed to get ignored requests: %s", error->message);
+ g_error_free (error);
goto out;
+ }
/* check each one */
ignored = g_strsplit (ignored_str, ",", -1);
for (i=0; ignored[i] != NULL; i++) {
if (g_strcmp0 (dtask->priv->exec, ignored[i]) == 0) {
- ret = TRUE;
+ ret = FALSE;
break;
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]