adding rsl ebuild, gtk suppressions for valgrind

[grits] / src / aweather-gui.c

diff --git a/src/aweather-gui.c b/src/aweather-gui.c
index d02443eb9c314cd57418a57eae01eab1285a030e..2c7b5c163d7f4c44c558c0e405e9bb8f5b0566c0 100644 (file)
--- a/src/aweather-gui.c
+++ b/src/aweather-gui.c
@@ -46,6 +46,7 @@ void on_site_changed(GtkComboBox *combo, AWeatherGui *gui)
        gtk_tree_model_get(model, &iter, 1, &site, -1);
        AWeatherView *view = aweather_gui_get_view(gui);
        aweather_view_set_location(view, site);
+       g_free(site);
 }
 
 void on_time_changed(GtkTreeView *view, GtkTreePath *path,
@@ -58,6 +59,7 @@ void on_time_changed(GtkTreeView *view, GtkTreePath *path,
        gtk_tree_model_get(model, &iter, 0, &time, -1);
        AWeatherView *aview = aweather_gui_get_view(gui);
        aweather_view_set_time(aview, time);
+       g_free(time);
 }
 
 static gboolean map(GtkWidget *da, GdkEventConfigure *event, AWeatherGui *gui)
@@ -69,7 +71,7 @@ static gboolean map(GtkWidget *da, GdkEventConfigure *event, AWeatherGui *gui)
        /* Misc */
        glEnable(GL_BLEND);
        glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-       glClearColor(0.8f, 0.8f, 1.0f, 0.0f);
+       glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
 
        /* Tessellation, "finding intersecting triangles" */
        /* http://research.microsoft.com/pubs/70307/tr-2006-81.pdf */
@@ -93,6 +95,7 @@ static gboolean configure(GtkWidget *da, GdkEventConfigure *event, AWeatherGui *
        double width  = da->allocation.width;
        double height = da->allocation.height;
        double dist   = 500*1000; // 500 km
+       double cam    = 300*1000; // 500 km
 
        glViewport(0, 0, width, height);
 
@@ -101,12 +104,12 @@ static gboolean configure(GtkWidget *da, GdkEventConfigure *event, AWeatherGui *
        glLoadIdentity();
        double rad = atan(height/2*1000.0/dist); // 1px = 1000 meters
        double deg = (rad*180)/M_PI;
-       gluPerspective(deg*2, width/height, dist-20, dist+20);
+       gluPerspective(deg*2, width/height, cam-20, cam+20);
 
        /* Camera position? */
        glMatrixMode(GL_MODELVIEW);
        glLoadIdentity();
-       glTranslatef(0.0, 0.0, -dist);
+       glTranslatef(0.0, 0.0, -cam);
        //glRotatef(-45, 1, 0, 0);
 
        aweather_gui_gl_end(gui);
@@ -139,11 +142,16 @@ static void update_time_widget(AWeatherView *view, char *time, AWeatherGui *gui)
                gtk_tree_model_get(model, &iter, 0, &text, -1);
                if (g_str_equal(text, time)) {
                        GtkTreePath *path = gtk_tree_model_get_path(model, &iter);
-                       g_signal_handlers_block_by_func(tview, G_CALLBACK(on_site_changed), gui);
+                       g_signal_handlers_block_by_func(tview,
+                                       G_CALLBACK(on_site_changed), gui);
                        gtk_tree_view_set_cursor(tview, path, NULL, FALSE);
-                       g_signal_handlers_unblock_by_func(tview, G_CALLBACK(on_site_changed), gui);
+                       g_signal_handlers_unblock_by_func(tview,
+                                       G_CALLBACK(on_site_changed), gui);
+                       gtk_tree_path_free(path);
+                       g_free(text);
                        return;
                }
+               g_free(text);
        }
 }
 static void update_location_widget(AWeatherView *view, char *location, AWeatherGui *gui)
@@ -160,12 +168,15 @@ static void update_location_widget(AWeatherView *view, char *location, AWeatherG
                        char *text;
                        gtk_tree_model_get(model, &iter2, 1, &text, -1);
                        if (g_str_equal(text, location)) {
-                               GtkTreePath *path = gtk_tree_model_get_path(model, &iter2);
-                               g_signal_handlers_block_by_func(combo, G_CALLBACK(on_site_changed), gui);
+                               g_signal_handlers_block_by_func(combo,
+                                               G_CALLBACK(on_site_changed), gui);
                                gtk_combo_box_set_active_iter(combo, &iter2);
-                               g_signal_handlers_unblock_by_func(combo, G_CALLBACK(on_site_changed), gui);
+                               g_signal_handlers_unblock_by_func(combo,
+                                               G_CALLBACK(on_site_changed), gui);
+                               g_free(text);
                                return;
                        }
+                       g_free(text);
                }
        }
 }
@@ -203,6 +214,8 @@ static void site_setup(AWeatherGui *gui)
        gtk_combo_box_set_model(GTK_COMBO_BOX(combo), GTK_TREE_MODEL(store));
        gtk_cell_layout_set_cell_data_func(GTK_CELL_LAYOUT(combo), renderer,
                        combo_sensitive, NULL, NULL);
+       g_object_unref(renderer);
+       g_object_unref(store);
 
        g_signal_connect(combo, "changed", G_CALLBACK(on_site_changed),  gui);
        AWeatherView *aview = aweather_gui_get_view(gui);
@@ -234,7 +247,8 @@ gboolean opengl_setup(AWeatherGui *gui)
                        GDK_GL_MODE_DOUBLE | GDK_GL_MODE_ALPHA);
        if (!glconfig)
                g_error("Failed to create glconfig");
-       if (!gtk_widget_set_gl_capability(GTK_WIDGET(drawing), glconfig, NULL, TRUE, GDK_GL_RGBA_TYPE))
+       if (!gtk_widget_set_gl_capability(GTK_WIDGET(drawing),
+                               glconfig, NULL, TRUE, GDK_GL_RGBA_TYPE))
                g_error("GL lacks required capabilities");
 
        /* Set up OpenGL Stuff */