diff options
| -rw-r--r-- | src/gsm_color_button.c | 4 | ||||
| -rw-r--r-- | src/load-graph.cpp | 10 | ||||
| -rw-r--r-- | src/load-graph.h | 2 | ||||
| -rw-r--r-- | src/sysinfo.cpp | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/src/gsm_color_button.c b/src/gsm_color_button.c index 9a3cab2..ffcf270 100644 --- a/src/gsm_color_button.c +++ b/src/gsm_color_button.c @@ -445,7 +445,7 @@ render (GtkWidget * widget) /* Handle exposure events for the color picker's drawing area */ #if GTK_CHECK_VERSION(3,0,0) -static gboolean expose_event (GtkWidget * widget, cairo_t * cr, gpointer data) +static gboolean draw (GtkWidget * widget, cairo_t * cr, gpointer data) #else static gboolean expose_event (GtkWidget * widget, GdkEventExpose * event, gpointer data) #endif @@ -657,7 +657,7 @@ gsm_color_button_init (GSMColorButton * color_button) gtk_widget_set_tooltip_text (GTK_WIDGET(color_button), _("Click to set graph colors")); #if GTK_CHECK_VERSION(3,0,0) - g_signal_connect (color_button, "draw", G_CALLBACK (expose_event), color_button); + g_signal_connect (color_button, "draw", G_CALLBACK (draw), color_button); #else g_signal_connect (color_button, "expose-event", G_CALLBACK (expose_event), color_button); #endif diff --git a/src/load-graph.cpp b/src/load-graph.cpp index 752a4d4..2ff1716 100644 --- a/src/load-graph.cpp +++ b/src/load-graph.cpp @@ -175,7 +175,7 @@ static void draw_background(LoadGraph *g) { /* Redraws the backing buffer for the load graph and updates the window */ void -load_graph_draw (LoadGraph *g) +load_graph_queue_draw (LoadGraph *g) { /* repaint */ gtk_widget_queue_draw (g->disp); @@ -197,13 +197,13 @@ load_graph_configure (GtkWidget *widget, g->clear_background(); - load_graph_draw (g); + load_graph_queue_draw (g); return TRUE; } #if GTK_CHECK_VERSION(3,0,0) -static gboolean load_graph_expose (GtkWidget *widget, cairo_t *context, gpointer data_ptr) +static gboolean load_graph_draw (GtkWidget *widget, cairo_t *context, gpointer data_ptr) #else static gboolean load_graph_expose (GtkWidget *widget, GdkEventExpose *event, gpointer data_ptr) #endif @@ -571,7 +571,7 @@ load_graph_update (gpointer user_data) } if (g->draw) - load_graph_draw (g); + load_graph_queue_draw (g); g->render_counter++; @@ -701,7 +701,7 @@ LoadGraph::LoadGraph(guint type) g->disp = gtk_drawing_area_new (); gtk_widget_show (g->disp); #if GTK_CHECK_VERSION(3,0,0) - g_signal_connect (G_OBJECT (g->disp), "draw", G_CALLBACK (load_graph_expose), g); + g_signal_connect (G_OBJECT (g->disp), "draw", G_CALLBACK (load_graph_draw), g); #else g_signal_connect (G_OBJECT (g->disp), "expose_event", G_CALLBACK (load_graph_expose), g); #endif diff --git a/src/load-graph.h b/src/load-graph.h index a120b92..8a99bd4 100644 --- a/src/load-graph.h +++ b/src/load-graph.h @@ -102,7 +102,7 @@ struct LoadGraph { /* Force a drawing update */ void -load_graph_draw (LoadGraph *g); +load_graph_queue_draw (LoadGraph *g); /* Start load graph. */ void diff --git a/src/sysinfo.cpp b/src/sysinfo.cpp index 00b7724..eaa58b8 100644 --- a/src/sysinfo.cpp +++ b/src/sysinfo.cpp @@ -448,7 +448,7 @@ namespace { #define RADIUS 5 #if GTK_CHECK_VERSION(3,0,0) -static gboolean sysinfo_logo_expose (GtkWidget *widget, cairo_t *context, gpointer data_ptr) +static gboolean sysinfo_logo_draw (GtkWidget *widget, cairo_t *context, gpointer data_ptr) #else static gboolean sysinfo_logo_expose (GtkWidget *widget, GdkEventExpose *event, gpointer data_ptr) #endif @@ -580,7 +580,7 @@ procman_create_sysinfo_view(void) gtk_box_pack_start(GTK_BOX(hbox), logo, FALSE, FALSE, 0); #if GTK_CHECK_VERSION(3,0,0) - g_signal_connect(G_OBJECT(logo), "draw", G_CALLBACK(sysinfo_logo_expose), NULL); + g_signal_connect(G_OBJECT(logo), "draw", G_CALLBACK(sysinfo_logo_draw), NULL); #else g_signal_connect(G_OBJECT(logo), "expose-event", G_CALLBACK(sysinfo_logo_expose), NULL); #endif |