diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2002-04-12 17:13:36 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2002-04-12 17:13:36 +0000 |
| commit | d0cf6ca86e0d4171dc8fdb97390b5f01be3af01c (patch) | |
| tree | 855183c9daf9a6d15a48668b653efe45ba30a023 /x11-themes | |
| parent | f18cbf2fa6e7c1d623750aaf72027bb6a6a395c1 (diff) | |
| download | ports-d0cf6ca86e0d4171dc8fdb97390b5f01be3af01c.tar.gz ports-d0cf6ca86e0d4171dc8fdb97390b5f01be3af01c.zip | |
Fix a resource leak in the GTK pixmap themes. Bump PORTREVISION.
PR: 36044 37022
Submitted by: Sascha Holzleiter <sascha@root-login.org>
Reviewed by: sobomax
Approved by: sobomax
Obtained from: gtk-engines CVS
Notes
Notes:
svn path=/head/; revision=57626
Diffstat (limited to 'x11-themes')
| -rw-r--r-- | x11-themes/gtk-engines/Makefile | 2 | ||||
| -rw-r--r-- | x11-themes/gtk-engines/files/patch-pixmap::pixmap_theme_draw.c | 74 | ||||
| -rw-r--r-- | x11-themes/gtk-engines2/Makefile | 2 | ||||
| -rw-r--r-- | x11-themes/gtk-engines2/files/patch-pixmap::pixmap_theme_draw.c | 74 |
4 files changed, 150 insertions, 2 deletions
diff --git a/x11-themes/gtk-engines/Makefile b/x11-themes/gtk-engines/Makefile index 1d778fa57eaf..3dcc75125ae7 100644 --- a/x11-themes/gtk-engines/Makefile +++ b/x11-themes/gtk-engines/Makefile @@ -7,7 +7,7 @@ PORTNAME= gtk-engines PORTVERSION= 0.12 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= stable/sources/gtk-engines diff --git a/x11-themes/gtk-engines/files/patch-pixmap::pixmap_theme_draw.c b/x11-themes/gtk-engines/files/patch-pixmap::pixmap_theme_draw.c new file mode 100644 index 000000000000..b3e522813d8b --- /dev/null +++ b/x11-themes/gtk-engines/files/patch-pixmap::pixmap_theme_draw.c @@ -0,0 +1,74 @@ +--- pixmap/pixmap_theme_draw.c.orig Mon Feb 7 03:33:43 2000 ++++ pixmap/pixmap_theme_draw.c Fri Apr 12 15:24:40 2002 +@@ -403,8 +403,9 @@ + gdk_gc_set_clip_origin(gc, 0, 0); + } + } +- gdk_imlib_free_pixmap(p); + } ++ if (p) ++ gdk_imlib_free_pixmap(p); + gdk_imlib_destroy_image(im); + } + } +@@ -467,8 +468,9 @@ + gdk_gc_set_clip_mask(gc, NULL); + gdk_gc_set_clip_origin(gc, 0, 0); + } +- gdk_imlib_free_pixmap(p); + } ++ if (p) ++ gdk_imlib_free_pixmap(p); + gdk_imlib_destroy_image(im); + } + +@@ -591,8 +593,9 @@ + gdk_gc_set_clip_mask(gc, NULL); + gdk_gc_set_clip_origin(gc, 0, 0); + } +- gdk_imlib_free_pixmap(p); + } ++ if (p) ++ gdk_imlib_free_pixmap(p); + gdk_imlib_destroy_image(im); + } + } +@@ -956,11 +959,13 @@ + gdk_gc_set_clip_mask(gc, NULL); + gdk_gc_set_clip_origin(gc, 0, 0); + } +- +- gdk_imlib_free_pixmap(p); +- gdk_imlib_free_pixmap(p1); +- gdk_imlib_free_pixmap(p2); + } ++ if (p) ++ gdk_imlib_free_pixmap(p); ++ if (p1) ++ gdk_imlib_free_pixmap(p1); ++ if (p2) ++ gdk_imlib_free_pixmap(p2); + gdk_imlib_destroy_image(im); + gdk_imlib_destroy_image(im1); + gdk_imlib_destroy_image(im2); +@@ -1202,11 +1207,15 @@ + gdk_gc_set_clip_mask(gc, NULL); + gdk_gc_set_clip_origin(gc, 0, 0); + } +- gdk_imlib_free_pixmap(p); +- gdk_imlib_free_pixmap(p1); +- gdk_imlib_free_pixmap(p2); +- gdk_imlib_free_pixmap(p3); + } ++ if (p) ++ gdk_imlib_free_pixmap(p); ++ if (p1) ++ gdk_imlib_free_pixmap(p1); ++ if (p2) ++ gdk_imlib_free_pixmap(p2); ++ if (p3) ++ gdk_imlib_free_pixmap(p3); + gdk_imlib_destroy_image(im); + gdk_imlib_destroy_image(im1); + gdk_imlib_destroy_image(im2); + diff --git a/x11-themes/gtk-engines2/Makefile b/x11-themes/gtk-engines2/Makefile index 1d778fa57eaf..3dcc75125ae7 100644 --- a/x11-themes/gtk-engines2/Makefile +++ b/x11-themes/gtk-engines2/Makefile @@ -7,7 +7,7 @@ PORTNAME= gtk-engines PORTVERSION= 0.12 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= stable/sources/gtk-engines diff --git a/x11-themes/gtk-engines2/files/patch-pixmap::pixmap_theme_draw.c b/x11-themes/gtk-engines2/files/patch-pixmap::pixmap_theme_draw.c new file mode 100644 index 000000000000..b3e522813d8b --- /dev/null +++ b/x11-themes/gtk-engines2/files/patch-pixmap::pixmap_theme_draw.c @@ -0,0 +1,74 @@ +--- pixmap/pixmap_theme_draw.c.orig Mon Feb 7 03:33:43 2000 ++++ pixmap/pixmap_theme_draw.c Fri Apr 12 15:24:40 2002 +@@ -403,8 +403,9 @@ + gdk_gc_set_clip_origin(gc, 0, 0); + } + } +- gdk_imlib_free_pixmap(p); + } ++ if (p) ++ gdk_imlib_free_pixmap(p); + gdk_imlib_destroy_image(im); + } + } +@@ -467,8 +468,9 @@ + gdk_gc_set_clip_mask(gc, NULL); + gdk_gc_set_clip_origin(gc, 0, 0); + } +- gdk_imlib_free_pixmap(p); + } ++ if (p) ++ gdk_imlib_free_pixmap(p); + gdk_imlib_destroy_image(im); + } + +@@ -591,8 +593,9 @@ + gdk_gc_set_clip_mask(gc, NULL); + gdk_gc_set_clip_origin(gc, 0, 0); + } +- gdk_imlib_free_pixmap(p); + } ++ if (p) ++ gdk_imlib_free_pixmap(p); + gdk_imlib_destroy_image(im); + } + } +@@ -956,11 +959,13 @@ + gdk_gc_set_clip_mask(gc, NULL); + gdk_gc_set_clip_origin(gc, 0, 0); + } +- +- gdk_imlib_free_pixmap(p); +- gdk_imlib_free_pixmap(p1); +- gdk_imlib_free_pixmap(p2); + } ++ if (p) ++ gdk_imlib_free_pixmap(p); ++ if (p1) ++ gdk_imlib_free_pixmap(p1); ++ if (p2) ++ gdk_imlib_free_pixmap(p2); + gdk_imlib_destroy_image(im); + gdk_imlib_destroy_image(im1); + gdk_imlib_destroy_image(im2); +@@ -1202,11 +1207,15 @@ + gdk_gc_set_clip_mask(gc, NULL); + gdk_gc_set_clip_origin(gc, 0, 0); + } +- gdk_imlib_free_pixmap(p); +- gdk_imlib_free_pixmap(p1); +- gdk_imlib_free_pixmap(p2); +- gdk_imlib_free_pixmap(p3); + } ++ if (p) ++ gdk_imlib_free_pixmap(p); ++ if (p1) ++ gdk_imlib_free_pixmap(p1); ++ if (p2) ++ gdk_imlib_free_pixmap(p2); ++ if (p3) ++ gdk_imlib_free_pixmap(p3); + gdk_imlib_destroy_image(im); + gdk_imlib_destroy_image(im1); + gdk_imlib_destroy_image(im2); + |