defined sensors box, sensors list and graph widgets in the glade file.

[psensor.git] / src / ui_graph.c

diff --git a/src/ui_graph.c b/src/ui_graph.c
index f21cbff..a50d6a1 100644 (file)
--- a/src/ui_graph.c
+++ b/src/ui_graph.c
@@ -18,8 +18,6 @@
  */
 #include "graph.h"
 #include "ui_graph.h"
-#include "ui_pref.h"
-#include "ui_sensorpref.h"
 
 static int
 on_graph_clicked(GtkWidget *widget, GdkEventButton *event, gpointer data)
@@ -47,28 +45,24 @@ on_expose_event(GtkWidget *widget, GdkEventExpose *event, gpointer data)
        return FALSE;
 }
 
-GtkWidget *ui_graph_create(struct ui_psensor *ui)
+void ui_graph_create(struct ui_psensor *ui)
 {
        GtkWidget *w_graph;
 
-       w_graph = gtk_drawing_area_new();
+       log_debug("ui_graph_create()");
 
-       if (GTK_MAJOR_VERSION == 2)
-               g_signal_connect(GTK_WIDGET(w_graph),
-                                "expose-event",
-                                G_CALLBACK(on_expose_event),
-                                ui);
-       else
-               g_signal_connect(GTK_WIDGET(w_graph),
-                                "draw",
-                                G_CALLBACK(on_expose_event),
-                                ui);
+       w_graph = ui->w_graph;
+
+       g_signal_connect(GTK_WIDGET(w_graph),
+                        "draw",
+                        G_CALLBACK(on_expose_event),
+                        ui);
 
        gtk_widget_add_events(w_graph, GDK_BUTTON_PRESS_MASK);
 
        g_signal_connect(GTK_WIDGET(w_graph),
-                          "button_press_event",
-                          (GCallback) on_graph_clicked, ui);
+                        "button_press_event",
+                        (GCallback) on_graph_clicked, ui);
 
-       return w_graph;
+       log_debug("ui_graph_create() ends");
 }