adding rsl ebuild, gtk suppressions for valgrind

[grits] / src / plugin-ridge.c

diff --git a/src/plugin-ridge.c b/src/plugin-ridge.c
index ea6068a8272726803f97a36ac53d2ead8f7b506e..77bffe93a488a0c54876a02e610f00efadd656f7 100644 (file)
--- a/src/plugin-ridge.c
+++ b/src/plugin-ridge.c
@@ -43,11 +43,11 @@ typedef struct {
 } layer_t;
 
 static layer_t layers[] = {
-       [LAYER_TOPO]     = { "Topo",     "Overlays/" "Topo/"     "Short/" "%s_Topo_Short.jpg",     TRUE,  1, 0 },
-       [LAYER_COUNTY]   = { "Counties", "Overlays/" "County/"   "Short/" "%s_County_Short.gif",   TRUE,  3, 0 },
-       [LAYER_RIVERS]   = { "Rivers",   "Overlays/" "Rivers/"   "Short/" "%s_Rivers_Short.gif",   FALSE, 4, 0 },
-       [LAYER_HIGHWAYS] = { "Highways", "Overlays/" "Highways/" "Short/" "%s_Highways_Short.gif", TRUE,  5, 0 },
-       [LAYER_CITY]     = { "Cities",   "Overlays/" "Cities/"   "Short/" "%s_City_Short.gif",     TRUE,  6, 0 },
+       [LAYER_TOPO]     = {"Topo",     "Overlays/Topo/Short/%s_Topo_Short.jpg",         TRUE,  1, 0},
+       [LAYER_COUNTY]   = {"Counties", "Overlays/County/Short/%s_County_Short.gif",     TRUE,  3, 0},
+       [LAYER_RIVERS]   = {"Rivers",   "Overlays/Rivers/Short/%s_Rivers_Short.gif",     FALSE, 4, 0},
+       [LAYER_HIGHWAYS] = {"Highways", "Overlays/Highways/Short/%s_Highways_Short.gif", TRUE,  5, 0},
+       [LAYER_CITY]     = {"Cities",   "Overlays/Cities/Short/%s_City_Short.gif",       TRUE,  6, 0},
 };
 
 static AWeatherGui *gui = NULL;
@@ -72,6 +72,7 @@ void load_texture(gchar *filename, gpointer _layer)
        int        format = gdk_pixbuf_get_has_alpha(pixbuf) ? GL_RGBA : GL_RGB;
 
        /* Create Texture */
+       glDeleteTextures(1, &layer->tex);
        glGenTextures(1, &layer->tex);
        glBindTexture(GL_TEXTURE_2D, layer->tex); // 2d texture (x and y size)
 
@@ -89,6 +90,8 @@ void load_texture(gchar *filename, gpointer _layer)
 
        aweather_gui_gl_end(gui);
 
+       g_object_unref(pixbuf);
+
        /* Redraw */
        gtk_widget_queue_draw(aweather_gui_get_widget(gui, "drawing"));
 }