applications/gnome-control-center
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

printers: Don't crash without system-config-printer

Browse source 
Fix error handling in addition of new printer.

https://bugzilla.gnome.org/show_bug.cgi?id=698642
This commit is contained in:
Marek Kasik 2013-04-24 13:03:22 +02:00
parent 01721eb622
commit 72d63e49d1
1 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
panels/printers/pp-new-printer.c
View file

@ -683,6 +683,7 @@ printer_add_async_scb (GObject *source_object,
GDBusConnection *bus;
GVariantBuilder array_builder;
GVariant *output;
gboolean cancelled = FALSE;
PPDName *ppd_item = NULL;
GError *error = NULL;
@ -698,15 +699,15 @@ printer_add_async_scb (GObject *source_object,
}
else
{
if (error->domain != G_IO_ERROR ||
error->code != G_IO_ERROR_CANCELLED)
cancelled = g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED);
if (!cancelled)
g_warning ("%s", error->message);
g_error_free (error);
g_clear_error (&error);
}
if (!error ||
error->domain != G_IO_ERROR ||
error->code != G_IO_ERROR_CANCELLED)
if (!cancelled)
{
if (ppd_item == NULL || ppd_item->ppd_match_level < PPD_EXACT_MATCH)
{