diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 5 | ||||
| -rw-r--r-- | gtk/gtkprinter.c | 11 |
3 files changed, 13 insertions, 8 deletions
@@ -1,5 +1,10 @@ 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> + * gtk/gtkpagesetupunixdialog.c (update_combo_sensitivity_from_printers): Remove spew. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 50092538b9..417c549d24 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,10 @@ 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> + * gtk/gtkpagesetupunixdialog.c (update_combo_sensitivity_from_printers): Remove spew. diff --git a/gtk/gtkprinter.c b/gtk/gtkprinter.c index 264a5084d3..dde0c5265b 100644 --- a/gtk/gtkprinter.c +++ b/gtk/gtkprinter.c @@ -52,6 +52,7 @@ struct _GtkPrinterPrivate gchar *state_message; gint job_count; + /* Not ref:ed, backend owns printer. */ GtkPrintBackend *backend; }; @@ -213,9 +214,6 @@ gtk_printer_finalize (GObject *object) g_free (printer->priv->state_message); 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) G_OBJECT_CLASS (gtk_printer_parent_class)->finalize (object); } @@ -235,7 +233,7 @@ gtk_printer_set_property (GObject *object, break; 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; 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_PRINT_BACKEND (backend)); - if (printer->priv->backend) - g_object_unref (printer->priv->backend); - - printer->priv->backend = g_object_ref (backend); + printer->priv->backend = backend; } /** |