Fix more tooltips fixes.
authoretxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7>
Wed, 13 Jul 2011 08:48:13 +0000 (08:48 +0000)
committeretxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7>
Wed, 13 Jul 2011 08:48:13 +0000 (08:48 +0000)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37996 f5534014-38df-0310-8fa8-9805f1628bb7

23 files changed:
gtk/expert_comp_dlg.c
gtk/flow_graph.c
gtk/mac_lte_stat_dlg.c
gtk/main_toolbar.c
gtk/mcast_stream_dlg.c
gtk/prefs_capture.c
gtk/prefs_dlg.c
gtk/prefs_dlg.h
gtk/prefs_gui.c
gtk/prefs_layout.c
gtk/prefs_nameres.c
gtk/prefs_protocols.c
gtk/prefs_taps.c
gtk/range_utils.c
gtk/rlc_lte_stat_dlg.c
gtk/rtp_analysis.c
gtk/rtp_player.c
gtk/rtp_stream_dlg.c
gtk/sctp_byte_graph_dlg.c
gtk/sctp_graph_dlg.c
gtk/uat_gui.c
gtk/voip_calls_dlg.c
gtk/wlan_stat_dlg.c

index 202af916b8f3b9a284c8ef17c515b1b1ca58b8b0..d3f79ef02f89ef3bdadb1139766a0774cca2f0ac 100644 (file)
@@ -634,8 +634,7 @@ expert_comp_init(const char *optarg _U_, void* userdata _U_)
     GtkWidget *close_bt;
     GtkWidget *help_bt;
     expert_tapdata_t *etd;
-    GtkTooltips *tooltips = gtk_tooltips_new();
-
     ss=g_malloc(sizeof(expert_comp_dlg_t));
 
     ss->disp_events = 0;
@@ -743,7 +742,7 @@ expert_comp_init(const char *optarg _U_, void* userdata _U_)
 
     help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
     g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_EXPERT_INFO_DIALOG);
-    gtk_tooltips_set_tip (tooltips, help_bt, "Show topic specific help", NULL);
+    gtk_widget_set_tooltip_text (help_bt, "Show topic specific help");
 
     g_signal_connect(ss->win, "delete_event", G_CALLBACK(window_delete_event_cb), NULL);
     g_signal_connect(ss->win, "destroy", G_CALLBACK(win_destroy_cb), ss);
index 099f7c90d903c49bacfb044f30cfbbf845e3d752..926eea50839a4d81bf5d8fbefb7473c806818112 100644 (file)
@@ -481,9 +481,6 @@ flow_graph_dlg_create (void)
 #endif
        GtkWidget *flow_type_fr, *range_fr, *range_tb, *flow_type_tb, *node_addr_fr, *node_addr_tb;
 
-
-       GtkTooltips *tooltips = gtk_tooltips_new();
-
        flow_graph_dlg_w = dlg_window_new("Wireshark: Flow Graph");  /* transient_for top_level */
        gtk_window_set_destroy_with_parent (GTK_WINDOW(flow_graph_dlg_w), TRUE);
 
@@ -510,8 +507,7 @@ flow_graph_dlg_create (void)
 
        /* Process all packets */
        select_all_rb = gtk_radio_button_new_with_mnemonic_from_widget(NULL, "_All packets");
-       gtk_tooltips_set_tip (tooltips, select_all_rb,
-               ("Process all packets"), NULL);
+       gtk_widget_set_tooltip_text (select_all_rb, ("Process all packets"));
        g_signal_connect(select_all_rb, "toggled", G_CALLBACK(toggle_select_all), NULL);
        gtk_table_attach_defaults(GTK_TABLE(range_tb), select_all_rb, 0, 1, 0, 1);
        if (type_of_packets == TYPE_OF_PACKETS_ALL) {
@@ -522,8 +518,7 @@ flow_graph_dlg_create (void)
        /* Process displayed packets */
        select_displayed_rb = gtk_radio_button_new_with_mnemonic_from_widget(GTK_RADIO_BUTTON(select_all_rb),
                                                                              "_Displayed packets");
-       gtk_tooltips_set_tip (tooltips, select_displayed_rb,
-               ("Process displayed packets"), NULL);
+       gtk_widget_set_tooltip_text (select_displayed_rb, ("Process displayed packets"));
        g_signal_connect(select_displayed_rb, "toggled", G_CALLBACK(toggle_select_displayed), NULL);
        gtk_table_attach_defaults(GTK_TABLE(range_tb), select_displayed_rb, 0, 1, 1, 2);
        if (type_of_packets == TYPE_OF_PACKETS_DISPLAYED) {
@@ -544,8 +539,7 @@ flow_graph_dlg_create (void)
 
        /* General information */
        select_general_rb = gtk_radio_button_new_with_mnemonic_from_widget(NULL, "_General flow");
-       gtk_tooltips_set_tip (tooltips, select_general_rb,
-               ("Show all packets, with general information"), NULL);
+       gtk_widget_set_tooltip_text (select_general_rb, ("Show all packets, with general information"));
        g_signal_connect(select_general_rb, "toggled", G_CALLBACK(toggle_select_general), NULL);
        gtk_table_attach_defaults(GTK_TABLE(flow_type_tb), select_general_rb, 0, 1, 0, 1);
        if (type_of_flow == TYPE_OF_FLOW_GENERAL) {
@@ -556,8 +550,7 @@ flow_graph_dlg_create (void)
        /* TCP specific information */
        select_tcp_rb = gtk_radio_button_new_with_mnemonic_from_widget(GTK_RADIO_BUTTON(select_general_rb),
                                                                        "_TCP flow");
-       gtk_tooltips_set_tip (tooltips, select_tcp_rb,
-               ("Show only TCP packets, with TCP specific information"), NULL);
+       gtk_widget_set_tooltip_text (select_tcp_rb, ("Show only TCP packets, with TCP specific information"));
        g_signal_connect(select_tcp_rb, "toggled", G_CALLBACK(toggle_select_tcp), NULL);
        gtk_table_attach_defaults(GTK_TABLE(flow_type_tb), select_tcp_rb, 0, 1, 1, 2);
        if (type_of_flow == TYPE_OF_FLOW_TCP) {
@@ -578,8 +571,8 @@ flow_graph_dlg_create (void)
 
        /* Source / Dest address */
        src_dst_rb = gtk_radio_button_new_with_mnemonic_from_widget(NULL, "_Standard source/destination addresses");
-       gtk_tooltips_set_tip (tooltips, src_dst_rb,
-               ("Nodes in the diagram are identified with source and destination addresses"), NULL);
+       gtk_widget_set_tooltip_text (src_dst_rb,
+               ("Nodes in the diagram are identified with source and destination addresses"));
        g_signal_connect(src_dst_rb, "toggled", G_CALLBACK(toggle_select_srcdst), NULL);
        gtk_table_attach_defaults(GTK_TABLE(node_addr_tb), src_dst_rb, 0, 1, 0, 1);
        if (node_addr_type == NODE_ADDR_TYPE_SRCDST) {
@@ -590,8 +583,8 @@ flow_graph_dlg_create (void)
        /* Network source / dest address */
        net_src_dst_rb = gtk_radio_button_new_with_mnemonic_from_widget(GTK_RADIO_BUTTON(src_dst_rb),
                                                                         "_Network source/destination addresses");
-       gtk_tooltips_set_tip (tooltips, net_src_dst_rb,
-               ("Nodes in the diagram are identified with network source and destination addresses"), NULL);
+       gtk_widget_set_tooltip_text (net_src_dst_rb,
+               ("Nodes in the diagram are identified with network source and destination addresses"));
        g_signal_connect(net_src_dst_rb, "toggled", G_CALLBACK(toggle_select_netsrcdst), NULL);
        gtk_table_attach_defaults(GTK_TABLE(node_addr_tb), net_src_dst_rb, 0, 1, 1, 2);
        if (node_addr_type == NODE_ADDR_TYPE_NET_SRCDST) {
@@ -610,14 +603,14 @@ flow_graph_dlg_create (void)
 
        bt_ok = gtk_button_new_from_stock(GTK_STOCK_OK);
        gtk_container_add(GTK_CONTAINER(hbuttonbox), bt_ok);
-       gtk_tooltips_set_tip (tooltips, bt_ok, "Show the flow graph", NULL);
+       gtk_widget_set_tooltip_text (bt_ok, "Show the flow graph");
        g_signal_connect(bt_ok, "clicked", G_CALLBACK(flow_graph_on_ok), flow_graph_dlg_w);
        gtk_widget_show(bt_ok);
 
        bt_cancel = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
        gtk_container_add (GTK_CONTAINER (hbuttonbox), bt_cancel);
        GTK_WIDGET_SET_FLAGS(bt_cancel, GTK_CAN_DEFAULT);
-       gtk_tooltips_set_tip (tooltips, bt_cancel, "Cancel this dialog", NULL);
+       gtk_widget_set_tooltip_text (bt_cancel, "Cancel this dialog");
        window_set_cancel_button(flow_graph_dlg_w, bt_cancel, window_cancel_button_cb);
 
        g_signal_connect(flow_graph_dlg_w, "delete_event", G_CALLBACK(window_delete_event_cb), NULL);
index c0eaa7b49c61ebe65143e2603749e5406148d8d2..5255057f7dea09e454885e07f3491d8a495932ae 100644 (file)
@@ -965,7 +965,6 @@ static void gtk_mac_lte_stat_init(const char *optarg, void *userdata _U_)
     GtkWidget     *close_bt;
     GtkWidget     *help_bt;
 
-    GtkTooltips   *tooltips = gtk_tooltips_new();
     GtkListStore  *store;
 
     GtkTreeView       *tree_view;
@@ -1208,9 +1207,8 @@ static void gtk_mac_lte_stat_init(const char *optarg, void *userdata _U_)
     g_signal_connect(hs->ul_filter_bt, "clicked", G_CALLBACK(ul_filter_clicked), hs);
     gtk_widget_set_sensitive(hs->ul_filter_bt, FALSE);
     gtk_widget_show(hs->ul_filter_bt);
-    gtk_tooltips_set_tip(tooltips, hs->ul_filter_bt,
-                         "Generate and set a filter showing only UL frames with selected RNTI and UEId",
-                         NULL);
+    gtk_widget_set_tooltip_text(hs->ul_filter_bt,
+                         "Generate and set a filter showing only UL frames with selected RNTI and UEId");
 
     /* DL only */
     hs->dl_filter_bt = gtk_button_new_with_label("Set DL display filter on selected this RNTI / UEId");
@@ -1218,9 +1216,8 @@ static void gtk_mac_lte_stat_init(const char *optarg, void *userdata _U_)
     g_signal_connect(hs->dl_filter_bt, "clicked", G_CALLBACK(dl_filter_clicked), hs);
     gtk_widget_set_sensitive(hs->dl_filter_bt, FALSE);
     gtk_widget_show(hs->dl_filter_bt);
-    gtk_tooltips_set_tip(tooltips, hs->dl_filter_bt,
-                         "Generate and set a filter showing only DL frames with selected RNTI and UEId",
-                         NULL);
+    gtk_widget_set_tooltip_text(hs->dl_filter_bt,
+                         "Generate and set a filter showing only DL frames with selected RNTI and UEId");
 
     /* UL and DL */
     hs->uldl_filter_bt = gtk_button_new_with_label("Set UL / DL display filter on selected this RNTI / UEId");
@@ -1228,9 +1225,8 @@ static void gtk_mac_lte_stat_init(const char *optarg, void *userdata _U_)
     g_signal_connect(hs->uldl_filter_bt, "clicked", G_CALLBACK(uldl_filter_clicked), hs);
     gtk_widget_set_sensitive(hs->uldl_filter_bt, FALSE);
     gtk_widget_show(hs->uldl_filter_bt);
-    gtk_tooltips_set_tip(tooltips, hs->uldl_filter_bt,
-                         "Generate and set a filter showing only frames with selected RNTI and UEId",
-                         NULL);
+    gtk_widget_set_tooltip_text(hs->uldl_filter_bt,
+                         "Generate and set a filter showing only frames with selected RNTI and UEId");
 
 
     /* Allow DCT errors to be shown... */
@@ -1238,8 +1234,8 @@ static void gtk_mac_lte_stat_init(const char *optarg, void *userdata _U_)
     gtk_container_add(GTK_CONTAINER(filter_buttons_hb), hs->show_dct_errors_cb);
     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(hs->show_dct_errors_cb), FALSE);
     g_signal_connect(hs->show_dct_errors_cb, "toggled", G_CALLBACK(mac_lte_dct_errors_cb), hs);
-    gtk_tooltips_set_tip(tooltips, hs->show_dct_errors_cb, "When checked, generated filters will "
-                         "include DCT2000 error strings", NULL);
+    gtk_widget_set_tooltip_text(hs->show_dct_errors_cb, "When checked, generated filters will "
+                         "include DCT2000 error strings");
     /* Initially disabled */
     gtk_widget_set_sensitive(hs->show_dct_errors_cb, FALSE);
 
@@ -1253,8 +1249,8 @@ static void gtk_mac_lte_stat_init(const char *optarg, void *userdata _U_)
     gtk_box_pack_start(GTK_BOX(filter_buttons_hb), hs->dct_error_substring_te, FALSE, FALSE, 0);
     gtk_widget_show(hs->dct_error_substring_te);
     gtk_widget_set_sensitive(hs->dct_error_substring_te, FALSE);
-    gtk_tooltips_set_tip(tooltips, hs->dct_error_substring_te,
-                         "If given, only match error strings containing this substring", NULL);
+    gtk_widget_set_tooltip_text(hs->dct_error_substring_te,
+                         "If given, only match error strings containing this substring");
 
 
     /**********************************************/
index 5d60a92eef97acd2206973116101ed6a2423dc95..6f322a05c2bb27640b6f971fdb6edf0bcbb7d0d9 100644 (file)
@@ -113,22 +113,17 @@ void set_toolbar_for_capture_file(gboolean have_capture_file) {
 /* Enable or disable menu items based on whether you have an unsaved
    capture file you've finished reading. */
 void set_toolbar_for_unsaved_capture_file(gboolean have_unsaved_capture_file) {
-    GtkTooltips *tooltips;
-
-    tooltips = gtk_tooltips_new();
 
     if (toolbar_init) {
         if(have_unsaved_capture_file) {
        gtk_tool_button_set_stock_id(GTK_TOOL_BUTTON(save_button),
            GTK_STOCK_SAVE);
-        gtk_tool_item_set_tooltip(save_button, tooltips,
-           SAVE_BUTTON_TOOLTIP_TEXT, NULL);
+        gtk_widget_set_tooltip_text(GTK_WIDGET(save_button),SAVE_BUTTON_TOOLTIP_TEXT);
         g_object_set_data(G_OBJECT(save_button), "save", GINT_TO_POINTER(1));
         } else {
        gtk_tool_button_set_stock_id(GTK_TOOL_BUTTON(save_button),
            GTK_STOCK_SAVE_AS);
-        gtk_tool_item_set_tooltip(save_button, tooltips,
-           SAVE_AS_BUTTON_TOOLTIP_TEXT, NULL);
+        gtk_widget_set_tooltip_text(GTK_WIDGET(save_button), SAVE_AS_BUTTON_TOOLTIP_TEXT);
         g_object_set_data(G_OBJECT(save_button), "save", GINT_TO_POINTER(0));
         }
         /*gtk_widget_set_sensitive((GTK_WIDGET(save_button), have_unsaved_capture_file);
@@ -225,17 +220,17 @@ static void toolbar_append_separator(GtkWidget *toolbar) {
 
 
 
-#define toolbar_item(new_item, toolbar, stock, tooltips, tooltip_text, callback, user_data) { \
+#define toolbar_item(new_item, toolbar, stock, tooltip_text, callback, user_data) { \
     new_item = gtk_tool_button_new_from_stock(stock); \
-    gtk_tool_item_set_tooltip(new_item, tooltips,  tooltip_text, NULL); \
+    gtk_widget_set_tooltip_text(GTK_WIDGET(new_item), tooltip_text); \
     g_signal_connect(new_item, "clicked", G_CALLBACK(callback), user_data); \
     gtk_toolbar_insert(GTK_TOOLBAR(toolbar), new_item, -1); \
     gtk_widget_show(GTK_WIDGET(new_item)); \
     }
 
-#define toolbar_toggle_button(new_item, window, toolbar, stock, tooltips, tooltip_text, callback, user_data) { \
+#define toolbar_toggle_button(new_item, window, toolbar, stock, tooltip_text, callback, user_data) { \
     new_item = gtk_toggle_tool_button_new_from_stock(stock); \
-    gtk_tool_item_set_tooltip(new_item, tooltips,  tooltip_text, NULL);        \
+    gtk_widget_set_tooltip_text(GTK_WIDGET(new_item), tooltip_text);   \
     g_signal_connect(new_item, "toggled", G_CALLBACK(callback), user_data); \
     gtk_toolbar_insert(GTK_TOOLBAR(toolbar), new_item, -1); \
     gtk_widget_show_all(GTK_WIDGET(new_item)); \
@@ -280,9 +275,6 @@ toolbar_new(void)
 {
     GtkWidget *main_tb;
     GtkWidget *window = top_level;
-    GtkTooltips *tooltips;
-
-    tooltips = gtk_tooltips_new();
 
     /* this function should be only called once! */
     g_assert(!toolbar_init);
@@ -303,25 +295,25 @@ toolbar_new(void)
 
 #ifdef HAVE_LIBPCAP
     toolbar_item(if_button, main_tb,
-       WIRESHARK_STOCK_CAPTURE_INTERFACES, tooltips, "List the available capture interfaces...", capture_if_cb, NULL);
+       WIRESHARK_STOCK_CAPTURE_INTERFACES, "List the available capture interfaces...", capture_if_cb, NULL);
 
     toolbar_item(capture_options_button, main_tb,
-       WIRESHARK_STOCK_CAPTURE_OPTIONS, tooltips, "Show the capture options...", capture_prep_cb, NULL);
+       WIRESHARK_STOCK_CAPTURE_OPTIONS, "Show the capture options...", capture_prep_cb, NULL);
 
     toolbar_item(new_button, main_tb,
-       WIRESHARK_STOCK_CAPTURE_START, tooltips, "Start a new live capture", capture_start_cb, NULL);
+       WIRESHARK_STOCK_CAPTURE_START, "Start a new live capture", capture_start_cb, NULL);
 
     toolbar_item(stop_button, main_tb,
-       WIRESHARK_STOCK_CAPTURE_STOP, tooltips, "Stop the running live capture", capture_stop_cb, NULL);
+       WIRESHARK_STOCK_CAPTURE_STOP, "Stop the running live capture", capture_stop_cb, NULL);
 
     toolbar_item(clear_button, main_tb,
-       WIRESHARK_STOCK_CAPTURE_RESTART, tooltips, "Restart the running live capture", capture_restart_cb, NULL);
+       WIRESHARK_STOCK_CAPTURE_RESTART, "Restart the running live capture", capture_restart_cb, NULL);
 
     toolbar_append_separator(main_tb);
 #endif /* HAVE_LIBPCAP */
 
     toolbar_item(open_button, main_tb,
-       GTK_STOCK_OPEN, tooltips, "Open a capture file...", file_open_cmd_cb, NULL);
+       GTK_STOCK_OPEN, "Open a capture file...", file_open_cmd_cb, NULL);
 
     /* Only create a separate button in GTK < 2.4.  With GTK 2.4+, we will
      * just modify the save_button to read/show save or save as as needed.
@@ -332,83 +324,83 @@ toolbar_new(void)
      */
 
     toolbar_item(save_button, main_tb,
-       GTK_STOCK_SAVE, tooltips, SAVE_BUTTON_TOOLTIP_TEXT, file_save_or_save_as_cmd_cb, NULL);
+       GTK_STOCK_SAVE, SAVE_BUTTON_TOOLTIP_TEXT, file_save_or_save_as_cmd_cb, NULL);
     g_object_set_data(G_OBJECT(save_button), "save", GINT_TO_POINTER(1));
 
     toolbar_item(close_button, main_tb,
-       GTK_STOCK_CLOSE, tooltips, "Close this capture file", file_close_cmd_cb, NULL);
+       GTK_STOCK_CLOSE, "Close this capture file", file_close_cmd_cb, NULL);
 
     toolbar_item(reload_button, main_tb,
-       GTK_STOCK_REFRESH, tooltips, "Reload this capture file", file_reload_cmd_cb, NULL);
+       GTK_STOCK_REFRESH, "Reload this capture file", file_reload_cmd_cb, NULL);
 
     toolbar_item(print_button, main_tb,
-       GTK_STOCK_PRINT, tooltips, "Print packet(s)...", file_print_cmd_cb, NULL);
+       GTK_STOCK_PRINT, "Print packet(s)...", file_print_cmd_cb, NULL);
 
     toolbar_append_separator(main_tb);
 
     toolbar_item(find_button, main_tb,
-       GTK_STOCK_FIND, tooltips, "Find a packet...", find_frame_cb, NULL);
+       GTK_STOCK_FIND, "Find a packet...", find_frame_cb, NULL);
 
     toolbar_item(history_back_button, main_tb,
-       GTK_STOCK_GO_BACK, tooltips, "Go back in packet history", history_back_cb, NULL);
+       GTK_STOCK_GO_BACK, "Go back in packet history", history_back_cb, NULL);
 
     toolbar_item(history_forward_button, main_tb,
-       GTK_STOCK_GO_FORWARD, tooltips, "Go forward in packet history", history_forward_cb, NULL);
+       GTK_STOCK_GO_FORWARD, "Go forward in packet history", history_forward_cb, NULL);
 
     toolbar_item(go_to_button, main_tb,
-       GTK_STOCK_JUMP_TO, tooltips, "Go to the packet with number...", goto_frame_cb, NULL);
+       GTK_STOCK_JUMP_TO, "Go to the packet with number...", goto_frame_cb, NULL);
 
     toolbar_item(go_to_top_button, main_tb,
-       GTK_STOCK_GOTO_TOP, tooltips, "Go to the first packet", goto_top_frame_cb, NULL);
+       GTK_STOCK_GOTO_TOP, "Go to the first packet", goto_top_frame_cb, NULL);
 
     toolbar_item(go_to_bottom_button, main_tb,
-       GTK_STOCK_GOTO_BOTTOM, tooltips, "Go to the last packet", goto_bottom_frame_cb, NULL);
+       GTK_STOCK_GOTO_BOTTOM, "Go to the last packet", goto_bottom_frame_cb, NULL);
 
     toolbar_append_separator(main_tb);
 
     toolbar_toggle_button(colorize_button, window, main_tb,
-       WIRESHARK_STOCK_COLORIZE, tooltips, "Colorize Packet List", colorize_toggle_cb, NULL);
+       WIRESHARK_STOCK_COLORIZE, "Colorize Packet List", colorize_toggle_cb, NULL);
 
 #ifdef HAVE_LIBPCAP
     toolbar_toggle_button(autoscroll_button, window, main_tb,
-       WIRESHARK_STOCK_AUTOSCROLL, tooltips, "Auto Scroll Packet List in Live Capture", auto_scroll_live_toggle_cb, NULL);
+       WIRESHARK_STOCK_AUTOSCROLL, "Auto Scroll Packet List in Live Capture", auto_scroll_live_toggle_cb, NULL);
 #endif
 
     toolbar_append_separator(main_tb);
 
     toolbar_item(zoom_in_button, main_tb,
-       GTK_STOCK_ZOOM_IN, tooltips, "Zoom in", view_zoom_in_cb, NULL);
+       GTK_STOCK_ZOOM_IN, "Zoom in", view_zoom_in_cb, NULL);
 
     toolbar_item(zoom_out_button, main_tb,
-       GTK_STOCK_ZOOM_OUT, tooltips, "Zoom out", view_zoom_out_cb, NULL);
+       GTK_STOCK_ZOOM_OUT, "Zoom out", view_zoom_out_cb, NULL);
 
     toolbar_item(zoom_100_button, main_tb,
-       GTK_STOCK_ZOOM_100, tooltips, "Zoom 100%", view_zoom_100_cb, NULL);
+       GTK_STOCK_ZOOM_100, "Zoom 100%", view_zoom_100_cb, NULL);
 
     toolbar_item(resize_columns_button, main_tb,
-    WIRESHARK_STOCK_RESIZE_COLUMNS, tooltips, "Resize All Columns", new_packet_list_resize_columns_cb, NULL);
+    WIRESHARK_STOCK_RESIZE_COLUMNS, "Resize All Columns", new_packet_list_resize_columns_cb, NULL);
 
     toolbar_append_separator(main_tb);
 
 #ifdef HAVE_LIBPCAP
     toolbar_item(capture_filter_button, main_tb,
-       WIRESHARK_STOCK_CAPTURE_FILTER, tooltips, "Edit capture filter...", cfilter_dialog_cb, NULL);
+       WIRESHARK_STOCK_CAPTURE_FILTER, "Edit capture filter...", cfilter_dialog_cb, NULL);
 #endif /* HAVE_LIBPCAP */
 
     toolbar_item(display_filter_button, main_tb,
-       WIRESHARK_STOCK_DISPLAY_FILTER, tooltips, "Edit/apply display filter...", dfilter_dialog_cb, NULL);
+       WIRESHARK_STOCK_DISPLAY_FILTER, "Edit/apply display filter...", dfilter_dialog_cb, NULL);
 
     toolbar_item(color_display_button, main_tb,
-       GTK_STOCK_SELECT_COLOR, tooltips, "Edit coloring rules...", color_display_cb, NULL);
+       GTK_STOCK_SELECT_COLOR, "Edit coloring rules...", color_display_cb, NULL);
 
     /* the preference button uses it's own Stock icon label "Prefs", as "Preferences" is too long */
     toolbar_item(prefs_button, main_tb,
-       GTK_STOCK_PREFERENCES, tooltips, "Edit preferences...", prefs_cb, NULL);
+       GTK_STOCK_PREFERENCES, "Edit preferences...", prefs_cb, NULL);
 
     toolbar_append_separator(main_tb);
 
     toolbar_item(help_button, main_tb,
-       GTK_STOCK_HELP, tooltips, "Show some help...", topic_cb, GINT_TO_POINTER(HELP_CONTENT));
+       GTK_STOCK_HELP, "Show some help...", topic_cb, GINT_TO_POINTER(HELP_CONTENT));
 
     /* disable all "sensitive" items by default */
     toolbar_init = TRUE;
index fc26bb080c035ebce130523f16db1a444b8e1c5c..736bfc2c4b92bfd68b7de86247c0546209e3fecb 100644 (file)
@@ -644,7 +644,6 @@ mcaststream_dlg_create(void)
        /*GtkWidget *bt_unselect;*/
        GtkWidget *bt_params;
        GtkWidget *bt_close;
-       GtkTooltips *tooltips = gtk_tooltips_new();
 
        const gchar *title_name_ptr;
        gchar *win_name;
@@ -684,19 +683,19 @@ mcaststream_dlg_create(void)
 
        /*bt_unselect = gtk_button_new_with_label ("Unselect");
          gtk_container_add (GTK_CONTAINER (hbuttonbox), bt_unselect);
-         gtk_tooltips_set_tip (tooltips, bt_unselect, "Undo stream selection", NULL);*/
+         gtk_widget_set_tooltip_text (bt_unselect, "Undo stream selection");*/
 
        bt_params = gtk_button_new_with_label ("Set parameters");
        gtk_container_add (GTK_CONTAINER (hbuttonbox), bt_params);
-       gtk_tooltips_set_tip (tooltips, bt_params, "Set buffer, limit and speed parameters", NULL);
+       gtk_widget_set_tooltip_text (bt_params, "Set buffer, limit and speed parameters");
 
        bt_filter = gtk_button_new_with_label ("Prepare Filter");
        gtk_container_add (GTK_CONTAINER (hbuttonbox), bt_filter);
-       gtk_tooltips_set_tip (tooltips, bt_filter, "Prepare a display filter of the selected stream", NULL);
+       gtk_widget_set_tooltip_text (bt_filter, "Prepare a display filter of the selected stream");
 
        bt_close = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
        gtk_container_add (GTK_CONTAINER (hbuttonbox), bt_close);
-       gtk_tooltips_set_tip (tooltips, bt_close, "Close this dialog", NULL);
+       gtk_widget_set_tooltip_text (bt_close, "Close this dialog");
        GTK_WIDGET_SET_FLAGS(bt_close, GTK_CAN_DEFAULT);
 
        /*g_signal_connect(bt_unselect, "clicked", G_CALLBACK(mcaststream_on_unselect), NULL);*/
index 9e50da1f63dfb826aefd88b9fb546dd6b606231c..43c21868fa185bf15eb59e1827c0ec6420487317 100644 (file)
@@ -104,7 +104,6 @@ capture_prefs_show(void)
        GList           *if_list, *combo_list;
        int             err;
        int             row = 0;
-       GtkTooltips     *tooltips = gtk_tooltips_new();
        gchar           *tooltips_text;
 
        /* Main vertical box */
@@ -117,7 +116,6 @@ capture_prefs_show(void)
        gtk_table_set_row_spacings(GTK_TABLE(main_tb), 10);
        gtk_table_set_col_spacings(GTK_TABLE(main_tb), 15);
        gtk_widget_show(main_tb);
-       g_object_set_data(G_OBJECT(main_tb), E_TOOLTIPS_KEY, tooltips);
 
        /* Default device */
        if_lb = gtk_label_new("Default interface:");
@@ -149,8 +147,8 @@ capture_prefs_show(void)
 
        gtk_table_attach_defaults(GTK_TABLE(main_tb), if_cbxe, 1, 2, row, row+1);
        tooltips_text = "The default interface to be captured from.";
-       gtk_tooltips_set_tip(tooltips, if_lb, tooltips_text, NULL);
-       gtk_tooltips_set_tip(tooltips, gtk_bin_get_child(GTK_BIN(if_cbxe)), tooltips_text, NULL);
+       gtk_widget_set_tooltip_text(if_lb, tooltips_text);
+       gtk_widget_set_tooltip_text(gtk_bin_get_child(GTK_BIN(if_cbxe)), tooltips_text);
        gtk_widget_show(if_cbxe);
        g_object_set_data(G_OBJECT(main_vb), DEVICE_KEY, if_cbxe);
        row++;
@@ -163,8 +161,8 @@ capture_prefs_show(void)
 
        ifopts_bt = gtk_button_new_from_stock(WIRESHARK_STOCK_EDIT);
        tooltips_text = "Open a dialog box to set various interface options.";
-       gtk_tooltips_set_tip(tooltips, ifopts_lb, tooltips_text, NULL);
-       gtk_tooltips_set_tip(tooltips, ifopts_bt, tooltips_text, NULL);
+       gtk_widget_set_tooltip_text(ifopts_lb, tooltips_text);
+       gtk_widget_set_tooltip_text(ifopts_bt, tooltips_text);
        g_signal_connect(ifopts_bt, "clicked", G_CALLBACK(ifopts_edit_cb), NULL);
        gtk_table_attach_defaults(GTK_TABLE(main_tb), ifopts_bt, 1, 2, row, row+1);
        row++;
@@ -319,7 +317,6 @@ ifopts_edit_cb(GtkWidget *w, gpointer data _U_)
        int row = 0;
 
        GtkWidget   *caller   = gtk_widget_get_toplevel(w);
-       GtkTooltips *tooltips = gtk_tooltips_new();
 
        /* Has an edit dialog box already been opened for that top-level
           widget? */
@@ -580,19 +577,17 @@ ifopts_edit_cb(GtkWidget *w, gpointer data _U_)
        gtk_widget_show(bbox);
 
        ok_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_OK);
-       gtk_tooltips_set_tip(tooltips, ok_bt,
-                            "Save changes and exit dialog", NULL);
+       gtk_widget_set_tooltip_text(ok_bt, "Save changes and exit dialog");
        g_signal_connect(ok_bt, "clicked", G_CALLBACK(ifopts_edit_ok_cb), ifopts_edit_dlg);
 
        cancel_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CANCEL);
-       gtk_tooltips_set_tip(tooltips, cancel_bt,
-                            "Cancel and exit dialog", NULL);
+       gtk_widget_set_tooltip_text(cancel_bt, "Cancel and exit dialog");
         window_set_cancel_button(ifopts_edit_dlg, cancel_bt, window_cancel_button_cb);
 
        help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
        g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb),
                         (gpointer)HELP_CAPTURE_INTERFACE_OPTIONS_DIALOG);
-       gtk_tooltips_set_tip (tooltips, help_bt, "Show topic specific help", NULL);
+       gtk_widget_set_tooltip_text (help_bt, "Show topic specific help");
 
        gtk_widget_grab_default(ok_bt);
 
index 1ff83198df4a474f7cd871aad3dfc196006ec577..ba37c8700d117e65ed9b2d9ec9c85f138bf58b41 100644 (file)
@@ -119,7 +119,6 @@ struct ct_struct {
   GtkWidget    *notebook;
   GtkWidget    *tree;
   GtkTreeIter  iter;
-  GtkTooltips  *tooltips;
   gint         page;
   gboolean     is_protocol;
 };
@@ -345,7 +344,6 @@ module_prefs_show(module_t *module, gpointer user_data)
     gtk_box_pack_start(GTK_BOX(main_vb), main_tb, FALSE, FALSE, 0);
     gtk_table_set_row_spacings(GTK_TABLE(main_tb), 10);
     gtk_table_set_col_spacings(GTK_TABLE(main_tb), 15);
-    g_object_set_data(G_OBJECT(main_tb), E_TOOLTIPS_KEY, cts->tooltips);
 
     /* Add items for each of the preferences */
     prefs_pref_foreach(module, pref_show, main_tb);
@@ -449,7 +447,6 @@ prefs_page_cb(GtkWidget *w _U_, gpointer dummy _U_, PREFS_PAGE_E prefs_page)
    * and its control widgets is inactive and the tooltip doesn't pop up when
    * the mouse is over it.
    */
-  cts.tooltips = gtk_tooltips_new();
 
   /* Container for each row of widgets */
   cts.main_vb = gtk_vbox_new(FALSE, 5);
@@ -648,7 +645,7 @@ prefs_page_cb(GtkWidget *w _U_, gpointer dummy _U_, PREFS_PAGE_E prefs_page)
 
 static void
 set_option_label(GtkWidget *main_tb, int table_position,
-    const gchar *label_text, const gchar *tooltip_text, GtkTooltips *tooltips)
+    const gchar *label_text, const gchar *tooltip_text)
 {
   GtkWidget *label;
   GtkWidget *event_box;
@@ -661,8 +658,8 @@ set_option_label(GtkWidget *main_tb, int table_position,
   gtk_event_box_set_visible_window (GTK_EVENT_BOX(event_box), FALSE);
   gtk_table_attach_defaults(GTK_TABLE(main_tb), event_box, 0, 1,
                             table_position, table_position + 1);
-  if (tooltip_text != NULL && tooltips != NULL)
-    gtk_tooltips_set_tip(tooltips, event_box, tooltip_text, NULL);
+  if (tooltip_text != NULL)
+    gtk_widget_set_tooltip_text(event_box, tooltip_text);
   gtk_container_add(GTK_CONTAINER(event_box), label);
   gtk_widget_show(event_box);
 }
@@ -671,20 +668,16 @@ GtkWidget *
 create_preference_check_button(GtkWidget *main_tb, int table_position,
     const gchar *label_text, const gchar *tooltip_text, gboolean active)
 {
-  GtkTooltips *tooltips;
   GtkWidget *check_box;
 
-  tooltips = g_object_get_data(G_OBJECT(main_tb), E_TOOLTIPS_KEY);
-
-  set_option_label(main_tb, table_position, label_text, tooltip_text,
-                   tooltips);
+  set_option_label(main_tb, table_position, label_text, tooltip_text);
 
   check_box = gtk_check_button_new();
   gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check_box), active);
   gtk_table_attach_defaults(GTK_TABLE(main_tb), check_box, 1, 2,
                             table_position, table_position + 1);
-  if (tooltip_text != NULL && tooltips != NULL)
-    gtk_tooltips_set_tip(tooltips, check_box, tooltip_text, NULL);
+  if (tooltip_text != NULL)
+    gtk_widget_set_tooltip_text(check_box, tooltip_text);
 
   return check_box;
 }
@@ -694,17 +687,13 @@ create_preference_radio_buttons(GtkWidget *main_tb, int table_position,
     const gchar *label_text, const gchar *tooltip_text,
     const enum_val_t *enumvals, gint current_val)
 {
-  GtkTooltips *tooltips;
   GtkWidget *radio_button_hbox, *button = NULL;
   GSList *rb_group;
   int idx;
   const enum_val_t *enum_valp;
   GtkWidget *event_box;
 
-  tooltips = g_object_get_data(G_OBJECT(main_tb), E_TOOLTIPS_KEY);
-
-  set_option_label(main_tb, table_position, label_text, tooltip_text,
-                   tooltips);
+  set_option_label(main_tb, table_position, label_text, tooltip_text);
 
   radio_button_hbox = gtk_hbox_new(FALSE, 0);
   rb_group = NULL;
@@ -728,8 +717,8 @@ create_preference_radio_buttons(GtkWidget *main_tb, int table_position,
   gtk_container_add(GTK_CONTAINER(event_box), radio_button_hbox);
   gtk_table_attach_defaults(GTK_TABLE(main_tb), event_box, 1, 2,
                             table_position, table_position+1);
-  if (tooltip_text != NULL && tooltips != NULL)
-    gtk_tooltips_set_tip(tooltips, event_box, tooltip_text, NULL);
+  if (tooltip_text != NULL)
+    gtk_widget_set_tooltip_text(event_box, tooltip_text);
   gtk_widget_show(event_box);
 
   /*
@@ -790,21 +779,17 @@ create_preference_option_menu(GtkWidget *main_tb, int table_position,
     const gchar *label_text, const gchar *tooltip_text,
     const enum_val_t *enumvals, gint current_val)
 {
-  GtkTooltips *tooltips;
   GtkWidget *menu_box, *combo_box;
   int menu_idx, idx;
   const enum_val_t *enum_valp;
   GtkWidget *event_box;
 
-  tooltips = g_object_get_data(G_OBJECT(main_tb), E_TOOLTIPS_KEY);
-
-  set_option_label(main_tb, table_position, label_text, tooltip_text,
-                   tooltips);
+  set_option_label(main_tb, table_position, label_text, tooltip_text);
 
   /* Create a menu from the enumvals */
   combo_box = gtk_combo_box_new_text ();
-  if (tooltip_text != NULL && tooltips != NULL)
-    gtk_tooltips_set_tip(tooltips, combo_box, tooltip_text, NULL);
+  if (tooltip_text != NULL)
+    gtk_widget_set_tooltip_text(combo_box, tooltip_text);
   menu_idx = 0;
   for (enum_valp = enumvals, idx = 0; enum_valp->name != NULL;
        enum_valp++, idx++) {
@@ -827,8 +812,8 @@ create_preference_option_menu(GtkWidget *main_tb, int table_position,
   gtk_event_box_set_visible_window (GTK_EVENT_BOX(event_box), FALSE);
   gtk_table_attach_defaults(GTK_TABLE(main_tb), event_box,
                             1, 2, table_position, table_position + 1);
-  if (tooltip_text != NULL && tooltips != NULL)
-    gtk_tooltips_set_tip(tooltips, event_box, tooltip_text, NULL);
+  if (tooltip_text != NULL)
+    gtk_widget_set_tooltip_text(event_box, tooltip_text);
   gtk_container_add(GTK_CONTAINER(event_box), menu_box);
 
   return combo_box;
@@ -852,21 +837,17 @@ GtkWidget *
 create_preference_entry(GtkWidget *main_tb, int table_position,
     const gchar *label_text, const gchar *tooltip_text, char *value)
 {
-  GtkTooltips *tooltips;
   GtkWidget *entry;
 
-  tooltips = g_object_get_data(G_OBJECT(main_tb), E_TOOLTIPS_KEY);
-
-  set_option_label(main_tb, table_position, label_text, tooltip_text,
-                   tooltips);
+  set_option_label(main_tb, table_position, label_text, tooltip_text);
 
   entry = gtk_entry_new();
   if (value != NULL)
     gtk_entry_set_text(GTK_ENTRY(entry), value);
   gtk_table_attach_defaults(GTK_TABLE(main_tb), entry, 1, 2,
                             table_position, table_position + 1);
-  if (tooltip_text != NULL && tooltips != NULL)
-    gtk_tooltips_set_tip(tooltips, entry, tooltip_text, NULL);
+  if (tooltip_text != NULL)
+    gtk_widget_set_tooltip_text(entry, tooltip_text);
   gtk_widget_show(entry);
 
   return entry;
@@ -876,19 +857,16 @@ GtkWidget *
 create_preference_static_text(GtkWidget *main_tb, int table_position,
     const gchar *label_text, const gchar *tooltip_text)
 {
-  GtkTooltips *tooltips;
   GtkWidget *label;
 
-  tooltips = g_object_get_data(G_OBJECT(main_tb), E_TOOLTIPS_KEY);
-
   if(label_text != NULL)
     label = gtk_label_new(label_text);
   else
     label = gtk_label_new("");
   gtk_table_attach_defaults(GTK_TABLE(main_tb), label, 0, 2,
                             table_position, table_position + 1);
-  if (tooltip_text != NULL && tooltips != NULL)
-    gtk_tooltips_set_tip(tooltips, label, tooltip_text, NULL);
+  if (tooltip_text != NULL)
+    gtk_widget_set_tooltip_text(label, tooltip_text);
   gtk_widget_show(label);
 
   return label;
@@ -898,13 +876,9 @@ GtkWidget *
 create_preference_uat(GtkWidget *main_tb, int table_position,
     const gchar *label_text, const gchar *tooltip_text, void* uat)
 {
-  GtkTooltips *tooltips;
   GtkWidget *button = NULL;
 
-  tooltips = g_object_get_data(G_OBJECT(main_tb), E_TOOLTIPS_KEY);
-
-  set_option_label(main_tb, table_position, label_text, tooltip_text,
-                   tooltips);
+  set_option_label(main_tb, table_position, label_text, tooltip_text);
 
   button = gtk_button_new_from_stock(WIRESHARK_STOCK_EDIT);
 
@@ -912,8 +886,8 @@ create_preference_uat(GtkWidget *main_tb, int table_position,
 
   gtk_table_attach_defaults(GTK_TABLE(main_tb), button, 1, 2,
                             table_position, table_position+1);
-  if (tooltip_text != NULL && tooltips != NULL)
-    gtk_tooltips_set_tip(tooltips, button, tooltip_text, NULL);
+  if (tooltip_text != NULL)
+    gtk_widget_set_tooltip_text(button, tooltip_text);
   gtk_widget_show(button);
 
   return button;
index dca73eb296f32b20f1ae0083e914e24cea1a85ab..ccce7784f54c7773c3b1d3b42f37e942d56dde85 100644 (file)
@@ -91,8 +91,6 @@ extern void prefs_page_cb(GtkWidget *widget, gpointer data, PREFS_PAGE_E prefs_p
  */
 extern void properties_cb(GtkWidget *widget, gpointer data);
 
-#define E_TOOLTIPS_KEY "tooltips"
-
 /** Create a check button for a preferences page.
  *
  * @param main_tb the table to put this button into
index f8c4e71477492078c318d07b6a272577e51d447d..4707302566027c4e5114a0027f77406c2d50cd01 100644 (file)
@@ -173,8 +173,6 @@ gui_prefs_show(void)
        GtkWidget *macosx_style_cb;
 #endif
 
-       GtkTooltips *tooltips = gtk_tooltips_new();
-
        int        pos = 0;
        char       current_val_str[128];
 
@@ -193,7 +191,6 @@ gui_prefs_show(void)
        gtk_box_pack_start(GTK_BOX(main_vb), main_tb, FALSE, FALSE, 0);
        gtk_table_set_row_spacings(GTK_TABLE(main_tb), 10);
        gtk_table_set_col_spacings(GTK_TABLE(main_tb), 15);
-       g_object_set_data(G_OBJECT(main_tb), E_TOOLTIPS_KEY, tooltips);
 
        /* Packet list selection browseable */
        plist_browse_om = create_preference_option_menu(main_tb, pos++,
index a388aee435225d0063d35cdc201856d863c43130..be2aca76a8ca0621b6d1de4b3b0920327959ba61 100644 (file)
@@ -72,7 +72,7 @@ typedef struct {
 #define LAYOUT_CONTENT3_VB_KEY      "layout_content3_vbox"
 
 
-static GtkWidget *layout_content_radio_vbox(GtkWidget *main_vb, GtkTooltips *tooltips, int i, layout_pane_content_e content) {
+static GtkWidget *layout_content_radio_vbox(GtkWidget *main_vb, int i, layout_pane_content_e content) {
     GtkWidget  *radio_vb, *radio_lb;
     GtkWidget  *radio_none_rb, *radio_plist_rb, *radio_pdetails_rb, *radio_pbytes_rb;
     char buf[64];
@@ -89,22 +89,22 @@ static GtkWidget *layout_content_radio_vbox(GtkWidget *main_vb, GtkTooltips *too
 
     radio_none_rb = gtk_radio_button_new_with_mnemonic_from_widget(NULL, "None");
     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radio_none_rb), content == layout_pane_content_none);
-    gtk_tooltips_set_tip (tooltips, radio_none_rb, "Put nothing in this pane.", NULL);
+    gtk_widget_set_tooltip_text (radio_none_rb, "Put nothing in this pane.");
     gtk_container_add(GTK_CONTAINER(radio_vb), radio_none_rb);
 
     radio_plist_rb = gtk_radio_button_new_with_mnemonic_from_widget(GTK_RADIO_BUTTON(radio_none_rb), "Packet List");
     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radio_plist_rb), content == layout_pane_content_plist);
-    gtk_tooltips_set_tip (tooltips, radio_plist_rb, "Put the packet list in this pane.", NULL);
+    gtk_widget_set_tooltip_text (radio_plist_rb, "Put the packet list in this pane.");
     gtk_container_add(GTK_CONTAINER(radio_vb), radio_plist_rb);
 
     radio_pdetails_rb = gtk_radio_button_new_with_mnemonic_from_widget(GTK_RADIO_BUTTON(radio_none_rb), "Packet Details");
     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radio_pdetails_rb), content == layout_pane_content_pdetails);
-    gtk_tooltips_set_tip (tooltips, radio_pdetails_rb, "Put the packet details tree in this pane.", NULL);
+    gtk_widget_set_tooltip_text (radio_pdetails_rb, "Put the packet details tree in this pane.");
     gtk_container_add(GTK_CONTAINER(radio_vb), radio_pdetails_rb);
 
     radio_pbytes_rb = gtk_radio_button_new_with_mnemonic_from_widget(GTK_RADIO_BUTTON(radio_none_rb), "Packet Bytes");
     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radio_pbytes_rb), content == layout_pane_content_pbytes);
-    gtk_tooltips_set_tip (tooltips, radio_pbytes_rb, "Put the packet bytes dump in this pane.", NULL);
+    gtk_widget_set_tooltip_text (radio_pbytes_rb, "Put the packet bytes dump in this pane.");
     gtk_container_add(GTK_CONTAINER(radio_vb), radio_pbytes_rb);
 
     g_object_set_data(G_OBJECT(radio_vb), LAYOUT_NONE_RB_KEY,       radio_none_rb);
@@ -300,8 +300,6 @@ layout_prefs_show(void)
     GtkWidget  *filter_toolbar_placement_om;
     GtkWidget  *window_title_te;
 
-    GtkTooltips   *tooltips = gtk_tooltips_new();
-
     const char ** inline_txt [LAYOUT_QTY] = {
                icon_layout_5_xpm, icon_layout_2_xpm, icon_layout_1_xpm,
                icon_layout_4_xpm, icon_layout_3_xpm, icon_layout_6_xpm };
@@ -352,25 +350,24 @@ layout_prefs_show(void)
     gtk_container_set_border_width(GTK_CONTAINER(radio_hb), 6);
     gtk_box_pack_start (GTK_BOX(pane_vb), radio_hb, FALSE, FALSE, 0);
 
-    radio_vb = layout_content_radio_vbox(main_vb, tooltips, 1, prefs.gui_layout_content_1);
+    radio_vb = layout_content_radio_vbox(main_vb, 1, prefs.gui_layout_content_1);
     gtk_container_set_border_width(GTK_CONTAINER(radio_vb), 6);
     gtk_box_pack_start (GTK_BOX(radio_hb), radio_vb, FALSE, FALSE, 0);
     g_object_set_data(G_OBJECT(main_vb), LAYOUT_CONTENT1_VB_KEY, radio_vb);
 
-    radio_vb = layout_content_radio_vbox(main_vb, tooltips, 2, prefs.gui_layout_content_2);
+    radio_vb = layout_content_radio_vbox(main_vb, 2, prefs.gui_layout_content_2);
     gtk_container_set_border_width(GTK_CONTAINER(radio_vb), 6);
     gtk_box_pack_start (GTK_BOX(radio_hb), radio_vb, FALSE, FALSE, 0);
     g_object_set_data(G_OBJECT(main_vb), LAYOUT_CONTENT2_VB_KEY, radio_vb);
 
-    radio_vb = layout_content_radio_vbox(main_vb, tooltips, 3, prefs.gui_layout_content_3);
+    radio_vb = layout_content_radio_vbox(main_vb, 3, prefs.gui_layout_content_3);
     gtk_container_set_border_width(GTK_CONTAINER(radio_vb), 6);
     gtk_box_pack_start (GTK_BOX(radio_hb), radio_vb, FALSE, FALSE, 0);
     g_object_set_data(G_OBJECT(main_vb), LAYOUT_CONTENT3_VB_KEY, radio_vb);
 
     default_vb = gtk_vbox_new(FALSE, 0);
     default_bt = gtk_button_new_with_label("Default panes");
-    gtk_tooltips_set_tip (tooltips, default_bt,
-        "Reset the pane layout settings to default values.", NULL);
+    gtk_widget_set_tooltip_text (default_bt, "Reset the pane layout settings to default values.");
     g_signal_connect(default_bt, "clicked", G_CALLBACK(layout_defaults_cb), main_vb);
     gtk_box_pack_end(GTK_BOX(default_vb), default_bt, FALSE, FALSE, 0);
     gtk_box_pack_end(GTK_BOX(radio_hb), default_vb, FALSE, FALSE, 0);
@@ -385,7 +382,6 @@ layout_prefs_show(void)
     gtk_box_pack_start( GTK_BOX(hbox), main_tb, FALSE, FALSE, 0 );
     gtk_table_set_row_spacings( GTK_TABLE(main_tb), 10 );
     gtk_table_set_col_spacings( GTK_TABLE(main_tb), 15 );
-    g_object_set_data(G_OBJECT(main_tb), E_TOOLTIPS_KEY, tooltips);
 
     /* Scrollbar placement */
     scrollbar_om = create_preference_option_menu(main_tb, pos++,
index 830996e0dbf5870eafe9a080a5598eb35cb6d85a..04c2ac44cf8c74498a18d99be4c297ae3fa45c2c 100644 (file)
@@ -85,7 +85,6 @@ nameres_prefs_show(void)
        guint           table_row;
        GtkWidget       *main_tb, *main_vb;
        GtkWidget       *m_resolv_cb, *n_resolv_cb, *t_resolv_cb;
-       GtkTooltips *tooltips = gtk_tooltips_new();
 #if defined(HAVE_C_ARES) || defined(HAVE_GNU_ADNS)
        GtkWidget       *c_resolv_cb;
        GtkWidget       *resolv_concurrency_te;
@@ -119,7 +118,6 @@ nameres_prefs_show(void)
        gtk_table_set_row_spacings(GTK_TABLE(main_tb), 10);
        gtk_table_set_col_spacings(GTK_TABLE(main_tb), 15);
        gtk_widget_show(main_tb);
-       g_object_set_data(G_OBJECT(main_tb), E_TOOLTIPS_KEY, tooltips);
 
        /* Resolve MAC addresses */
        table_row = 0;
index 0b4225c0291cf755b05df0ecd9343c5a7b6cbf2e..590ba02e3ea300154df72c8ebdfce28c93191a70 100644 (file)
@@ -41,7 +41,6 @@ protocols_prefs_show(void)
 {
         GtkWidget   *main_tb, *main_vb;
         GtkWidget   *display_hidden_cb;
-        GtkTooltips *tooltips = gtk_tooltips_new();
         int pos = 0;
 
         /* Main vertical box */
@@ -54,7 +53,6 @@ protocols_prefs_show(void)
         gtk_table_set_row_spacings(GTK_TABLE(main_tb), 10);
         gtk_table_set_col_spacings(GTK_TABLE(main_tb), 15);
         gtk_widget_show(main_tb);
-        g_object_set_data(G_OBJECT(main_tb), E_TOOLTIPS_KEY, tooltips);
 
         /* Show hidden protocol items in packet list */
         display_hidden_cb = create_preference_check_button(main_tb, pos++,
index 5da157fbcb0685101c16a5288f4cf09579cace55..01813460255847b4d2c3c31fd55f95de2db87504 100644 (file)
@@ -52,8 +52,6 @@ stats_prefs_show(void)
 #ifdef HAVE_LIBPORTAUDIO
         GtkWidget   *rtp_player_max_visible_te;
 #endif
-
-        GtkTooltips *tooltips = gtk_tooltips_new();
         int pos = 0;
 
         /* Main vertical box */
@@ -66,7 +64,6 @@ stats_prefs_show(void)
         gtk_table_set_row_spacings(GTK_TABLE(main_tb), 10);
         gtk_table_set_col_spacings(GTK_TABLE(main_tb), 15);
         gtk_widget_show(main_tb);
-        g_object_set_data(G_OBJECT(main_tb), E_TOOLTIPS_KEY, tooltips);
 
         /* Tap update gap in ms */
         tap_update_interval_te = create_preference_entry(main_tb, pos++,
@@ -74,8 +71,7 @@ stats_prefs_show(void)
             "Determines time between tap updates.", max_visible_str);
         g_snprintf(update_interval_str, sizeof(update_interval_str), "%d", prefs.tap_update_interval);
         gtk_entry_set_text(GTK_ENTRY(tap_update_interval_te), update_interval_str);
-        gtk_tooltips_set_tip(tooltips, tap_update_interval_te,
-            "Gap in milliseconds between updates to taps is defined here", NULL);
+        gtk_widget_set_tooltip_text(tap_update_interval_te, "Gap in milliseconds between updates to taps is defined here");
         g_object_set_data(G_OBJECT(main_vb), TAP_UPDATE_INTERVAL_KEY, tap_update_interval_te);
 
 #ifdef HAVE_LIBPORTAUDIO
@@ -85,8 +81,7 @@ stats_prefs_show(void)
             "Determines maximum height of RTP Player window.", max_visible_str);
         g_snprintf(max_visible_str, sizeof(max_visible_str), "%d", prefs.rtp_player_max_visible);
         gtk_entry_set_text(GTK_ENTRY(rtp_player_max_visible_te), max_visible_str);
-        gtk_tooltips_set_tip(tooltips, rtp_player_max_visible_te,
-            "Maximum height of RTP Player window is defined here.", NULL);
+        gtk_widget_set_tooltip_text(rtp_player_max_visible_te, "Maximum height of RTP Player window is defined here.");
         g_object_set_data(G_OBJECT(main_vb), RTP_PLAYER_MAX_VISIBLE_KEY, rtp_player_max_visible_te);
 #endif
 
index 0a907109833d20b913a368b91469fb5d27ce20b8..417af503a75c2d60c249db9e7ac7799ff99d376b 100644 (file)
@@ -506,12 +506,6 @@ GtkWidget *range_new(packet_range_t *range)
   GtkWidget     *ignored_c_lb;
   GtkWidget     *ignored_d_lb;
  
-  GtkTooltips   *tooltips;
-
-
-  /* Enable tooltips */
-  tooltips = gtk_tooltips_new();
-
   /* range table */
   range_tb = gtk_table_new(7, 3, FALSE);
   gtk_container_set_border_width(GTK_CONTAINER(range_tb), 5);
@@ -520,20 +514,19 @@ GtkWidget *range_new(packet_range_t *range)
   captured_bt = gtk_toggle_button_new_with_mnemonic("_Captured");
   gtk_table_attach_defaults(GTK_TABLE(range_tb), captured_bt, 1, 2, 0, 1);
   g_signal_connect(captured_bt, "toggled", G_CALLBACK(toggle_captured_cb), range_tb);
-  gtk_tooltips_set_tip (tooltips,captured_bt,("Process all the below chosen packets"), NULL);
+  gtk_widget_set_tooltip_text (captured_bt,("Process all the below chosen packets"));
 
   /* displayed button */
   displayed_bt = gtk_toggle_button_new_with_mnemonic("_Displayed");
   gtk_table_attach_defaults(GTK_TABLE(range_tb), displayed_bt, 2, 3, 0, 1);
   g_signal_connect(displayed_bt, "toggled", G_CALLBACK(toggle_filtered_cb), range_tb);
-  gtk_tooltips_set_tip (tooltips,displayed_bt,("Process only the below chosen packets, which also passes the current display filter"), NULL);
+  gtk_widget_set_tooltip_text (displayed_bt,("Process only the below chosen packets, which also passes the current display filter"));
 
 
   /* Process all packets */
   select_all_rb = gtk_radio_button_new_with_mnemonic_from_widget(NULL, "_All packets");
   gtk_table_attach_defaults(GTK_TABLE(range_tb), select_all_rb, 0, 1, 1, 2);
-  gtk_tooltips_set_tip (tooltips, select_all_rb, 
-      ("Process all packets"), NULL);
+  gtk_widget_set_tooltip_text (select_all_rb, ("Process all packets"));
   g_signal_connect(select_all_rb, "toggled", G_CALLBACK(toggle_select_all), range_tb);
 
   select_all_c_lb = gtk_label_new("?");
@@ -545,7 +538,7 @@ GtkWidget *range_new(packet_range_t *range)
   /* Process currently selected */
   select_curr_rb = gtk_radio_button_new_with_mnemonic_from_widget(GTK_RADIO_BUTTON(select_all_rb), "_Selected packet only");
   gtk_table_attach_defaults(GTK_TABLE(range_tb), select_curr_rb, 0, 1, 2, 3);
-  gtk_tooltips_set_tip (tooltips, select_curr_rb, ("Process the currently selected packet only"), NULL);
+  gtk_widget_set_tooltip_text (select_curr_rb, ("Process the currently selected packet only"));
   g_signal_connect(select_curr_rb, "toggled", G_CALLBACK(toggle_select_selected), range_tb);
 
   select_curr_c_lb = gtk_label_new("?");
@@ -557,7 +550,7 @@ GtkWidget *range_new(packet_range_t *range)
   /* Process marked packets */
   select_marked_only_rb = gtk_radio_button_new_with_mnemonic_from_widget(GTK_RADIO_BUTTON(select_all_rb), "_Marked packets only");
   gtk_table_attach_defaults(GTK_TABLE(range_tb), select_marked_only_rb, 0, 1, 3, 4);
-  gtk_tooltips_set_tip (tooltips, select_marked_only_rb, ("Process marked packets only"), NULL);
+  gtk_widget_set_tooltip_text (select_marked_only_rb, ("Process marked packets only"));
   g_signal_connect(select_marked_only_rb, "toggled", G_CALLBACK(toggle_select_marked_only), range_tb);
 
   select_marked_only_c_lb = gtk_label_new("?");
@@ -569,7 +562,7 @@ GtkWidget *range_new(packet_range_t *range)
   /* Process packet range between first and last packet */
   select_marked_range_rb = gtk_radio_button_new_with_mnemonic_from_widget(GTK_RADIO_BUTTON(select_all_rb), "From first _to last marked packet");
   gtk_table_attach_defaults(GTK_TABLE(range_tb), select_marked_range_rb, 0, 1, 4, 5);
-  gtk_tooltips_set_tip (tooltips,select_marked_range_rb,("Process all packets between the first and last marker"), NULL);
+  gtk_widget_set_tooltip_text (select_marked_range_rb,("Process all packets between the first and last marker"));
   g_signal_connect(select_marked_range_rb, "toggled", G_CALLBACK(toggle_select_marked_range), range_tb);
 
   select_marked_range_c_lb = gtk_label_new("?");
@@ -581,7 +574,7 @@ GtkWidget *range_new(packet_range_t *range)
   /* Process a user specified provided packet range : -10,30,40-70,80- */
   select_user_range_rb = gtk_radio_button_new_with_mnemonic_from_widget(GTK_RADIO_BUTTON(select_all_rb), "Specify a packet _range:");
   gtk_table_attach_defaults(GTK_TABLE(range_tb), select_user_range_rb, 0, 1, 5, 6);
-  gtk_tooltips_set_tip (tooltips,select_user_range_rb,("Process a specified packet range"), NULL);
+  gtk_widget_set_tooltip_text (select_user_range_rb,("Process a specified packet range"));
   g_signal_connect(select_user_range_rb, "toggled", G_CALLBACK(toggle_select_user_range), range_tb);
 
   select_user_range_c_lb = gtk_label_new("?");
@@ -594,15 +587,14 @@ GtkWidget *range_new(packet_range_t *range)
   select_user_range_entry = gtk_entry_new();
   gtk_entry_set_max_length (GTK_ENTRY (select_user_range_entry), 254);
   gtk_table_attach_defaults(GTK_TABLE(range_tb), select_user_range_entry, 0, 1, 6, 7);
-  gtk_tooltips_set_tip (tooltips,select_user_range_entry, 
-       ("Specify a range of packet numbers :     \nExample :  1-10,18,25-100,332-"), NULL);
+  gtk_widget_set_tooltip_text (select_user_range_entry, ("Specify a range of packet numbers :     \nExample :  1-10,18,25-100,332-"));
   g_signal_connect(select_user_range_entry,"changed", G_CALLBACK(range_entry), range_tb);
   g_signal_connect(select_user_range_entry,"activate", G_CALLBACK(range_entry_in_event), range_tb);
 
   /* Remove ignored packets */
   remove_ignored_cb = gtk_check_button_new_with_mnemonic("Remove _Ignored packets");
   gtk_table_attach_defaults(GTK_TABLE(range_tb), remove_ignored_cb, 0, 1, 7, 8);
-  gtk_tooltips_set_tip (tooltips,remove_ignored_cb,("Remove all packets marked as Ignored"), NULL);
+  gtk_widget_set_tooltip_text (remove_ignored_cb,("Remove all packets marked as Ignored"));
   g_signal_connect(remove_ignored_cb, "toggled", G_CALLBACK(toggle_remove_ignored), range_tb);
 
   ignored_c_lb = gtk_label_new("?");
index cb6d6d85c1279154752b5a70a7151be5e50a83dc..1ed140233effa9471b2e7b6e78de3ea06b442b8e 100644 (file)
@@ -1190,7 +1190,6 @@ static void gtk_rlc_lte_stat_init(const char *optarg, void *userdata _U_)
 
     GtkWidget         *close_bt;
     GtkWidget         *help_bt;
-    GtkTooltips       *tooltips = gtk_tooltips_new();
     GtkListStore      *store;
 
     GtkTreeView       *tree_view;
@@ -1243,8 +1242,8 @@ static void gtk_rlc_lte_stat_init(const char *optarg, void *userdata _U_)
     pdu_source_lb = gtk_frame_new("PDUs to use");
     show_mac_cb = gtk_check_button_new_with_mnemonic("Show RLC PDUs found inside logged MAC frames");
     gtk_container_add(GTK_CONTAINER(pdu_source_lb), show_mac_cb);
-    gtk_tooltips_set_tip(tooltips, show_mac_cb, "Can either use separately-logged RLC PDUs, OR find them "
-                         "decoded inside MAC PDUs (enabled in MAC dissector preferences)", NULL);
+    gtk_widget_set_tooltip_text(show_mac_cb, "Can either use separately-logged RLC PDUs, OR find them "
+                         "decoded inside MAC PDUs (enabled in MAC dissector preferences)");
 
 
     /* MAC on by default */
@@ -1416,26 +1415,26 @@ static void gtk_rlc_lte_stat_init(const char *optarg, void *userdata _U_)
     gtk_box_pack_start(GTK_BOX(filter_buttons_hb), hs->ul_filter_bt, TRUE, TRUE, 0);
     g_signal_connect(hs->ul_filter_bt, "clicked", G_CALLBACK(ul_filter_clicked), hs);
     gtk_widget_show(hs->ul_filter_bt);
-    gtk_tooltips_set_tip(tooltips, hs->ul_filter_bt, "Generate and set a display filter to show frames "
+    gtk_widget_set_tooltip_text(hs->ul_filter_bt, "Generate and set a display filter to show frames "
                          "associated with the channel, in the UL direction only. "
-                         "N.B. DL Status PDUs sent on this channel will also be shown for AM", NULL);
+                         "N.B. DL Status PDUs sent on this channel will also be shown for AM");
 
     /* DL only */
     hs->dl_filter_bt = gtk_button_new_with_label("Set DL display filter for this channel");
     gtk_box_pack_start(GTK_BOX(filter_buttons_hb), hs->dl_filter_bt, TRUE, TRUE, 0);
     g_signal_connect(hs->dl_filter_bt, "clicked", G_CALLBACK(dl_filter_clicked), hs);
     gtk_widget_show(hs->dl_filter_bt);
-    gtk_tooltips_set_tip(tooltips, hs->dl_filter_bt, "Generate and set a display filter to show frames "
+    gtk_widget_set_tooltip_text(hs->dl_filter_bt, "Generate and set a display filter to show frames "
                          "associated with the channel, in the DL direction only. "
-                         "N.B. UL Status PDUs sent on this channel will also be shown for AM", NULL);
+                         "N.B. UL Status PDUs sent on this channel will also be shown for AM");
 
     /* UL and DL */
     hs->uldl_filter_bt = gtk_button_new_with_label("Set UL / DL display filter for this channel");
     gtk_box_pack_start(GTK_BOX(filter_buttons_hb), hs->uldl_filter_bt, TRUE, TRUE, 0);
     g_signal_connect(hs->uldl_filter_bt, "clicked", G_CALLBACK(uldl_filter_clicked), hs);
     gtk_widget_show(hs->uldl_filter_bt);
-    gtk_tooltips_set_tip(tooltips, hs->uldl_filter_bt, "Generate and set a display filter to show frames "
-                         "associated with the channel, in UL and DL", NULL);
+    gtk_widget_set_tooltip_text(hs->uldl_filter_bt, "Generate and set a display filter to show frames "
+                         "associated with the channel, in UL and DL");
 
     /* Allow filtering on specific SN number. */
     /* Row with label and text entry control  */
@@ -1447,16 +1446,16 @@ static void gtk_rlc_lte_stat_init(const char *optarg, void *userdata _U_)
     hs->show_only_control_pdus_cb = gtk_check_button_new_with_mnemonic("Show only status PDUs");
     gtk_container_add(GTK_CONTAINER(sn_filter_hb), hs->show_only_control_pdus_cb);
     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(hs->show_only_control_pdus_cb), FALSE);
-    gtk_tooltips_set_tip(tooltips, hs->show_only_control_pdus_cb, "Generated filters will only show AM status PDUs "
-                         "(i.e. if you filter on UL you'll see ACKs/NACK replies sent in the DL)", NULL);
+    gtk_widget_set_tooltip_text(hs->show_only_control_pdus_cb, "Generated filters will only show AM status PDUs "
+                         "(i.e. if you filter on UL you'll see ACKs/NACK replies sent in the DL)");
 
     /* Allow DCT errors to be shown... */
     hs->show_dct_errors_cb = gtk_check_button_new_with_mnemonic("Show DCT2000 error strings...");
     gtk_container_add(GTK_CONTAINER(sn_filter_hb), hs->show_dct_errors_cb);
     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(hs->show_dct_errors_cb), FALSE);
     g_signal_connect(hs->show_dct_errors_cb, "toggled", G_CALLBACK(rlc_lte_dct_errors_cb), hs);
-    gtk_tooltips_set_tip(tooltips, hs->show_dct_errors_cb, "When checked, generated filters will "
-                         "include DCT2000 error strings", NULL);
+    gtk_widget_set_tooltip_text(hs->show_dct_errors_cb, "When checked, generated filters will "
+                         "include DCT2000 error strings");
 
     /* ... optionally limited by a substring */
     hs->dct_error_substring_lb = gtk_label_new("...containing");
@@ -1466,15 +1465,15 @@ static void gtk_rlc_lte_stat_init(const char *optarg, void *userdata _U_)
     hs->dct_error_substring_te = gtk_entry_new();
     gtk_box_pack_start(GTK_BOX(sn_filter_hb), hs->dct_error_substring_te, FALSE, FALSE, 0);
     gtk_widget_show(hs->dct_error_substring_te);
-    gtk_tooltips_set_tip(tooltips, hs->dct_error_substring_te,
-                         "If given, only match error strings containing this substring", NULL);
+    gtk_widget_set_tooltip_text(hs->dct_error_substring_te,
+                         "If given, only match error strings containing this substring");
 
     /* Allow filtering of a particular sequence number */
     hs->sn_filter_te = gtk_entry_new();
     gtk_box_pack_end(GTK_BOX(sn_filter_hb), hs->sn_filter_te, FALSE, FALSE, 0);
     gtk_widget_show(hs->sn_filter_te);
-    gtk_tooltips_set_tip(tooltips, hs->sn_filter_te, "Can limit generated filters to a given sequence number (0-1023). "
-                         "Will also include relevant AM status PDUs", NULL);
+    gtk_widget_set_tooltip_text(hs->sn_filter_te, "Can limit generated filters to a given sequence number (0-1023). "
+                         "Will also include relevant AM status PDUs");
 
     hs->sn_filter_lb = gtk_label_new("Sequence number to filter on:");
     gtk_box_pack_end(GTK_BOX(sn_filter_hb), hs->sn_filter_lb, FALSE, FALSE, 0);
index 5d6a74148c4e3f0a17b951e70565ec8ed9efa3eb..dee0b953725eba1977aef5cebeb861e9c7662443 100644 (file)
@@ -1692,7 +1692,6 @@ static void dialog_graph_init_window(user_data_t* user_data)
        GtkWidget *hbox;
        GtkWidget *bt_close;
        GtkWidget *bt_save;
-       GtkTooltips   *tooltips = gtk_tooltips_new();
 
        /* create the main window */
        user_data->dlg.dialog_graph.window=dlg_window_new("I/O Graphs");   /* transient_for top_level */
@@ -1723,7 +1722,7 @@ static void dialog_graph_init_window(user_data_t* user_data)
 
        bt_save = g_object_get_data(G_OBJECT(hbox), GTK_STOCK_SAVE);
        gtk_widget_set_sensitive(bt_save, FALSE);
-       gtk_tooltips_set_tip(tooltips, bt_save, "Save the displayed graph to a file", NULL);
+       gtk_widget_set_tooltip_text(bt_save, "Save the displayed graph to a file");
        g_signal_connect(bt_save, "clicked", G_CALLBACK(pixmap_save_cb), NULL);
        g_object_set_data(G_OBJECT(user_data->dlg.dialog_graph.window), "bt_save", bt_save);
 
@@ -3392,7 +3391,7 @@ static void create_rtp_dialog(user_data_t* user_data)
        gtk_container_add(GTK_CONTAINER(box4), player_bt);
        gtk_widget_show(player_bt);
        g_signal_connect(player_bt, "clicked", G_CALLBACK(on_player_bt_clicked), NULL);
-       /*gtk_tooltips_set_tip (tooltips, player_bt, "Launch the RTP player to listen the audio stream", NULL);*/
+       /*gtk_widget_set_tooltip_text (player_bt, "Launch the RTP player to listen the audio stream");*/
 #endif /* HAVE_LIBPORTAUDIO */
 
        next_bt = gtk_button_new_with_label("Next non-Ok");
index 2fcc50800064fd4da5c86a669b6fdc3c29dce2c0..c9b768a0527c789cb23577497da7abc425bbe162 100644 (file)
@@ -2109,8 +2109,6 @@ rtp_player_dlg_create(void)
        const gchar *title_name_ptr;
        gchar   *win_name;
 
-       GtkTooltips *tooltips = gtk_tooltips_new();
-
        title_name_ptr = cf_get_display_name(&cfile);
        win_name = g_strdup_printf("%s - VoIP - RTP Player", title_name_ptr);
 
@@ -2140,7 +2138,7 @@ rtp_player_dlg_create(void)
        cb_view_as_time_of_day = gtk_check_button_new_with_label("View as time of day");
        gtk_box_pack_start(GTK_BOX(timestamp_hb), cb_view_as_time_of_day, TRUE, FALSE, 0); /* Centered */
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(cb_view_as_time_of_day), FALSE);
-       gtk_tooltips_set_tip(tooltips, cb_view_as_time_of_day, "View the timestamps as time of day instead of seconds since beginning of capture", NULL);
+       gtk_widget_set_tooltip_text(cb_view_as_time_of_day, "View the timestamps as time of day instead of seconds since beginning of capture");
        g_signal_connect(cb_view_as_time_of_day, "toggled", G_CALLBACK(on_cb_view_as_time_of_day_clicked), NULL);
 
        h_jitter_buttons_box = gtk_hbox_new (FALSE, 0);
@@ -2152,14 +2150,14 @@ rtp_player_dlg_create(void)
        jitter_spinner_adj = (GtkAdjustment *) gtk_adjustment_new (50, 0, 500, 5, 10, 0);
        jitter_spinner = gtk_spin_button_new (jitter_spinner_adj, 5, 0);
        gtk_box_pack_start(GTK_BOX(h_jitter_buttons_box), jitter_spinner, FALSE, FALSE, 0);
-       gtk_tooltips_set_tip (tooltips, jitter_spinner, "The simulated jitter buffer in [ms]", NULL);
+       gtk_widget_set_tooltip_text (jitter_spinner, "The simulated jitter buffer in [ms]");
        g_signal_connect(GTK_OBJECT (jitter_spinner_adj), "value_changed", G_CALLBACK(jitter_spinner_value_changed), NULL);
 
        cb_use_rtp_timestamp = gtk_check_button_new_with_label("Use RTP timestamp");
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(cb_use_rtp_timestamp), FALSE);
        gtk_box_pack_start(GTK_BOX(h_jitter_buttons_box), cb_use_rtp_timestamp, FALSE, FALSE, 10);
        g_signal_connect(cb_use_rtp_timestamp, "toggled", G_CALLBACK(on_cb_use_rtp_clicked), NULL);
-       gtk_tooltips_set_tip (tooltips, cb_use_rtp_timestamp, "Use RTP Timestamp instead of the arriving packet time. This will not reproduce the RTP stream as the user heard it, but is useful when the RTP is being tunneled and the original packet timing is missing", NULL);
+       gtk_widget_set_tooltip_text (cb_use_rtp_timestamp, "Use RTP Timestamp instead of the arriving packet time. This will not reproduce the RTP stream as the user heard it, but is useful when the RTP is being tunneled and the original packet timing is missing");
 
        /* button row */
        hbuttonbox = gtk_hbutton_box_new ();
@@ -2170,27 +2168,27 @@ rtp_player_dlg_create(void)
        bt_decode = gtk_button_new_from_stock(WIRESHARK_STOCK_DECODE);
        gtk_container_add(GTK_CONTAINER(hbuttonbox), bt_decode);
        g_signal_connect(bt_decode, "clicked", G_CALLBACK(on_bt_decode_clicked), NULL);
-       gtk_tooltips_set_tip (tooltips, bt_decode, "Decode the RTP stream(s)", NULL);
+       gtk_widget_set_tooltip_text (bt_decode, "Decode the RTP stream(s)");
 
        bt_play = gtk_button_new_from_stock(GTK_STOCK_MEDIA_PLAY);
        gtk_container_add(GTK_CONTAINER(hbuttonbox), bt_play);
        g_signal_connect(bt_play, "clicked", G_CALLBACK(on_bt_play_clicked), NULL);
-       gtk_tooltips_set_tip (tooltips, bt_play, "Play the RTP channel(s)", NULL);
+       gtk_widget_set_tooltip_text (bt_play, "Play the RTP channel(s)");
 
        bt_pause = gtk_button_new_from_stock(GTK_STOCK_MEDIA_PAUSE);
        gtk_container_add(GTK_CONTAINER(hbuttonbox), bt_pause);
        g_signal_connect(bt_pause, "clicked", G_CALLBACK(on_bt_pause_clicked), NULL);
-       gtk_tooltips_set_tip (tooltips, bt_pause, "Pause the RTP channel(s)", NULL);
+       gtk_widget_set_tooltip_text (bt_pause, "Pause the RTP channel(s)");
 
        bt_stop = gtk_button_new_from_stock(GTK_STOCK_MEDIA_STOP);
        gtk_container_add(GTK_CONTAINER(hbuttonbox), bt_stop);
        g_signal_connect(bt_stop, "clicked", G_CALLBACK(on_bt_stop_clicked), NULL);
-       gtk_tooltips_set_tip (tooltips, bt_stop, "Stop the RTP channel(s)", NULL);
+       gtk_widget_set_tooltip_text (bt_stop, "Stop the RTP channel(s)");
 
        bt_close = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
        gtk_container_add (GTK_CONTAINER (hbuttonbox), bt_close);
        GTK_WIDGET_SET_FLAGS(bt_close, GTK_CAN_DEFAULT);
-       gtk_tooltips_set_tip (tooltips, bt_close, "Close this dialog", NULL);
+       gtk_widget_set_tooltip_text (bt_close, "Close this dialog");
        window_set_cancel_button(rtp_player_dlg_w, bt_close, window_cancel_button_cb);
 
        g_signal_connect(rtp_player_dlg_w, "delete_event", G_CALLBACK(window_delete_event_cb), NULL);
index 6734bacd1f5fe5ce8d039a532ff277c56d815500..0d5354a29d7ef0a53836b23321b4791d46749612 100644 (file)
@@ -968,7 +968,6 @@ rtpstream_dlg_create (void)
     GtkWidget *bt_analyze;
     GtkWidget *bt_close;
     GtkWidget *bt_copy;
-    GtkTooltips *tooltips = gtk_tooltips_new();
 
     rtpstream_dlg_w = dlg_window_new("Wireshark: RTP Streams");
     gtk_window_set_default_size(GTK_WINDOW(rtpstream_dlg_w), 620, 400);
@@ -1002,41 +1001,41 @@ rtpstream_dlg_create (void)
 
     bt_unselect = gtk_button_new_with_label ("Unselect");
     gtk_container_add (GTK_CONTAINER (hbuttonbox), bt_unselect);
-    gtk_tooltips_set_tip (tooltips, bt_unselect, "Undo stream selection", NULL);
+    gtk_widget_set_tooltip_text (bt_unselect, "Undo stream selection");
 
     bt_findrev = gtk_button_new_with_label ("Find Reverse");
     gtk_container_add (GTK_CONTAINER (hbuttonbox), bt_findrev);
-    gtk_tooltips_set_tip (tooltips, bt_findrev, "Find the reverse stream matching the selected forward stream", NULL);
+    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);
     gtk_container_add (GTK_CONTAINER (hbuttonbox), bt_goto);
 */
     bt_save = gtk_button_new_from_stock(GTK_STOCK_SAVE_AS);
     gtk_container_add (GTK_CONTAINER (hbuttonbox), bt_save);
-    gtk_tooltips_set_tip (tooltips, bt_save, "Save stream payload in rtpdump format", NULL);
+    gtk_widget_set_tooltip_text (bt_save, "Save stream payload in rtpdump format");
 
     bt_mark = gtk_button_new_with_label ("Mark Packets");
     gtk_container_add (GTK_CONTAINER (hbuttonbox), bt_mark);
-    gtk_tooltips_set_tip (tooltips, bt_mark, "Mark packets of the selected stream(s)", NULL);
+    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);
     gtk_container_add (GTK_CONTAINER (hbuttonbox), bt_filter);
-    gtk_tooltips_set_tip (tooltips, bt_filter, "Prepare a display filter of the selected stream(s)", NULL);
+    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);
     gtk_container_add (GTK_CONTAINER (hbuttonbox), bt_copy);
-    gtk_tooltips_set_tip(tooltips, bt_copy,
-        "Copy all statistical values of this page to the clipboard in CSV (Comma Separated Values) format.", NULL);
+    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);
     gtk_container_add (GTK_CONTAINER (hbuttonbox), bt_analyze);
-    gtk_tooltips_set_tip (tooltips, bt_analyze, "Open an analyze window of the selected stream(s)", NULL);
+    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);
     gtk_container_add (GTK_CONTAINER (hbuttonbox), bt_close);
-    gtk_tooltips_set_tip (tooltips, bt_close, "Close this dialog", NULL);
+    gtk_widget_set_tooltip_text (bt_close, "Close this dialog");
     GTK_WIDGET_SET_FLAGS(bt_close, GTK_CAN_DEFAULT);
 
     g_signal_connect(bt_unselect, "clicked", G_CALLBACK(rtpstream_on_unselect), NULL);
index 88e6fe9e3a9723de3c6f55e9ba672087b045d08d..94ce4542cd2413d720265cb67d0de928d8666026 100644 (file)
@@ -1027,7 +1027,6 @@ static void init_sctp_graph_window(struct sctp_udata *u_data)
        GtkWidget *vbox;
        GtkWidget *hbox;
        GtkWidget *bt_close, *sack_bt, *tsn_bt, *both_bt, *zoomin_bt;
-       GtkTooltips *tooltip_in, *tooltip_out;
 
        /* create the main window */
 
@@ -1070,15 +1069,13 @@ static void init_sctp_graph_window(struct sctp_udata *u_data)
        gtk_box_pack_start(GTK_BOX(hbox), zoomin_bt, FALSE, FALSE, 0);
        gtk_widget_show(zoomin_bt);
        g_signal_connect(zoomin_bt, "clicked", G_CALLBACK(on_zoomin_bt), u_data);
-       tooltip_in = gtk_tooltips_new();
-       gtk_tooltips_set_tip(tooltip_in, zoomin_bt, "Zoom in the area you have selected", NULL);
+       gtk_widget_set_tooltip_text(zoomin_bt, "Zoom in the area you have selected");
 
        zoomout_bt = gtk_button_new_with_label ("Zoom out");
        gtk_box_pack_start(GTK_BOX(hbox), zoomout_bt, FALSE, FALSE, 0);
        gtk_widget_show(zoomout_bt);
        g_signal_connect(zoomout_bt, "clicked", G_CALLBACK(on_zoomout_bt), u_data);
-       tooltip_out = gtk_tooltips_new();
-       gtk_tooltips_set_tip(tooltip_out, zoomout_bt, "Zoom out one step", NULL);
+       gtk_widget_set_tooltip_text(zoomout_bt, "Zoom out one step");
        gtk_widget_set_sensitive(zoomout_bt, FALSE);
 
        bt_close = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
index d06c80ab4e3ee23d9b96a45208c22b5891e3891b..2013ef090462ecaeb11f4fff8eadebe8514b49a5 100644 (file)
@@ -1380,7 +1380,6 @@ init_sctp_graph_window(struct sctp_udata *u_data)
        GtkWidget *vbox;
        GtkWidget *hbox;
        GtkWidget *bt_close, *tsn_bt, *both_bt, *zoomin_bt;
-       GtkTooltips *tooltip_in, *tooltip_out;
 
        /* create the main window */
        u_data->io->window= dlg_window_new("WSCTP Graphics");  /* transient_for top_level */
@@ -1420,15 +1419,13 @@ init_sctp_graph_window(struct sctp_udata *u_data)
        gtk_box_pack_start(GTK_BOX(hbox), zoomin_bt, FALSE, FALSE, 0);
        gtk_widget_show(zoomin_bt);
        g_signal_connect(zoomin_bt, "clicked", G_CALLBACK(on_zoomin_bt), u_data);
-       tooltip_in = gtk_tooltips_new();
-       gtk_tooltips_set_tip(tooltip_in, zoomin_bt, "Zoom in the area you have selected", NULL);
+       gtk_widget_set_tooltip_text(zoomin_bt, "Zoom in the area you have selected");
 
        zoomout_bt = gtk_button_new_with_label ("Zoom out");
        gtk_box_pack_start(GTK_BOX(hbox), zoomout_bt, FALSE, FALSE, 0);
        gtk_widget_show(zoomout_bt);
        g_signal_connect(zoomout_bt, "clicked", G_CALLBACK(on_zoomout_bt), u_data);
-       tooltip_out = gtk_tooltips_new();
-       gtk_tooltips_set_tip(tooltip_out, zoomout_bt, "Zoom out one step", NULL);
+       gtk_widget_set_tooltip_text(zoomout_bt, "Zoom out one step");
        gtk_widget_set_sensitive(zoomout_bt, FALSE);
 
        bt_close = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
index da6faeb925a2262bae05f12f848a21533a55f095..e6a36aa37274c494ca340345435a454dc828c101 100644 (file)
@@ -418,9 +418,6 @@ static void uat_edit_dialog(uat_t* uat, gint row, gboolean copy) {
        struct _uat_dlg_data* dd = g_malloc(sizeof(struct _uat_dlg_data));
        uat_field_t* f = uat->fields;
        guint colnum;
-       GtkTooltips *tooltips;
-
-       tooltips = gtk_tooltips_new();
        
        dd->entries = g_ptr_array_new();
        dd->win = dlg_conf_window_new(ep_strdup_printf("%s: %s", uat->name, (row == -1 ? "New" : "Edit")));
@@ -473,7 +470,7 @@ static void uat_edit_dialog(uat_t* uat, gint row, gboolean copy) {
 
                label = gtk_label_new(ep_strdup_printf("%s:", f[colnum].title));
                if (f[colnum].desc != NULL)
-                       gtk_tooltips_set_tip(tooltips, event_box, f[colnum].desc, NULL);
+                       gtk_widget_set_tooltip_text(event_box, f[colnum].desc);
 
                gtk_misc_set_alignment(GTK_MISC(label), 1.0f, 0.5f);
                gtk_table_attach_defaults(GTK_TABLE(main_tb), event_box, 0, 1, colnum+1, colnum + 2);
@@ -864,9 +861,6 @@ static GtkWidget* uat_window(void* u) {
        GtkTreeViewColumn *column;
        GtkCellRenderer *renderer;
        GtkTreeSelection *selection;
-       GtkTooltips *tooltips;
-
-       tooltips = gtk_tooltips_new();
 
        if (uat->rep) {
                window_present(uat->rep->window);
@@ -920,7 +914,7 @@ static GtkWidget* uat_window(void* u) {
                gtk_tree_view_column_set_sizing(column,GTK_TREE_VIEW_COLUMN_AUTOSIZE);
                gtk_tree_view_append_column (rep->list, column);
                if (f[colnum].desc != NULL)
-                       gtk_tooltips_set_tip(tooltips, column->button, f[colnum].desc, NULL);
+                       gtk_widget_set_tooltip_text(column->button, f[colnum].desc);
 
                /*
                gtk_clist_set_column_title(GTK_CLIST(rep->clist), colnum, f[colnum].title);
index 51cd479f95eb72ddc8617567a5e67f615650694f..d53347c74f853ca73fca17106c9b7bf394ea9eb2 100644 (file)
@@ -652,7 +652,6 @@ voip_calls_dlg_create(void)
        GtkWidget *hbuttonbox;
        GtkWidget *bt_close;
        GtkWidget *bt_select_all;
-       GtkTooltips *tooltips = gtk_tooltips_new();
        const gchar *title_name_ptr;
        gchar *win_name;
 
@@ -688,35 +687,35 @@ voip_calls_dlg_create(void)
 
        /*bt_unselect = gtk_button_new_with_label ("Unselect");
        gtk_container_add (GTK_CONTAINER (hbuttonbox), bt_unselect);
-       gtk_tooltips_set_tip (tooltips, bt_unselect, "Unselect this conversation", NULL);*/
+       gtk_widget_set_tooltip_text (bt_unselect, "Unselect this conversation");*/
 
        bt_filter = gtk_button_new_from_stock(WIRESHARK_STOCK_PREPARE_FILTER);
        gtk_container_add(GTK_CONTAINER(hbuttonbox), bt_filter);
-       gtk_tooltips_set_tip(tooltips, bt_filter, "Prepare a display filter of the selected conversation", NULL);
+       gtk_widget_set_tooltip_text(bt_filter, "Prepare a display filter of the selected conversation");
 
        bt_graph = gtk_button_new_from_stock(WIRESHARK_STOCK_VOIP_FLOW);
        gtk_container_add(GTK_CONTAINER(hbuttonbox), bt_graph);
        gtk_widget_show(bt_graph);
        g_signal_connect(bt_graph, "clicked", G_CALLBACK(on_graph_bt_clicked), NULL);
-       gtk_tooltips_set_tip(tooltips, bt_graph, "Show a flow graph of the selected calls.", NULL);
+       gtk_widget_set_tooltip_text(bt_graph, "Show a flow graph of the selected calls.");
 
 #ifdef HAVE_LIBPORTAUDIO
        bt_player = gtk_button_new_from_stock(WIRESHARK_STOCK_AUDIO_PLAYER);
        gtk_container_add(GTK_CONTAINER(hbuttonbox), bt_player);
        gtk_widget_show(bt_player);
        g_signal_connect(bt_player, "clicked", G_CALLBACK(on_player_bt_clicked), NULL);
-       gtk_tooltips_set_tip(tooltips, bt_player, "Launch the RTP player to listen the selected calls.", NULL);
+       gtk_widget_set_tooltip_text(bt_player, "Launch the RTP player to listen the selected calls.");
 #endif /* HAVE_LIBPORTAUDIO */
 
        bt_select_all = gtk_button_new_from_stock(GTK_STOCK_SELECT_ALL);
        gtk_container_add(GTK_CONTAINER(hbuttonbox), bt_select_all);
        GTK_WIDGET_SET_FLAGS(bt_select_all, GTK_CAN_DEFAULT);
-       gtk_tooltips_set_tip(tooltips, bt_select_all, "Select all the calls", NULL);
+       gtk_widget_set_tooltip_text(bt_select_all, "Select all the calls");
 
        bt_close = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
        gtk_container_add(GTK_CONTAINER (hbuttonbox), bt_close);
        GTK_WIDGET_SET_FLAGS(bt_close, GTK_CAN_DEFAULT);
-       gtk_tooltips_set_tip(tooltips, bt_close, "Close this dialog", NULL);
+       gtk_widget_set_tooltip_text(bt_close, "Close this dialog");
 
        /*g_signal_connect(bt_unselect, "clicked", G_CALLBACK(voip_calls_on_unselect), NULL);*/
        g_signal_connect(bt_filter, "clicked", G_CALLBACK(voip_calls_on_filter), NULL);
index 55e15fc8310b26ef79c52858377c5087fb303f29..855ae035865853e73321a277f173b503b71d61aa 100644 (file)
@@ -1737,7 +1737,6 @@ wlanstat_dlg_create (void)
        GtkWidget     *close_bt;
        GtkWidget     *help_bt;
        GtkWidget     *copy_bt;
-       GtkTooltips   *tooltips = gtk_tooltips_new();
        GtkListStore  *store;
        GtkTreeView       *tree_view;
        GtkCellRenderer   *renderer;
@@ -1905,22 +1904,22 @@ wlanstat_dlg_create (void)
        resolv_cb = gtk_check_button_new_with_mnemonic("Name resolution");
        gtk_container_add(GTK_CONTAINER(hbox), resolv_cb);
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(resolv_cb), TRUE);
-       gtk_tooltips_set_tip(tooltips, resolv_cb, "Show results of name resolutions rather than the \"raw\" values. "
-                            "Please note: The corresponding name resolution must be enabled.", NULL);
+       gtk_widget_set_tooltip_text(resolv_cb, "Show results of name resolutions rather than the \"raw\" values. "
+                            "Please note: The corresponding name resolution must be enabled.");
 
        g_signal_connect(resolv_cb, "toggled", G_CALLBACK(wlan_resolve_toggle_dest), hs);
 
        filter_cb = gtk_check_button_new_with_mnemonic("Limit to display filter");
        gtk_container_add(GTK_CONTAINER(hbox), filter_cb);
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(filter_cb), FALSE);
-       gtk_tooltips_set_tip(tooltips, filter_cb, "Limit the list to entries matching the current display filter.", NULL);
+       gtk_widget_set_tooltip_text(filter_cb, "Limit the list to entries matching the current display filter.");
        g_signal_connect(filter_cb, "toggled", G_CALLBACK(wlan_filter_toggle_dest), hs);
 
        existing_cb = gtk_check_button_new_with_mnemonic("Only show existing networks");
        gtk_container_add(GTK_CONTAINER(hbox), existing_cb);
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(existing_cb), FALSE);
-       gtk_tooltips_set_tip(tooltips, existing_cb, "This option disables probe requests for "
-                            "unknown networks.", NULL);
+       gtk_widget_set_tooltip_text(existing_cb, "This option disables probe requests for "
+                            "unknown networks.");
        g_signal_connect(existing_cb, "toggled", G_CALLBACK(wlan_existing_toggle_dest), hs);
 
        /* Button row. */
@@ -1933,8 +1932,8 @@ wlanstat_dlg_create (void)
 
        copy_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_COPY);
 /*     gtk_button_set_label(GTK_BUTTON(copy_bt), "Copy Overview"); */
-       gtk_tooltips_set_tip(tooltips, copy_bt,
-                            "Copy all statistical values of this page to the clipboard in CSV (Comma Separated Values) format.", NULL);
+       gtk_widget_set_tooltip_text(copy_bt,
+                            "Copy all statistical values of this page to the clipboard in CSV (Comma Separated Values) format.");
        g_signal_connect(copy_bt, "clicked", G_CALLBACK(wlan_copy_as_csv), hs->table);
 
        help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);