AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Bug 531008 – Crash in gtkprintunixdialog.c

Browse Source 
* gtk/gtkprintunixdialog.c: Disconnect signal handlers when
        the dialog closes. Patch by Yevgen Muntyan.


svn path=/trunk/; revision=20186
This commit is contained in:
Matthias Clasen 2008-05-27 04:48:31 +00:00
parent fd5035c2bd
commit 3f26314d0f
2 changed files with 30 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2008-05-27 Matthias Clasen <mclasen@redhat.com>
Bug 531008 – Crash in gtkprintunixdialog.c
* gtk/gtkprintunixdialog.c: Disconnect signal handlers when
the dialog closes. Patch by Yevgen Muntyan.
2008-05-27 Matthias Clasen <mclasen@redhat.com>
RH bug 248245: cups client printing from gnome applications fail

34
gtk/gtkprintunixdialog.c
View File

@ -195,6 +195,7 @@ struct GtkPrintUnixDialogPrivate
GList *print_backends;
GtkPrinter *current_printer;
GtkPrinter *request_details_printer;
guint request_details_tag;
GtkPrinterOptionSet *options;
gulong options_changed_handler;
@ -449,6 +450,21 @@ gtk_print_unix_dialog_destroy (GtkPrintUnixDialog *dialog)
clear_per_printer_ui (dialog);
}
static void
disconnect_printer_details_request (GtkPrintUnixDialog *dialog)
{
GtkPrintUnixDialogPrivate *priv = dialog->priv;
if (priv->request_details_tag)
{
g_signal_handler_disconnect (priv->request_details_printer,
priv->request_details_tag);
priv->request_details_tag = 0;
g_object_unref (priv->request_details_printer);
priv->request_details_printer = NULL;
}
}
static void
gtk_print_unix_dialog_finalize (GObject *object)
{
@ -458,12 +474,7 @@ gtk_print_unix_dialog_finalize (GObject *object)
GList *node;
unschedule_idle_mark_conflicts (dialog);
if (priv->request_details_tag)
{
g_source_remove (priv->request_details_tag);
priv->request_details_tag = 0;
}
disconnect_printer_details_request (dialog);
if (priv->current_printer)
{
@ -1358,7 +1369,7 @@ printer_details_acquired (GtkPrinter *printer,
{
GtkPrintUnixDialogPrivate *priv = dialog->priv;
priv->request_details_tag = 0;
disconnect_printer_details_request (dialog);
if (success)
{
@ -1386,11 +1397,7 @@ selected_printer_changed (GtkTreeSelection *selection,
priv->waiting_for_printer = NULL;
}
if (priv->request_details_tag)
{
g_source_remove (priv->request_details_tag);
priv->request_details_tag = 0;
}
disconnect_printer_details_request (dialog);
printer = NULL;
if (gtk_tree_selection_get_selected (selection, NULL, &filter_iter))
@ -1410,8 +1417,9 @@ selected_printer_changed (GtkTreeSelection *selection,
priv->request_details_tag =
g_signal_connect (printer, "details-acquired",
G_CALLBACK (printer_details_acquired), dialog);
/* take the reference */
priv->request_details_printer = printer;
gtk_printer_request_details (printer);
g_object_unref (printer);
return;
}