callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't ref the backend since the backend owns the printer.

Browse Source 
2006-04-24  Alexander Larsson  <alexl@redhat.com>

	* gtk/gtkprinter.c:
	Don't ref the backend since the backend owns the printer.
This commit is contained in:
Alexander Larsson
2006-04-24 16:18:05 +00:00
committed by Alexander Larsson
parent 5ead07e1b2
commit 7261cff2d7
3 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2006-04-24 Alexander Larsson <alexl@redhat.com>
* gtk/gtkprinter.c:
Don't ref the backend since the backend owns the printer.
2006-04-24 Alexander Larsson <alexl@redhat.com> 2006-04-24 Alexander Larsson <alexl@redhat.com>
* gtk/gtkpagesetupunixdialog.c (update_combo_sensitivity_from_printers): * gtk/gtkpagesetupunixdialog.c (update_combo_sensitivity_from_printers):

5
ChangeLog.pre-2-10
View File

@ -1,3 +1,8 @@
2006-04-24 Alexander Larsson <alexl@redhat.com>
* gtk/gtkprinter.c:
Don't ref the backend since the backend owns the printer.
2006-04-24 Alexander Larsson <alexl@redhat.com> 2006-04-24 Alexander Larsson <alexl@redhat.com>
* gtk/gtkpagesetupunixdialog.c (update_combo_sensitivity_from_printers): * gtk/gtkpagesetupunixdialog.c (update_combo_sensitivity_from_printers):

11
gtk/gtkprinter.c
View File

@ -52,6 +52,7 @@ struct _GtkPrinterPrivate
gchar *state_message; gchar *state_message;
gint job_count; gint job_count;
/* Not ref:ed, backend owns printer. */
GtkPrintBackend *backend; GtkPrintBackend *backend;
}; };
@ -213,9 +214,6 @@ gtk_printer_finalize (GObject *object)
g_free (printer->priv->state_message); g_free (printer->priv->state_message);
g_free (printer->priv->icon_name); g_free (printer->priv->icon_name);
if (printer->priv->backend)
g_object_unref (printer->priv->backend);
if (G_OBJECT_CLASS (gtk_printer_parent_class)->finalize) if (G_OBJECT_CLASS (gtk_printer_parent_class)->finalize)
G_OBJECT_CLASS (gtk_printer_parent_class)->finalize (object); G_OBJECT_CLASS (gtk_printer_parent_class)->finalize (object);
} }
@ -235,7 +233,7 @@ gtk_printer_set_property (GObject *object,
break; break;
case PROP_BACKEND: case PROP_BACKEND:
printer->priv->backend = GTK_PRINT_BACKEND (g_value_dup_object (value)); printer->priv->backend = GTK_PRINT_BACKEND (g_value_get_object (value));
break; break;
case PROP_IS_VIRTUAL: case PROP_IS_VIRTUAL:
@ -347,10 +345,7 @@ gtk_printer_set_backend (GtkPrinter *printer,
g_return_if_fail (GTK_IS_PRINTER (printer)); g_return_if_fail (GTK_IS_PRINTER (printer));
g_return_if_fail (GTK_IS_PRINT_BACKEND (backend)); g_return_if_fail (GTK_IS_PRINT_BACKEND (backend));
if (printer->priv->backend) printer->priv->backend = backend;
g_object_unref (printer->priv->backend);
printer->priv->backend = g_object_ref (backend);
} }
/** /**