Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

printing: Don't crash because of missing g_clear_pointer()

Browse Source 
g_clear_pointer() is not available in glib-2.28 which is minimal
required version for gtk+-2.24.

https://bugzilla.gnome.org/show_bug.cgi?id=708783
This commit is contained in:
Marek Kasik
2014-03-12 10:52:05 +01:00
committed by Matthias Clasen
parent c5561f7e8c
commit e84bb08ded
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
modules/printbackends/cups/gtkprintbackendcups.c
View File

@@ -815,7 +815,8 @@ gtk_print_backend_cups_finalize (GObject *object)
#ifdef HAVE_CUPS_API_1_6
g_clear_object (&backend_cups->avahi_cancellable);
g_clear_pointer (&backend_cups->avahi_default_printer, g_free);
g_free (backend_cups->avahi_default_printer);
backend_cups->avahi_default_printer = NULL;
g_clear_object (&backend_cups->dbus_connection);
#endif
@@ -870,7 +871,8 @@ gtk_print_backend_cups_dispose (GObject *object)
NULL,
NULL,
NULL);
g_clear_pointer (&backend_cups->avahi_service_browser_paths[i], g_free);
g_free (backend_cups->avahi_service_browser_paths[i]);
backend_cups->avahi_service_browser_paths[i] = NULL;
}
}
@@ -2819,7 +2821,10 @@ avahi_service_browser_signal_handler (GDBusConnection *connection,
{
if (g_strcmp0 (gtk_printer_get_name (GTK_PRINTER (printer)),
backend->avahi_default_printer) == 0)
g_clear_pointer (&backend->avahi_default_printer, g_free);
{
g_free (backend->avahi_default_printer);
backend->avahi_default_printer = NULL;
}
g_signal_emit_by_name (backend, "printer-removed", printer);
gtk_print_backend_remove_printer (GTK_PRINT_BACKEND (backend),