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

Always register the type with the type module, even if it had been

Browse Source 
2006-05-05  Christian Persch  <chpe@cvs.gnome.org>

	* modules/printbackends/cups/gtkprintbackendcups.c:
	* modules/printbackends/lpr/gtkprintbackendlpr.c:
	* modules/printbackends/pdf/gtkprintbackendpdf.c: Always register
	  the type with the type module, even if it had been registered
	  before. Fixes bug #340676.
This commit is contained in:
Christian Persch 2006-05-05 20:22:27 +00:00 committed by Christian Persch
parent 46b497b493
commit 9ef568468e
5 changed files with 64 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2006-05-05 Christian Persch <chpe@cvs.gnome.org>
* modules/printbackends/cups/gtkprintbackendcups.c:
* modules/printbackends/lpr/gtkprintbackendlpr.c:
* modules/printbackends/pdf/gtkprintbackendpdf.c: Always register
the type with the type module, even if it had been registered
before. Fixes bug #340676.
2006-05-05 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkprintunixdialog.c: Use theme colors for

8
ChangeLog.pre-2-10
View File

@ -1,3 +1,11 @@
2006-05-05 Christian Persch <chpe@cvs.gnome.org>
* modules/printbackends/cups/gtkprintbackendcups.c:
* modules/printbackends/lpr/gtkprintbackendlpr.c:
* modules/printbackends/pdf/gtkprintbackendpdf.c: Always register
the type with the type module, even if it had been registered
before. Fixes bug #340676.
2006-05-05 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkprintunixdialog.c: Use theme colors for

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

@ -158,26 +158,23 @@ static cairo_surface_t * cups_printer_create_cairo_surface (GtkPrinter
static void
gtk_print_backend_cups_register_type (GTypeModule *module)
{
if (!print_backend_cups_type)
{
static const GTypeInfo print_backend_cups_info =
{
sizeof (GtkPrintBackendCupsClass),
NULL, /* base_init */
NULL, /* base_finalize */
(GClassInitFunc) gtk_print_backend_cups_class_init,
NULL, /* class_finalize */
NULL, /* class_data */
sizeof (GtkPrintBackendCups),
0, /* n_preallocs */
(GInstanceInitFunc) gtk_print_backend_cups_init
};
static const GTypeInfo print_backend_cups_info =
{
sizeof (GtkPrintBackendCupsClass),
NULL, /* base_init */
NULL, /* base_finalize */
(GClassInitFunc) gtk_print_backend_cups_class_init,
NULL, /* class_finalize */
NULL, /* class_data */
sizeof (GtkPrintBackendCups),
0, /* n_preallocs */
(GInstanceInitFunc) gtk_print_backend_cups_init
};
print_backend_cups_type = g_type_module_register_type (module,
GTK_TYPE_PRINT_BACKEND,
"GtkPrintBackendCups",
&print_backend_cups_info, 0);
}
print_backend_cups_type = g_type_module_register_type (module,
GTK_TYPE_PRINT_BACKEND,
"GtkPrintBackendCups",
&print_backend_cups_info, 0);
}
G_MODULE_EXPORT void

35
modules/printbackends/lpr/gtkprintbackendlpr.c
View File

@ -96,26 +96,23 @@ static void gtk_print_backend_lpr_print_stream (GtkPrintBacke
static void
gtk_print_backend_lpr_register_type (GTypeModule *module)
{
if (!print_backend_lpr_type)
{
static const GTypeInfo print_backend_lpr_info =
{
sizeof (GtkPrintBackendLprClass),
NULL, /* base_init */
NULL, /* base_finalize */
(GClassInitFunc) gtk_print_backend_lpr_class_init,
NULL, /* class_finalize */
NULL, /* class_data */
sizeof (GtkPrintBackendLpr),
0, /* n_preallocs */
(GInstanceInitFunc) gtk_print_backend_lpr_init,
};
static const GTypeInfo print_backend_lpr_info =
{
sizeof (GtkPrintBackendLprClass),
NULL, /* base_init */
NULL, /* base_finalize */
(GClassInitFunc) gtk_print_backend_lpr_class_init,
NULL, /* class_finalize */
NULL, /* class_data */
sizeof (GtkPrintBackendLpr),
0, /* n_preallocs */
(GInstanceInitFunc) gtk_print_backend_lpr_init,
};
print_backend_lpr_type = g_type_module_register_type (module,
GTK_TYPE_PRINT_BACKEND,
"GtkPrintBackendLpr",
&print_backend_lpr_info, 0);
}
print_backend_lpr_type = g_type_module_register_type (module,
GTK_TYPE_PRINT_BACKEND,
"GtkPrintBackendLpr",
&print_backend_lpr_info, 0);
}
G_MODULE_EXPORT void

35
modules/printbackends/pdf/gtkprintbackendpdf.c
View File

@ -97,26 +97,23 @@ static cairo_surface_t * pdf_printer_create_cairo_surface (GtkPrinter
static void
gtk_print_backend_pdf_register_type (GTypeModule *module)
{
if (!print_backend_pdf_type)
{
static const GTypeInfo print_backend_pdf_info =
{
sizeof (GtkPrintBackendPdfClass),
NULL, /* base_init */
NULL, /* base_finalize */
(GClassInitFunc) gtk_print_backend_pdf_class_init,
NULL, /* class_finalize */
NULL, /* class_data */
sizeof (GtkPrintBackendPdf),
0, /* n_preallocs */
(GInstanceInitFunc) gtk_print_backend_pdf_init,
};
static const GTypeInfo print_backend_pdf_info =
{
sizeof (GtkPrintBackendPdfClass),
NULL, /* base_init */
NULL, /* base_finalize */
(GClassInitFunc) gtk_print_backend_pdf_class_init,
NULL, /* class_finalize */
NULL, /* class_data */
sizeof (GtkPrintBackendPdf),
0, /* n_preallocs */
(GInstanceInitFunc) gtk_print_backend_pdf_init,
};
print_backend_pdf_type = g_type_module_register_type (module,
GTK_TYPE_PRINT_BACKEND,
"GtkPrintBackendPdf",
&print_backend_pdf_info, 0);
}
print_backend_pdf_type = g_type_module_register_type (module,
GTK_TYPE_PRINT_BACKEND,
"GtkPrintBackendPdf",
&print_backend_pdf_info, 0);
}
G_MODULE_EXPORT void