rpms/bluez/F-11 cups-less-errors.patch,NONE,1.1
Bastien Nocera
hadess at fedoraproject.org
Wed Jun 24 14:24:33 UTC 2009
Author: hadess
Update of /cvs/pkgs/rpms/bluez/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14713
Added Files:
cups-less-errors.patch
Log Message:
* Wed Jun 24 2009 Bastien Nocera <bnocera at redhat.com> 4.37-4
- Reduce the number of errors from CUPS when bluetoothd
isn't running, or there's no adapters (#507572)
cups-less-errors.patch:
--- NEW FILE cups-less-errors.patch ---
diff --git a/cups/main.c b/cups/main.c
index 6dcc622..2fbfe7e 100644
--- a/cups/main.c
+++ b/cups/main.c
@@ -536,15 +536,15 @@ static gboolean list_printers(void)
conn = g_dbus_setup_bus(DBUS_BUS_SYSTEM, NULL, NULL);
if (conn == NULL)
- return FALSE;
+ return TRUE;
dbus_error_init(&error);
hcid_exists = dbus_bus_name_has_owner(conn, "org.bluez", &error);
if (&error != NULL && dbus_error_is_set(&error))
- return FALSE;
+ return TRUE;
if (!hcid_exists)
- return FALSE;
+ return TRUE;
/* Get the default adapter */
message = dbus_message_new_method_call("org.bluez", "/",
@@ -562,7 +562,8 @@ static gboolean list_printers(void)
if (&error != NULL && dbus_error_is_set(&error)) {
dbus_connection_unref(conn);
- return FALSE;
+ /* No adapter */
+ return TRUE;
}
dbus_message_iter_init(reply, &reply_iter);
More information about the fedora-extras-commits
mailing list