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

Use GSlice to allocate GtkPaperSize. Bug #434862.

Browse Source 
2007-05-02  Christian Persch  <chpe@gnome.org>

	* gtk/gtkpapersize.c: (gtk_paper_size_new_from_info),
	(gtk_paper_size_new), (gtk_paper_size_new_custom),
	(gtk_paper_size_copy), (gtk_paper_size_free): Use GSlice to allocate
	GtkPaperSize. Bug #434862.

svn path=/trunk/; revision=17759
This commit is contained in:
Christian Persch 2007-05-01 22:26:00 +00:00 committed by Christian Persch
parent f55cccb696
commit 014994ce96
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2007-05-02 Christian Persch <chpe@gnome.org>
* gtk/gtkpapersize.c: (gtk_paper_size_new_from_info),
(gtk_paper_size_new), (gtk_paper_size_new_custom),
(gtk_paper_size_copy), (gtk_paper_size_free): Use GSlice to allocate
GtkPaperSize. Bug #434862.
2007-05-02 Christian Persch <chpe@gnome.org> 2007-05-02 Christian Persch <chpe@gnome.org>
* gtk/gtkstatusbar.c: (gtk_statusbar_get_context_id), * gtk/gtkstatusbar.c: (gtk_statusbar_get_context_id),

14
gtk/gtkpapersize.c
View File

@ -1,6 +1,7 @@
/* GTK - The GIMP Toolkit /* GTK - The GIMP Toolkit
* gtkpapersize.c: Paper Size * gtkpapersize.c: Paper Size
* Copyright (C) 2006, Red Hat, Inc. * Copyright (C) 2006, Red Hat, Inc.
* Copyright © 2006, 2007 Christian Persch
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
@ -180,7 +181,7 @@ gtk_paper_size_new_from_info (const PaperInfo *info)
{ {
GtkPaperSize *size; GtkPaperSize *size;
size = g_new0 (GtkPaperSize, 1); size = g_slice_new0 (GtkPaperSize);
size->info = info; size->info = info;
size->width = info->width; size->width = info->width;
size->height = info->height; size->height = info->height;
@ -217,7 +218,7 @@ gtk_paper_size_new (const gchar *name)
if (parse_full_media_size_name (name, &short_name, &width, &height)) if (parse_full_media_size_name (name, &short_name, &width, &height))
{ {
size = g_new0 (GtkPaperSize, 1); size = g_slice_new0 (GtkPaperSize);
size->width = width; size->width = width;
size->height = height; size->height = height;
@ -234,7 +235,7 @@ gtk_paper_size_new (const gchar *name)
else else
{ {
g_warning ("Unknown paper size %s\n", name); g_warning ("Unknown paper size %s\n", name);
size = g_new0 (GtkPaperSize, 1); size = g_slice_new0 (GtkPaperSize);
size->name = g_strdup (name); size->name = g_strdup (name);
size->display_name = g_strdup (name); size->display_name = g_strdup (name);
/* Default to A4 size */ /* Default to A4 size */
@ -349,7 +350,7 @@ gtk_paper_size_new_custom (const gchar *name,
g_return_val_if_fail (name != NULL, NULL); g_return_val_if_fail (name != NULL, NULL);
g_return_val_if_fail (unit != GTK_UNIT_PIXEL, NULL); g_return_val_if_fail (unit != GTK_UNIT_PIXEL, NULL);
size = g_new0 (GtkPaperSize, 1); size = g_slice_new0 (GtkPaperSize);
size->name = g_strdup (name); size->name = g_strdup (name);
size->display_name = g_strdup (display_name); size->display_name = g_strdup (display_name);
@ -376,7 +377,7 @@ gtk_paper_size_copy (GtkPaperSize *other)
{ {
GtkPaperSize *size; GtkPaperSize *size;
size = g_new0 (GtkPaperSize, 1); size = g_slice_new0 (GtkPaperSize);
size->info = other->info; size->info = other->info;
if (other->name) if (other->name)
@ -407,7 +408,8 @@ gtk_paper_size_free (GtkPaperSize *size)
g_free (size->name); g_free (size->name);
g_free (size->display_name); g_free (size->display_name);
g_free (size->ppd_name); g_free (size->ppd_name);
g_free (size);
g_slice_free (GtkPaperSize, size);
} }
/** /**