Fix build in the non gtk3 case: Add gpointer data to the

  parameter list.
Remove some trailing spaces.

svn path=/trunk/; revision=38688

1 files changed, 21 insertions, 21 deletions

diff --git a/gtk/rtp_analysis.c b/gtk/rtp_analysis.c
index 4f1da96b39..49d97440cd 100644
--- a/gtk/rtp_analysis.c
+++ b/gtk/rtp_analysis.c
@@ -1085,11 +1085,11 @@ static void dialog_graph_draw(user_data_t* user_data)
 		cr = gdk_cairo_create (user_data->dlg.dialog_graph.pixmap);
 #endif
 		cairo_set_line_width (cr, 1.0);
-		cairo_move_to(cr, 
-			user_data->dlg.dialog_graph.surface_width-right_x_border+1.5, 
+		cairo_move_to(cr,
+			user_data->dlg.dialog_graph.surface_width-right_x_border+1.5,
 			user_data->dlg.dialog_graph.surface_height-bottom_y_border-draw_height*i/10+0.5);
 		
-		cairo_line_to(cr, 
+		cairo_line_to(cr,
 			user_data->dlg.dialog_graph.surface_width-right_x_border+1.5+xwidth,
 			user_data->dlg.dialog_graph.surface_height-bottom_y_border-draw_height*i/10+0.5);
 		cairo_stroke(cr);
@@ -1104,8 +1104,8 @@ static void dialog_graph_draw(user_data_t* user_data)
 #else
 			cr = gdk_cairo_create (user_data->dlg.dialog_graph.pixmap);
 #endif
-			cairo_move_to (cr, 
-				user_data->dlg.dialog_graph.surface_width-right_x_border+15+label_width-lwidth, 
+			cairo_move_to (cr,
+				user_data->dlg.dialog_graph.surface_width-right_x_border+15+label_width-lwidth,
 				user_data->dlg.dialog_graph.surface_height-bottom_y_border-draw_height*i/10-label_height/2);
 			pango_cairo_show_layout (cr, layout);
 			cairo_destroy (cr);
@@ -1120,8 +1120,8 @@ static void dialog_graph_draw(user_data_t* user_data)
 #else
 			cr = gdk_cairo_create (user_data->dlg.dialog_graph.pixmap);
 #endif
-			cairo_move_to (cr, 
-				user_data->dlg.dialog_graph.surface_width-right_x_border+15+label_width-lwidth, 
+			cairo_move_to (cr,
+				user_data->dlg.dialog_graph.surface_width-right_x_border+15+label_width-lwidth,
 				user_data->dlg.dialog_graph.surface_height-bottom_y_border-draw_height*i/10-label_height/2);
 			pango_cairo_show_layout (cr, layout);
 			cairo_destroy (cr);
@@ -1136,8 +1136,8 @@ static void dialog_graph_draw(user_data_t* user_data)
 #else
 			cr = gdk_cairo_create (user_data->dlg.dialog_graph.pixmap);
 #endif
-			cairo_move_to (cr, 
-				user_data->dlg.dialog_graph.surface_width-right_x_border+15+label_width-lwidth, 
+			cairo_move_to (cr,
+				user_data->dlg.dialog_graph.surface_width-right_x_border+15+label_width-lwidth,
 				user_data->dlg.dialog_graph.surface_height-bottom_y_border-draw_height*i/10-label_height/2);
 			pango_cairo_show_layout (cr, layout);
 			cairo_destroy (cr);
@@ -1235,8 +1235,8 @@ static void dialog_graph_draw(user_data_t* user_data)
 #else
 			cr = gdk_cairo_create (user_data->dlg.dialog_graph.pixmap);
 #endif
-			cairo_move_to (cr, 
-				x-1-user_data->dlg.dialog_graph.pixels_per_tick/2-lwidth/2, 
+			cairo_move_to (cr,
+				x-1-user_data->dlg.dialog_graph.pixels_per_tick/2-lwidth/2,
 				user_data->dlg.dialog_graph.surface_height-bottom_y_border+20);
 			pango_cairo_show_layout (cr, layout);
 			cairo_destroy (cr);
@@ -1262,8 +1262,8 @@ static void dialog_graph_draw(user_data_t* user_data)
 #else
 	cr = gdk_cairo_create (user_data->dlg.dialog_graph.pixmap);
 #endif
-	cairo_move_to (cr, 
-		user_data->dlg.dialog_graph.surface_width-right_x_border+33-lwidth, 
+	cairo_move_to (cr,
+		user_data->dlg.dialog_graph.surface_width-right_x_border+33-lwidth,
 		user_data->dlg.dialog_graph.surface_height-bottom_y_border+3);
 	pango_cairo_show_layout (cr, layout);
 	cairo_destroy (cr);
@@ -1277,8 +1277,8 @@ static void dialog_graph_draw(user_data_t* user_data)
 #else
 	cr = gdk_cairo_create (user_data->dlg.dialog_graph.pixmap);
 #endif
-	cairo_move_to (cr, 
-		user_data->dlg.dialog_graph.surface_width-right_x_border+33-lwidth, 
+	cairo_move_to (cr,
+		user_data->dlg.dialog_graph.surface_width-right_x_border+33-lwidth,
 		user_data->dlg.dialog_graph.surface_height-bottom_y_border+3+9);
 	pango_cairo_show_layout (cr, layout);
 	cairo_destroy (cr);
@@ -1313,8 +1313,8 @@ static void dialog_graph_draw(user_data_t* user_data)
 #else
 				cr = gdk_cairo_create (user_data->dlg.dialog_graph.pixmap);
 #endif
-				cairo_move_to (cr, 
-					x_pos-1-lwidth/2, 
+				cairo_move_to (cr,
+					x_pos-1-lwidth/2,
 					user_data->dlg.dialog_graph.surface_height-bottom_y_border+3+7*(i/2));
 				pango_cairo_show_layout (cr, layout);
 				cairo_destroy (cr);
@@ -1382,7 +1382,7 @@ static void dialog_graph_draw(user_data_t* user_data)
 	cr = gdk_cairo_create (gtk_widget_get_window(user_data->dlg.dialog_graph.draw_area));
 
 #if GTK_CHECK_VERSION(2,22,0)
-	cairo_set_source_surface (cr, user_data->dlg.dialog_graph.surface, 0, 0); 
+	cairo_set_source_surface (cr, user_data->dlg.dialog_graph.surface, 0, 0);
 #else
 	gdk_cairo_set_source_pixmap (cr, user_data->dlg.dialog_graph.pixmap, 0, 0);
 #endif
@@ -1432,21 +1432,21 @@ static gboolean draw_area_draw(GtkWidget *widget, cairo_t *cr, gpointer data)
 
 	gtk_widget_get_allocation (widget, &allocation);
 
-	cairo_set_source_surface (cr, user_data->dlg.dialog_graph.surface, 0, 0); 
+	cairo_set_source_surface (cr, user_data->dlg.dialog_graph.surface, 0, 0);
 	cairo_rectangle (cr, 0, 0, allocation.width, allocation.height);
 	cairo_fill (cr);
 
 	return FALSE;
 }
 #else
-static gint expose_event(GtkWidget *widget, GdkEventExpose *event)
+static gint expose_event(GtkWidget *widget, GdkEventExpose *event, gpointer data)
 {
 	user_data_t *user_data = data;
 	cairo_t *cr = gdk_cairo_create (gtk_widget_get_window(widget));
 
 
 #if GTK_CHECK_VERSION(2,22,0)
-	cairo_set_source_surface (cr, user_data->dlg.dialog_graph.surface, 0, 0); 
+	cairo_set_source_surface (cr, user_data->dlg.dialog_graph.surface, 0, 0);
 #else
 	gdk_cairo_set_source_pixmap (cr, user_data->dlg.dialog_graph.pixmap, 0, 0);
 #endif