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

gdk/gdkcolor.c (gdk_colormap_new) Fix memory leak: colormap->colors was

Browse Source 
1999-09-14  Tor Lillqvist  <tml@iki.fi>

* gdk/gdkcolor.c (gdk_colormap_new)
* gdk/win32/gdkcolor.c (gdk_colormap_new): Fix memory leak:
colormap->colors was allocated twice.

* gdk/win32/gdk.c: Remove some unused stuff.

* gdk/win32/gdkcolor.c (gdk_colormap_sync): Initialize all of the
colormap.

* gtk/gtkfontsel.c (gtk_font_selection_dialog_get_type)
* gtk/gtklabel.h (gtk_label_get_type)
* gtk/gtktipsquery.c (gtk_tips_query_get_type)
* gtk/gtktypeutils.h (gtk_type_name): : Use GtkType
in a couple of places, not guint.
This commit is contained in:
Tor Lillqvist
1999-09-13 22:06:11 +00:00
committed by Tor Lillqvist
parent ad8f893e60
commit 04f5c2a1e7
17 changed files with 139 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
ChangeLog
View File

@ -1,3 +1,20 @@
1999-09-14 Tor Lillqvist <tml@iki.fi>
* gdk/gdkcolor.c (gdk_colormap_new)
* gdk/win32/gdkcolor.c (gdk_colormap_new): Fix memory leak:
colormap->colors was allocated twice.
* gdk/win32/gdk.c: Remove some unused stuff.
* gdk/win32/gdkcolor.c (gdk_colormap_sync): Initialize all of the
colormap.
* gtk/gtkfontsel.c (gtk_font_selection_dialog_get_type)
* gtk/gtklabel.h (gtk_label_get_type)
* gtk/gtktipsquery.c (gtk_tips_query_get_type)
* gtk/gtktypeutils.h (gtk_type_name): : Use GtkType
in a couple of places, not guint.
Fri Sep 10 21:31:00 CEST 1999 Pablo Saratxaga <pablo@mandrakesoft.com>
* configure.in,po/et.po: added Estonian language file

17
ChangeLog.pre-2-0
View File

@ -1,3 +1,20 @@
1999-09-14 Tor Lillqvist <tml@iki.fi>
* gdk/gdkcolor.c (gdk_colormap_new)
* gdk/win32/gdkcolor.c (gdk_colormap_new): Fix memory leak:
colormap->colors was allocated twice.
* gdk/win32/gdk.c: Remove some unused stuff.
* gdk/win32/gdkcolor.c (gdk_colormap_sync): Initialize all of the
colormap.
* gtk/gtkfontsel.c (gtk_font_selection_dialog_get_type)
* gtk/gtklabel.h (gtk_label_get_type)
* gtk/gtktipsquery.c (gtk_tips_query_get_type)
* gtk/gtktypeutils.h (gtk_type_name): : Use GtkType
in a couple of places, not guint.
Fri Sep 10 21:31:00 CEST 1999 Pablo Saratxaga <pablo@mandrakesoft.com>
* configure.in,po/et.po: added Estonian language file

17
ChangeLog.pre-2-10
View File

@ -1,3 +1,20 @@
1999-09-14 Tor Lillqvist <tml@iki.fi>
* gdk/gdkcolor.c (gdk_colormap_new)
* gdk/win32/gdkcolor.c (gdk_colormap_new): Fix memory leak:
colormap->colors was allocated twice.
* gdk/win32/gdk.c: Remove some unused stuff.
* gdk/win32/gdkcolor.c (gdk_colormap_sync): Initialize all of the
colormap.
* gtk/gtkfontsel.c (gtk_font_selection_dialog_get_type)
* gtk/gtklabel.h (gtk_label_get_type)
* gtk/gtktipsquery.c (gtk_tips_query_get_type)
* gtk/gtktypeutils.h (gtk_type_name): : Use GtkType
in a couple of places, not guint.
Fri Sep 10 21:31:00 CEST 1999 Pablo Saratxaga <pablo@mandrakesoft.com>
* configure.in,po/et.po: added Estonian language file

17
ChangeLog.pre-2-2
View File

@ -1,3 +1,20 @@
1999-09-14 Tor Lillqvist <tml@iki.fi>
* gdk/gdkcolor.c (gdk_colormap_new)
* gdk/win32/gdkcolor.c (gdk_colormap_new): Fix memory leak:
colormap->colors was allocated twice.
* gdk/win32/gdk.c: Remove some unused stuff.
* gdk/win32/gdkcolor.c (gdk_colormap_sync): Initialize all of the
colormap.
* gtk/gtkfontsel.c (gtk_font_selection_dialog_get_type)
* gtk/gtklabel.h (gtk_label_get_type)
* gtk/gtktipsquery.c (gtk_tips_query_get_type)
* gtk/gtktypeutils.h (gtk_type_name): : Use GtkType
in a couple of places, not guint.
Fri Sep 10 21:31:00 CEST 1999 Pablo Saratxaga <pablo@mandrakesoft.com>
* configure.in,po/et.po: added Estonian language file

17
ChangeLog.pre-2-4
View File

@ -1,3 +1,20 @@
1999-09-14 Tor Lillqvist <tml@iki.fi>
* gdk/gdkcolor.c (gdk_colormap_new)
* gdk/win32/gdkcolor.c (gdk_colormap_new): Fix memory leak:
colormap->colors was allocated twice.
* gdk/win32/gdk.c: Remove some unused stuff.
* gdk/win32/gdkcolor.c (gdk_colormap_sync): Initialize all of the
colormap.
* gtk/gtkfontsel.c (gtk_font_selection_dialog_get_type)
* gtk/gtklabel.h (gtk_label_get_type)
* gtk/gtktipsquery.c (gtk_tips_query_get_type)
* gtk/gtktypeutils.h (gtk_type_name): : Use GtkType
in a couple of places, not guint.
Fri Sep 10 21:31:00 CEST 1999 Pablo Saratxaga <pablo@mandrakesoft.com>
* configure.in,po/et.po: added Estonian language file

17
ChangeLog.pre-2-6
View File

@ -1,3 +1,20 @@
1999-09-14 Tor Lillqvist <tml@iki.fi>
* gdk/gdkcolor.c (gdk_colormap_new)
* gdk/win32/gdkcolor.c (gdk_colormap_new): Fix memory leak:
colormap->colors was allocated twice.
* gdk/win32/gdk.c: Remove some unused stuff.
* gdk/win32/gdkcolor.c (gdk_colormap_sync): Initialize all of the
colormap.
* gtk/gtkfontsel.c (gtk_font_selection_dialog_get_type)
* gtk/gtklabel.h (gtk_label_get_type)
* gtk/gtktipsquery.c (gtk_tips_query_get_type)
* gtk/gtktypeutils.h (gtk_type_name): : Use GtkType
in a couple of places, not guint.
Fri Sep 10 21:31:00 CEST 1999 Pablo Saratxaga <pablo@mandrakesoft.com>
* configure.in,po/et.po: added Estonian language file

17
ChangeLog.pre-2-8
View File

@ -1,3 +1,20 @@
1999-09-14 Tor Lillqvist <tml@iki.fi>
* gdk/gdkcolor.c (gdk_colormap_new)
* gdk/win32/gdkcolor.c (gdk_colormap_new): Fix memory leak:
colormap->colors was allocated twice.
* gdk/win32/gdk.c: Remove some unused stuff.
* gdk/win32/gdkcolor.c (gdk_colormap_sync): Initialize all of the
colormap.
* gtk/gtkfontsel.c (gtk_font_selection_dialog_get_type)
* gtk/gtklabel.h (gtk_label_get_type)
* gtk/gtktipsquery.c (gtk_tips_query_get_type)
* gtk/gtktypeutils.h (gtk_type_name): : Use GtkType
in a couple of places, not guint.
Fri Sep 10 21:31:00 CEST 1999 Pablo Saratxaga <pablo@mandrakesoft.com>
* configure.in,po/et.po: added Estonian language file

1
gdk/gdkcolor.c
View File

@ -77,7 +77,6 @@ gdk_colormap_new (GdkVisual *visual,
case GDK_VISUAL_GRAYSCALE:
case GDK_VISUAL_PSEUDO_COLOR:
private->info = g_new0 (GdkColorInfo, colormap->size);
colormap->colors = g_new (GdkColor, colormap->size);
private->hash = g_hash_table_new ((GHashFunc) gdk_color_hash,
(GCompareFunc) gdk_color_equal);

3
gdk/win32/gdk.c
View File

@ -46,8 +46,6 @@ static void gdkx_XConvertCase (KeySym symbol,
static void gdk_exit_func (void);
static RETSIGTYPE gdk_signal (int signum);
/* Private variable declarations
*/
@ -112,7 +110,6 @@ gboolean
gdk_init_check (int *argc,
char ***argv)
{
HRESULT hres;
gint i, j, k;
if (gdk_initialized)

9
gdk/win32/gdkcolor-win32.c
View File

@ -1349,7 +1349,6 @@ gdk_colormap_new (GdkVisual *visual,
case GDK_VISUAL_GRAYSCALE:
case GDK_VISUAL_PSEUDO_COLOR:
private->info = g_new0 (GdkColorInfo, colormap->size);
colormap->colors = g_new (GdkColor, colormap->size);
private->hash = g_hash_table_new ((GHashFunc) gdk_color_hash,
(GCompareFunc) gdk_color_equal);
@ -1487,6 +1486,14 @@ gdk_colormap_sync (GdkColormap *colormap,
colormap->colors[i].blue = (xpalette[i].peBlue * 65535) / 255;
}
for ( ; i < colormap->size; i++)
{
colormap->colors[i].pixel = i;
colormap->colors[i].red = 0;
colormap->colors[i].green = 0;
colormap->colors[i].blue = 0;
}
g_free (xpalette);
}

9
gdk/win32/gdkcolor.c
View File

@ -1349,7 +1349,6 @@ gdk_colormap_new (GdkVisual *visual,
case GDK_VISUAL_GRAYSCALE:
case GDK_VISUAL_PSEUDO_COLOR:
private->info = g_new0 (GdkColorInfo, colormap->size);
colormap->colors = g_new (GdkColor, colormap->size);
private->hash = g_hash_table_new ((GHashFunc) gdk_color_hash,
(GCompareFunc) gdk_color_equal);
@ -1487,6 +1486,14 @@ gdk_colormap_sync (GdkColormap *colormap,
colormap->colors[i].blue = (xpalette[i].peBlue * 65535) / 255;
}
for ( ; i < colormap->size; i++)
{
colormap->colors[i].pixel = i;
colormap->colors[i].red = 0;
colormap->colors[i].green = 0;
colormap->colors[i].blue = 0;
}
g_free (xpalette);
}

3
gdk/win32/gdkmain-win32.c
View File

@ -46,8 +46,6 @@ static void gdkx_XConvertCase (KeySym symbol,
static void gdk_exit_func (void);
static RETSIGTYPE gdk_signal (int signum);
/* Private variable declarations
*/
@ -112,7 +110,6 @@ gboolean
gdk_init_check (int *argc,
char ***argv)
{
HRESULT hres;
gint i, j, k;
if (gdk_initialized)

1
gdk/x11/gdkcolor-x11.c
View File

@ -77,7 +77,6 @@ gdk_colormap_new (GdkVisual *visual,
case GDK_VISUAL_GRAYSCALE:
case GDK_VISUAL_PSEUDO_COLOR:
private->info = g_new0 (GdkColorInfo, colormap->size);
colormap->colors = g_new (GdkColor, colormap->size);
private->hash = g_hash_table_new ((GHashFunc) gdk_color_hash,
(GCompareFunc) gdk_color_equal);

2
gtk/gtkfontsel.c
View File

@ -3652,7 +3652,7 @@ gtk_font_selection_create_xlfd (gint size,
* GtkFontSelectionDialog
*****************************************************************************/
guint
GtkType
gtk_font_selection_dialog_get_type (void)
{
static guint font_selection_dialog_type = 0;

2
gtk/gtklabel.h
View File

@ -69,7 +69,7 @@ struct _GtkLabelClass
};
guint gtk_label_get_type (void);
GtkType gtk_label_get_type (void);
GtkWidget* gtk_label_new (const char *str);
void gtk_label_set_text (GtkLabel *label,
const char *str);

2
gtk/gtktipsquery.c
View File

@ -81,7 +81,7 @@ static guint tips_query_signals[SIGNAL_LAST] = { 0 };
/* --- functions --- */
guint
GtkType
gtk_tips_query_get_type (void)
{
static guint tips_query_type = 0;

2
gtk/gtktypeutils.h
View File

@ -333,7 +333,7 @@ GtkType gtk_type_unique (GtkType parent_type,
const GtkTypeInfo *type_info);
void gtk_type_set_chunk_alloc (GtkType type,
guint n_chunks);
gchar* gtk_type_name (guint type);
gchar* gtk_type_name (GtkType type);
GtkType gtk_type_from_name (const gchar *name);
GtkType gtk_type_parent (GtkType type);
gpointer gtk_type_class (GtkType type);