Migrate GTK icon handling to GTK 3.10 API

GtkStockItem usage is deprecated with all the GTK_STOCK_.* stock ids.
We keep a stock id based approach but without relying on GTK's
GtkStockItem system.

We create our own internal stock ids for {icon, label} tuples and keep
the original GTK stock id #define-s and values to preserve backward
compatibility.

Change-Id: Ia0b35a5903f079e92c8026e3df21bbf0be2d06b0
Reviewed-on: https://code.wireshark.org/review/302
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

1 files changed, 6 insertions, 6 deletions

diff --git a/ui/gtk/rtp_stream_dlg.c b/ui/gtk/rtp_stream_dlg.c
index 052b47dedf..08053b12ba 100644
--- a/ui/gtk/rtp_stream_dlg.c
+++ b/ui/gtk/rtp_stream_dlg.c
@@ -1010,10 +1010,10 @@ rtpstream_dlg_create (void)
     gtk_container_add (GTK_CONTAINER (hbuttonbox), bt_findrev);
     gtk_widget_set_tooltip_text (bt_findrev, "Find the reverse stream matching the selected forward stream");
 /*
-    bt_goto = gtk_button_new_from_stock(GTK_STOCK_JUMP_TO);
+    bt_goto = ws_gtk_button_new_from_stock(GTK_STOCK_JUMP_TO);
     gtk_container_add (GTK_CONTAINER (hbuttonbox), bt_goto);
 */
-    bt_save = gtk_button_new_from_stock(GTK_STOCK_SAVE_AS);
+    bt_save = ws_gtk_button_new_from_stock(GTK_STOCK_SAVE_AS);
     gtk_container_add (GTK_CONTAINER (hbuttonbox), bt_save);
     gtk_widget_set_tooltip_text (bt_save, "Save stream payload in rtpdump format");
 
@@ -1021,22 +1021,22 @@ rtpstream_dlg_create (void)
     gtk_container_add (GTK_CONTAINER (hbuttonbox), bt_mark);
     gtk_widget_set_tooltip_text (bt_mark, "Mark packets of the selected stream(s)");
 
-    bt_filter = gtk_button_new_from_stock(WIRESHARK_STOCK_PREPARE_FILTER);
+    bt_filter = ws_gtk_button_new_from_stock(WIRESHARK_STOCK_PREPARE_FILTER);
     gtk_container_add (GTK_CONTAINER (hbuttonbox), bt_filter);
     gtk_widget_set_tooltip_text (bt_filter, "Prepare a display filter of the selected stream(s)");
 
     /* XXX - maybe we want to have a "Copy as CSV" stock button here? */
     /*bt_copy = gtk_button_new_with_label ("Copy content to clipboard as CSV");*/
-    bt_copy = gtk_button_new_from_stock(GTK_STOCK_COPY);
+    bt_copy = ws_gtk_button_new_from_stock(GTK_STOCK_COPY);
     gtk_container_add (GTK_CONTAINER (hbuttonbox), bt_copy);
     gtk_widget_set_tooltip_text(bt_copy,
         "Copy all statistical values of this page to the clipboard in CSV (Comma Separated Values) format.");
 
-    bt_analyze = gtk_button_new_from_stock(WIRESHARK_STOCK_ANALYZE);
+    bt_analyze = ws_gtk_button_new_from_stock(WIRESHARK_STOCK_ANALYZE);
     gtk_container_add (GTK_CONTAINER (hbuttonbox), bt_analyze);
     gtk_widget_set_tooltip_text (bt_analyze, "Open an analyze window of the selected stream(s)");
 
-    bt_close = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
+    bt_close = ws_gtk_button_new_from_stock(GTK_STOCK_CLOSE);
     gtk_container_add (GTK_CONTAINER (hbuttonbox), bt_close);
     gtk_widget_set_tooltip_text (bt_close, "Close this dialog");
     gtk_widget_set_can_default(bt_close, TRUE);