Back out previous commit (38612) which was the brutal patch to build with

GTK 3 because not all of it is contained within #if statements for GTK 3
builds and could affect GTK 2 builds as well.


svn path=/trunk/; revision=38613

4 files changed, 35 insertions, 49 deletions

diff --git a/gtk/iax2_analysis.c b/gtk/iax2_analysis.c
index 05fc79c340..685f22fa8f 100644
--- a/gtk/iax2_analysis.c
+++ b/gtk/iax2_analysis.c
@@ -1563,14 +1563,12 @@ static void create_filter_box(dialog_graph_graph_t *dgg, GtkWidget *box, int num
 	gtk_widget_show(label);
 	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
 
-#if GTK_CHECK_VERSION(3,0,0)
-#else
 	gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &dgg->color);
 	gtk_widget_modify_fg(label, GTK_STATE_ACTIVE, &dgg->color);
 	gtk_widget_modify_fg(label, GTK_STATE_PRELIGHT, &dgg->color);
 	gtk_widget_modify_fg(label, GTK_STATE_SELECTED, &dgg->color);
 	gtk_widget_modify_fg(label, GTK_STATE_INSENSITIVE, &dgg->color);
-#endif
+
 	return;
 }
 
diff --git a/gtk/io_stat.c b/gtk/io_stat.c
index c0b0ce028a..4813162ae2 100644
--- a/gtk/io_stat.c
+++ b/gtk/io_stat.c
@@ -2090,14 +2090,11 @@ create_filter_box(io_stat_graph_t *gio, GtkWidget *box, int num)
 	gtk_widget_show(label);
 	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
 
-#if GTK_CHECK_VERSION(3,0,0)
-#else
 	gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &gio->color);
 	gtk_widget_modify_fg(label, GTK_STATE_ACTIVE, &gio->color);
 	gtk_widget_modify_fg(label, GTK_STATE_PRELIGHT, &gio->color);
 	gtk_widget_modify_fg(label, GTK_STATE_SELECTED, &gio->color);
 	gtk_widget_modify_fg(label, GTK_STATE_INSENSITIVE, &gio->color);
-#endif
 /*	g_signal_connect(gio->display_button, "toggled", G_CALLBACK(filter_callback), gio);*/
 
 
diff --git a/gtk/rtp_analysis.c b/gtk/rtp_analysis.c
index a2f1b171b3..cc1fb73351 100644
--- a/gtk/rtp_analysis.c
+++ b/gtk/rtp_analysis.c
@@ -1605,14 +1605,12 @@ static void create_filter_box(dialog_graph_graph_t *dgg, GtkWidget *box, int num
 	gtk_widget_show(label);
 	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
 
-#if GTK_CHECK_VERSION(3,0,0)
-#else
 	gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &dgg->color);
 	gtk_widget_modify_fg(label, GTK_STATE_ACTIVE, &dgg->color);
 	gtk_widget_modify_fg(label, GTK_STATE_PRELIGHT, &dgg->color);
 	gtk_widget_modify_fg(label, GTK_STATE_SELECTED, &dgg->color);
 	gtk_widget_modify_fg(label, GTK_STATE_INSENSITIVE, &dgg->color);
-#endif
+
 	return;
 }
 
diff --git a/gtk/tcp_graph.c b/gtk/tcp_graph.c
index 2427440a42..7cc45a5dd9 100644
--- a/gtk/tcp_graph.c
+++ b/gtk/tcp_graph.c
@@ -307,7 +307,7 @@ struct graph {
 						 * temporary
 						 */
 	PangoFontDescription *font;	/* font used for annotations etc. */
-//	GdkGC *fg_gc;
+	GdkGC *fg_gc;
 #if GTK_CHECK_VERSION(2,22,0)
 	cairo_surface_t *title_surface;
 	/*cairo_surface_t *surface[2];*/
@@ -315,7 +315,7 @@ struct graph {
 	GdkPixmap *title_pixmap;
 	/*GdkPixmap *pixmap[2];*/
 #endif
-//	GdkPixmap *pixmap[2];
+	GdkPixmap *pixmap[2];
 	int displayed;			/* which of both pixmaps is on screen right now */
 	struct {
 		GtkWidget *control_panel;
@@ -362,7 +362,7 @@ struct graph {
 	} gt;
 };
 
-//static GdkGC *xor_gc = NULL;
+static GdkGC *xor_gc = NULL;
 static int refnum=0;
 
 #define debug(section) if (debugging & section)
@@ -426,8 +426,8 @@ static struct graph *graph_new (void);
 static void graph_destroy (struct graph * );
 static void graph_initialize_values (struct graph * );
 static void graph_init_sequence (struct graph * );
-//static void draw_element_line (struct graph * , struct element * );
-//static void draw_element_arc (struct graph * , struct element * );
+static void draw_element_line (struct graph * , struct element * );
+static void draw_element_arc (struct graph * , struct element * );
 static void graph_display (struct graph * );
 static void graph_pixmaps_create (struct graph * );
 static void graph_pixmaps_switch (struct graph * );
@@ -683,8 +683,8 @@ static void create_gui (struct graph *g)
 
 static void create_drawing_area (struct graph *g)
 {
-//	GdkColormap *colormap;
-//	GdkColor color;
+	GdkColormap *colormap;
+	GdkColor color;
 	char window_title[WINDOW_TITLE_LENGTH];
 	struct segment current;
 	struct tcpheader *thdr;
@@ -787,8 +787,8 @@ static void create_drawing_area (struct graph *g)
 	g->wp.width = widget_alloc.width - g->wp.x - RMARGIN_WIDTH;
 	g->wp.height = widget_alloc.height - g->wp.y - g->x_axis->s.height;
 
-#if 0
     g->font = gtk_widget_get_style(g->drawing_area)->font_desc;
+
 	colormap = gtk_widget_get_colormap(GTK_WIDGET(g->drawing_area));
 	if (!xor_gc) {
 		xor_gc = gdk_gc_new (gtk_widget_get_window(g->drawing_area));
@@ -824,7 +824,6 @@ static void create_drawing_area (struct graph *g)
 	 * !!! NEMLLO BY TO BYT NA KONCI graph_init_sequence()? !!!
 	 *
 	 */
-#endif
 	g_signal_connect(g->drawing_area, "configure_event", G_CALLBACK(configure_event),
                        NULL);
 
@@ -1732,9 +1731,9 @@ static void graph_destroy (struct graph *g)
 	window_destroy (g->gui.control_panel);
 	window_destroy (g->toplevel);
 	/* window_destroy (g->text); */
-//	g_object_unref (g->fg_gc);
-//	g_object_unref (g->pixmap[0]);
-//	g_object_unref (g->pixmap[1]);
+	g_object_unref (g->fg_gc);
+	g_object_unref (g->pixmap[0]);
+	g_object_unref (g->pixmap[1]);
 	g_free (g->x_axis);
 	g_free (g->y_axis);
 	g_free ( (gpointer) (g->title) );
@@ -2089,19 +2088,19 @@ static void graph_title_pixmap_display (struct graph *g)
 	cairo_destroy (cr);
 }
 
-static void graph_pixmaps_create (struct graph *g _U_)
+static void graph_pixmaps_create (struct graph *g)
 {
 	debug(DBS_FENTRY) puts ("graph_pixmaps_create()");
 
-//	if (g->pixmap[0])
-//		g_object_unref (g->pixmap[0]);
-//	if (g->pixmap[1])
-//		g_object_unref (g->pixmap[1]);
-//
-//	g->pixmap[0] = gdk_pixmap_new (gtk_widget_get_window(g->drawing_area),
-//									g->wp.width, g->wp.height, -1);
-//	g->pixmap[1] = gdk_pixmap_new (gtk_widget_get_window(g->drawing_area),
-//									g->wp.width, g->wp.height, -1);
+	if (g->pixmap[0])
+		g_object_unref (g->pixmap[0]);
+	if (g->pixmap[1])
+		g_object_unref (g->pixmap[1]);
+
+	g->pixmap[0] = gdk_pixmap_new (gtk_widget_get_window(g->drawing_area),
+									g->wp.width, g->wp.height, -1);
+	g->pixmap[1] = gdk_pixmap_new (gtk_widget_get_window(g->drawing_area),
+									g->wp.width, g->wp.height, -1);
 
 	g->displayed = 0;
 }
@@ -2115,9 +2114,8 @@ static void graph_display (struct graph *g)
 	graph_pixmap_display (g);
 }
 
-static void graph_pixmap_display (struct graph *g _U_)
+static void graph_pixmap_display (struct graph *g)
 {
-#if 0
 	cairo_t *cr;
 
 	cr = gdk_cairo_create (gtk_widget_get_window(g->drawing_area));
@@ -2129,7 +2127,6 @@ static void graph_pixmap_display (struct graph *g _U_)
     if (g->cross.erase_needed) {
        cross_xor(g, g->cross.x, g->cross.y);
     }
-#endif
 }
 
 static void graph_pixmaps_switch (struct graph *g)
@@ -2137,9 +2134,8 @@ static void graph_pixmaps_switch (struct graph *g)
 	g->displayed = 1 ^ g->displayed;
 }
 
-static void graph_pixmap_draw (struct graph *g _U_)
+static void graph_pixmap_draw (struct graph *g)
 {
-#if 0
 	struct element_list *list;
 	struct element *e;
 	int not_disp;
@@ -2170,9 +2166,8 @@ static void graph_pixmap_draw (struct graph *g _U_)
 				break;
 			}
 		}
-#endif
 }
-#if 0
+
 static void draw_element_line (struct graph *g, struct element *e)
 {
 	int xx1, xx2, yy1, yy2;
@@ -2212,7 +2207,7 @@ static void draw_element_line (struct graph *g, struct element *e)
 	debug(DBS_GRAPH_DRAWING) printf ("line: (%d,%d)->(%d,%d)\n", xx1, yy1, xx2,yy2);
 
 	g_assert(e->elment_color_p!=NULL);
-//	cr = gdk_cairo_create (g->pixmap[1^g->displayed]);
+	cr = gdk_cairo_create (g->pixmap[1^g->displayed]);
 	cairo_set_line_width (cr, 1.0);
 	if(e->elment_color_p!=NULL){
 		gdk_cairo_set_source_color (cr, e->elment_color_p);
@@ -2235,8 +2230,8 @@ static void draw_element_arc (struct graph *g, struct element *e)
 	if (xx1<-xx2 || xx1>=g->wp.width || yy1<-yy2 || yy1>=g->wp.height)
 		return;
 	debug(DBS_GRAPH_DRAWING) printf ("arc: (%d,%d)->(%d,%d)\n", xx1, yy1, xx2, yy2);
-//	gdk_draw_arc (g->pixmap[1^g->displayed], g->fg_gc, e->p.arc.filled, xx1,
-//					yy1, xx2, yy2, e->p.arc.angle1, e->p.arc.angle2);
+	gdk_draw_arc (g->pixmap[1^g->displayed], g->fg_gc, e->p.arc.filled, xx1,
+					yy1, xx2, yy2, e->p.arc.angle1, e->p.arc.angle2);
 
 #if 0
 	/* NOTE the coordinates and angels needs to be recalculated as cairo_arc works differently */
@@ -2260,7 +2255,7 @@ static void draw_element_arc (struct graph *g, struct element *e)
 	g_warning("Drawing arc");
 #endif
 }
-#endif
+
 static void axis_pixmaps_create (struct axis *axis)
 {
 	debug(DBS_FENTRY) puts ("axis_pixmaps_create()");
@@ -2876,11 +2871,11 @@ static void cross_xor (struct graph *g, int x, int y)
 
 	if (x > g->wp.x && x < g->wp.x+g->wp.width &&
 				y >= g->wp.y && y < g->wp.y+g->wp.height) {
-#if 0
 		gdk_draw_line (gtk_widget_get_window(g->drawing_area), xor_gc, g->wp.x,
 						y, g->wp.x + g->wp.width, y);
 		gdk_draw_line (gtk_widget_get_window(g->drawing_area), xor_gc, x,
 						g->wp.y, x, g->wp.y + g->wp.height);
+#if 0
 		/* Draw horisontal line */
 		cr = gdk_cairo_create (gtk_widget_get_window(g->drawing_area));
 		cairo_set_operator (cr, CAIRO_OPERATOR_XOR);
@@ -2973,7 +2968,7 @@ static void magnify_create (struct graph *g, int x, int y)
 		}
 	} while (e);
 
-//	mg->pixmap[0] = mg->pixmap[1] = NULL;
+	mg->pixmap[0] = mg->pixmap[1] = NULL;
 	graph_pixmaps_create (mg);
 	magnify_draw (g);
 	g->magnify.active = 1;
@@ -3000,8 +2995,8 @@ static void magnify_destroy (struct graph *g)
 	struct graph *mg = g->magnify.g;
 
 	window_destroy (GTK_WIDGET (mg->drawing_area));
-//	g_object_unref (mg->pixmap[0]);
-//	g_object_unref (mg->pixmap[1]);
+	g_object_unref (mg->pixmap[0]);
+	g_object_unref (mg->pixmap[1]);
 	for (list=mg->elists; list; list=list->next)
 		g_free (list->elements);
 
@@ -3038,9 +3033,8 @@ static void magnify_get_geom (struct graph *g, int x, int y)
 	g->magnify.g->geom.y -= (g->magnify.y - posy);
 }
 
-static void magnify_draw (struct graph *g _U_)
+static void magnify_draw (struct graph *g)
 {
-#if 0
 	cairo_t *cr;
 	int not_disp = 1 ^ g->magnify.g->displayed;
 
@@ -3067,7 +3061,6 @@ static void magnify_draw (struct graph *g _U_)
 
 	graph_pixmaps_switch (g->magnify.g);
 	graph_pixmap_display (g->magnify.g);
-#endif
 
 }