Remove #if 0'ed code.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30312 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/gtk/tcp_graph.c b/gtk/tcp_graph.c
index 47c66abe4796f055792b577d8cf7ec9b22fe3a4a..6e5efffc62d2771a184fbad02bc6c7cc49b85e9a 100644 (file)
--- a/gtk/tcp_graph.c
+++ b/gtk/tcp_graph.c
@@ -534,100 +534,7 @@ static void create_gui (struct graph *g)
        create_drawing_area(g);
 }
 
-#if 0
-static void create_text_widget (struct graph *g)
-{
-       GtkWidget *streamwindow, *txt_scrollw, *box;
-
-       debug(DBS_FENTRY) puts ("create_text_widget()");
-       streamwindow = dlg_window_new ("Wireshark: Packet chain");
-       gtk_widget_set_name (streamwindow, "Packet chain");
-       gtk_widget_set_size_request(streamwindow, TXT_WIDTH, TXT_HEIGHT);
-       gtk_container_set_border_width (GTK_CONTAINER(streamwindow), 2);
-
-       box = gtk_vbox_new (FALSE, 0);
-       gtk_container_add (GTK_CONTAINER (streamwindow), box);
-       gtk_widget_show (box);
 
-       txt_scrollw = scrolled_window_new (NULL, NULL);
-    gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(txt_scrollw),
-                                   GTK_SHADOW_IN);
-       gtk_box_pack_start (GTK_BOX (box), txt_scrollw, TRUE, TRUE, 0);
-       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (txt_scrollw),
-                                       GTK_POLICY_NEVER, GTK_POLICY_ALWAYS);
-       gtk_widget_show (txt_scrollw);
-
-       g->text = gtk_text_view_new();
-       gtk_text_view_set_editable(GTK_TEXT_VIEW(g->text), FALSE);
-       gtk_container_add (GTK_CONTAINER (txt_scrollw), g->text);
-       gtk_widget_show (g->text);
-       gtk_widget_show (streamwindow);
-}
-static void display_text (struct graph *g)
-{
-       char line[256];
-       struct segment *ptr;
-       double first_time, prev_time;
-       unsigned int isn_this=0, isn_opposite=0, seq_this_prev, seq_opposite_prev;
-       GdkColor color, *c;
-        GtkTextBuffer *buf;
-        GtkTextIter    iter;
-
-       debug(DBS_FENTRY) puts ("display_text()");
-       if (!gdk_color_parse ("SlateGray", &color)) {
-               /*
-                * XXX - do more than just warn.
-                */
-               simple_dialog(ESD_TYPE_WARN, ESD_BTN_OK,
-                   "Could not parse color SlateGray.");
-       }
-       g_snprintf (line, sizeof(line), "%10s%15s%15s%15s%15s%15s%15s%10s\n",
-                                       "pkt num", "time", "delta first", "delta prev",
-                                       "seqno", "delta first", "delta prev", "data (B)");
-       gtk_text_insert (GTK_TEXT (g->text), g->font, NULL, NULL, line, -1);
-
-       first_time = g->segments->rel_secs + g->segments->rel_usecs/1000000.0;
-       prev_time = first_time;
-       /* we have to find Initial Sequence Number for both ends of connection */
-       for (ptr=g->segments; ptr; ptr=ptr->next) {
-               if (compare_headers (g->current, ptr, COMPARE_CURR_DIR)) {
-                       isn_this = ptr->th_seq;
-                       break;
-               }
-       }
-       for (ptr=g->segments; ptr; ptr=ptr->next) {
-               if (!compare_headers (g->current, ptr, COMPARE_CURR_DIR)) {
-                       isn_opposite = ptr->th_seq;
-                       break;
-               }
-       }
-       seq_this_prev = isn_this;
-       seq_opposite_prev = isn_opposite;
-       for (ptr=g->segments; ptr; ptr=ptr->next) {
-               double time=ptr->rel_secs + ptr->rel_usecs/1000000.0;
-               unsigned int seq = ptr->th_seq;
-               int seq_delta_isn, seq_delta_prev;
-
-               if (compare_headers (g->current, ptr, COMPARE_CURR_DIR)) {
-                       seq_delta_isn = seq - isn_this;
-                       seq_delta_prev = seq - seq_this_prev;
-                       seq_this_prev = seq;
-                       c = NULL;
-               } else {
-                       seq_delta_isn = seq - isn_opposite;
-                       seq_delta_prev = seq - seq_opposite_prev;
-                       seq_opposite_prev = seq;
-                       c = &color;
-               }
-               g_snprintf (line, sizeof(line), "%10d%15.6f%15.6f%15.6f%15u%15d%15d%10u\n",
-                                               ptr->num, time, time-first_time, time-prev_time,
-                                               seq, seq_delta_isn, seq_delta_prev,
-                                               ptr->th_seglen);
-                gtk_text_buffer_insert(buf, &iter, line, -1);
-               prev_time = time;
-       }
-}
-#endif
 
 static void create_drawing_area (struct graph *g)
 {

diff --git a/tools/checkAPIs.pl b/tools/checkAPIs.pl
index 6fe0604af06bdb878e5be8d81cef1c491ec70e30..78915c8354e12207c508f6a179a7ace8a9733a69 100755 (executable)
--- a/tools/checkAPIs.pl
+++ b/tools/checkAPIs.pl
@@ -709,7 +709,7 @@ my %deprecatedGtkFunctions = (
                 'gtk_text_get_length',                         'E',
                 'gtk_text_get_point',                          'E',
                 'GTK_TEXT_INDEX',                              'E',
-                'gtk_text_insert',                             'W', # GtkTextView (GtkText "known to be buggy" !)
+                'gtk_text_insert',                             'E', # GtkTextView (GtkText "known to be buggy" !)
                 'gtk_text_new',                                'E',
                 'gtk_text_set_adjustments',                    'E',
                 'gtk_text_set_editable',                       'E',
@@ -827,13 +827,13 @@ my %deprecatedGtkFunctions = (
 ##
 ## Deprecated as of GTK+ 2.12 but to be replaced only when Wireshark requires GTK+ 2.12 or later
 ## 2.12                'gtk_tooltips_data_get',                       'E', # new API: GtkToolTip (avail since 2.12) ...
-##             'gtk_tooltips_disable',                        'E',
-##             'gtk_tooltips_enable',                         'E',
-##             'gtk_tooltips_force_window',                   'E',
-##             'gtk_tooltips_get_info_from_tip_window',       'E',
-##             'gtk_tooltips_new',                            'W',
-##             'gtk_tooltips_set_delay',                      'E',
-##             'gtk_tooltips_set_tip',                        'W',
+##                     'gtk_tooltips_disable',                        'E',
+##                     'gtk_tooltips_enable',                         'E',
+##                     'gtk_tooltips_force_window',                   'E',
+##                     'gtk_tooltips_get_info_from_tip_window',       'E',
+##                     'gtk_tooltips_new',                            'W',
+##                     'gtk_tooltips_set_delay',                      'E',
+##                     'gtk_tooltips_set_tip',                        'W',
 ## 2.12                'gtk_tool_item_set_tooltip',                   'W', # gtk_tool_item_set_tooltip_text() (avail since 2.12)
 ##
 ## Deprecated as of GTK+ 2.16 but to be replaced only when Wireshark requires GTK+ 2.16 or later