gtk_label_set -> gtk_label_set_text

"gtk_label_set is deprecated and should not be used in newly-written code.
Aliases gtk_label_set_text()."

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

diff --git a/gtk/bootp_stat.c b/gtk/bootp_stat.c
index d64541749fe7fc8acab238f062a3a9a9913ef605..f12a87c9ad36c6f78e2bd6706f291817cf9f215b 100644 (file)
--- a/gtk/bootp_stat.c
+++ b/gtk/bootp_stat.c
@@ -107,7 +107,7 @@ dhcp_draw_message_type(gchar *key _U_, dhcp_message_type_t *data, gchar * unused
        } else {
                /* Just update the label string */
                g_snprintf( string_buff, 256, "%9d", data->packets );
-               gtk_label_set( GTK_LABEL(data->widget), string_buff);
+                gtk_label_set_text( GTK_LABEL(data->widget), string_buff);
        }
 }
 static void

diff --git a/gtk/capture_info_dlg.c b/gtk/capture_info_dlg.c
index c7fec029104a36e3e1a371210acc5913c176a3ed..b91ab1885df81c08218ba59dc5b57dfd44bf15cd 100644 (file)
--- a/gtk/capture_info_dlg.c
+++ b/gtk/capture_info_dlg.c
@@ -316,7 +316,7 @@ capture_info    *cinfo)
   g_snprintf(label_str, sizeof(label_str), "%02ld:%02ld:%02ld",
            (long)(cinfo->running_time/3600), (long)((cinfo->running_time%3600)/60),
            (long)(cinfo->running_time%60));
-  gtk_label_set(GTK_LABEL(info->running_time_lb), label_str);
+    gtk_label_set_text(GTK_LABEL(info->running_time_lb), label_str);
 
   /* if we have new packets, update all rows */
   if (cinfo->new_packets) {
@@ -324,7 +324,7 @@ capture_info    *cinfo)
     for (i = 0; i < PACKET_COUNTS_SIZE; i++) {
         g_snprintf(label_str, sizeof(label_str), "%d",
                  *info->counts[i].value_ptr);
-        gtk_label_set(GTK_LABEL(info->counts[i].value_lb), label_str);
+         gtk_label_set_text(GTK_LABEL(info->counts[i].value_lb), label_str);
 
         /* don't try to update the "total" row progress bar */
         if (i != 0) {
@@ -335,7 +335,7 @@ capture_info    *cinfo)
         g_snprintf(label_str, sizeof(label_str), "%.1f%%",
                  pct(*info->counts[i].value_ptr, *info->counts[0].value_ptr));
 
-        gtk_label_set(GTK_LABEL(info->counts[i].percent_lb), label_str);
+         gtk_label_set_text(GTK_LABEL(info->counts[i].percent_lb), label_str);
     }
   }
 }

diff --git a/gtk/fileset_dlg.c b/gtk/fileset_dlg.c
index 9b7bca36be278de0c3a0e81f02dec96d547f06d4..f1919755cfd4656838284b81024ae4c271d8ea8d 100644 (file)
--- a/gtk/fileset_dlg.c
+++ b/gtk/fileset_dlg.c
@@ -212,7 +212,7 @@ fileset_dlg_add_file(fileset_entry *entry) {
     g_free(title);
 
     title = g_strdup_printf("... in directory: %s", fileset_get_dirname());
-    gtk_label_set(GTK_LABEL(fs_dir_lb), title);
+     gtk_label_set_text(GTK_LABEL(fs_dir_lb), title);
     g_free(title);
 
     gtk_widget_show_all(fs_tb);
@@ -270,7 +270,7 @@ fileset_init_table(GtkWidget *parent)
 
   gtk_window_set_title(GTK_WINDOW(fs_w), "Wireshark: 0 Files in Set");
 
-  gtk_label_set(GTK_LABEL(fs_dir_lb), "No capture file loaded!");
+   gtk_label_set_text(GTK_LABEL(fs_dir_lb), "No capture file loaded!");
 
   row++;
 }

diff --git a/gtk/mac_lte_stat_dlg.c b/gtk/mac_lte_stat_dlg.c
index d07fa8ee479af7f01713bf121a52e5fef29c223b..353998ff5386be922bd6b01dab64f2c22e4c4761 100644 (file)
--- a/gtk/mac_lte_stat_dlg.c
+++ b/gtk/mac_lte_stat_dlg.c
@@ -210,7 +210,7 @@ mac_lte_stat_reset(void *phs)
     /* Set all of the channel counters to 0 */
     for (n=1; n <=4; n++) {
         for (i=CCCH_COLUMN; i < NUM_CHANNEL_COLUMNS; i++) {
-            gtk_label_set(GTK_LABEL(selected_ue_column_entry[i][n]), "0");
+             gtk_label_set_text(GTK_LABEL(selected_ue_column_entry[i][n]), "0");
         }
     }
 }
@@ -384,41 +384,41 @@ mac_lte_ue_details(mac_lte_stat_t *hs _U_, mac_lte_ep_t *mac_stat_ep _U_, gboole
     /* UL SDUs */
     for (n=0; n < PREDEFINED_COLUMN-1; n++) {
         g_snprintf(buff, sizeof(buff), "%u", mac_stat_ep->stats.UL_sdus_for_lcid[n]);
-        gtk_label_set(GTK_LABEL(selected_ue_column_entry[n+1][1]), buff);
+         gtk_label_set_text(GTK_LABEL(selected_ue_column_entry[n+1][1]), buff);
     }
     g_snprintf(buff, sizeof(buff), "%u", mac_stat_ep->stats.is_predefined_data ?
                                              mac_stat_ep->stats.UL_frames : 0);
-    gtk_label_set(GTK_LABEL(selected_ue_column_entry[PREDEFINED_COLUMN][1]), buff);
+     gtk_label_set_text(GTK_LABEL(selected_ue_column_entry[PREDEFINED_COLUMN][1]), buff);
 
 
     /* UL Bytes */
     for (n=0; n < PREDEFINED_COLUMN-1; n++) {
         g_snprintf(buff, sizeof(buff), "%u", mac_stat_ep->stats.UL_bytes_for_lcid[n]);
-        gtk_label_set(GTK_LABEL(selected_ue_column_entry[n+1][2]), buff);
+         gtk_label_set_text(GTK_LABEL(selected_ue_column_entry[n+1][2]), buff);
     }
     g_snprintf(buff, sizeof(buff), "%u", mac_stat_ep->stats.is_predefined_data ?
                                              mac_stat_ep->stats.UL_total_bytes : 0);
-    gtk_label_set(GTK_LABEL(selected_ue_column_entry[PREDEFINED_COLUMN][2]), buff);
+     gtk_label_set_text(GTK_LABEL(selected_ue_column_entry[PREDEFINED_COLUMN][2]), buff);
 
 
     /* DL SDUs */
     for (n=0; n < PREDEFINED_COLUMN-1; n++) {
         g_snprintf(buff, sizeof(buff), "%u", mac_stat_ep->stats.DL_sdus_for_lcid[n]);
-        gtk_label_set(GTK_LABEL(selected_ue_column_entry[n+1][3]), buff);
+         gtk_label_set_text(GTK_LABEL(selected_ue_column_entry[n+1][3]), buff);
     }
     g_snprintf(buff, sizeof(buff), "%u", mac_stat_ep->stats.is_predefined_data ?
                                              mac_stat_ep->stats.DL_frames : 0);
-    gtk_label_set(GTK_LABEL(selected_ue_column_entry[PREDEFINED_COLUMN][3]), buff);
+     gtk_label_set_text(GTK_LABEL(selected_ue_column_entry[PREDEFINED_COLUMN][3]), buff);
 
 
     /* DL Bytes */
     for (n=0; n < PREDEFINED_COLUMN-1; n++) {
         g_snprintf(buff, sizeof(buff), "%u", mac_stat_ep->stats.DL_bytes_for_lcid[n]);
-        gtk_label_set(GTK_LABEL(selected_ue_column_entry[n+1][4]), buff);
+         gtk_label_set_text(GTK_LABEL(selected_ue_column_entry[n+1][4]), buff);
     }
     g_snprintf(buff, sizeof(buff), "%u", mac_stat_ep->stats.is_predefined_data ?
                                              mac_stat_ep->stats.DL_total_bytes : 0);
-    gtk_label_set(GTK_LABEL(selected_ue_column_entry[PREDEFINED_COLUMN][4]), buff);
+     gtk_label_set_text(GTK_LABEL(selected_ue_column_entry[PREDEFINED_COLUMN][4]), buff);
 }
 
 
@@ -440,13 +440,13 @@ mac_lte_stat_draw(void *phs)
 
     /* Common channel data */
     g_snprintf(buff, sizeof(buff), "BCH Frames: %u", common_stats.bch_frames);
-    gtk_label_set(GTK_LABEL(mac_lte_common_bch_frames), buff);
+     gtk_label_set_text(GTK_LABEL(mac_lte_common_bch_frames), buff);
     g_snprintf(buff, sizeof(buff), "BCH Bytes: %u", common_stats.bch_bytes);
-    gtk_label_set(GTK_LABEL(mac_lte_common_bch_bytes), buff);
+     gtk_label_set_text(GTK_LABEL(mac_lte_common_bch_bytes), buff);
     g_snprintf(buff, sizeof(buff), "PCH Frames: %u", common_stats.pch_frames);
-    gtk_label_set(GTK_LABEL(mac_lte_common_pch_frames), buff);
+     gtk_label_set_text(GTK_LABEL(mac_lte_common_pch_frames), buff);
     g_snprintf(buff, sizeof(buff), "PCH Bytes: %u", common_stats.pch_bytes);
-    gtk_label_set(GTK_LABEL(mac_lte_common_pch_bytes), buff);
+     gtk_label_set_text(GTK_LABEL(mac_lte_common_pch_bytes), buff);
 
     /* Per-UE table entries */
     ues_store = GTK_LIST_STORE(gtk_tree_view_get_model(hs->ue_table));

diff --git a/gtk/mcast_stream_dlg.c b/gtk/mcast_stream_dlg.c
index 4d02ce5d8b903cb116cf3961f6002cb6e464783a..dcac637d06b651863b5155d6da7e901cd104937b 100644 (file)
--- a/gtk/mcast_stream_dlg.c
+++ b/gtk/mcast_stream_dlg.c
@@ -136,7 +136,7 @@ static void add_to_clist(mcast_stream_info_t* strinfo)
                mcaststream_get_info()->allstreams->average_bw, mcaststream_get_info()->allstreams->element.maxbw, 
                mcaststream_get_info()->allstreams->element.topburstsize, burstint, 
                (float)(mcaststream_get_info()->allstreams->element.topbuffusage)/1000);
-       gtk_label_set(GTK_LABEL(top_label), label_text);
+        gtk_label_set_text(GTK_LABEL(top_label), label_text);
 
        g_snprintf(label_text, 200, "\nBurst int: %u ms   Burst alarm: %u pps   Buffer alarm: %u Bytes   Stream empty speed: %u Kbps   Total empty speed: %u Kbps\n", 
                burstint, trigger, bufferalarm, emptyspeed, cumulemptyspeed);

diff --git a/gtk/rtp_stream_dlg.c b/gtk/rtp_stream_dlg.c
index 51957670af8bf6894207cba4dfc97afe140406ff..4b78fc0e3a99f22b0f3d16b45d91576f4df4456a 100644 (file)
--- a/gtk/rtp_stream_dlg.c
+++ b/gtk/rtp_stream_dlg.c
@@ -144,7 +144,7 @@ static void add_to_clist(rtp_stream_info_t* strinfo)
        g_snprintf(label_text, 256,
                "Detected %d RTP streams. Choose one for forward and reverse direction for analysis",
                ++streams_nb);
-       gtk_label_set(GTK_LABEL(top_label), label_text);
+        gtk_label_set_text(GTK_LABEL(top_label), label_text);
 }
 
 /****************************************************************************/

diff --git a/gtk/sip_stat.c b/gtk/sip_stat.c
index b04cd3002e6a239028f7be50c5055a113c30cc6f..a92ddf0f683965be12df3d6bd2f6ac026e65a0ec 100644 (file)
--- a/gtk/sip_stat.c
+++ b/gtk/sip_stat.c
@@ -227,7 +227,7 @@ sip_draw_hash_requests(gchar *key _U_ , sip_request_method_t *data, gchar * unus
     else
     {
         /* Update existing label */
-        gtk_label_set(GTK_LABEL(data->widget), string_buff);
+         gtk_label_set_text(GTK_LABEL(data->widget), string_buff);
     }
 }
 
@@ -311,7 +311,7 @@ sip_draw_hash_responses(gint * key _U_ , sip_response_code_t *data, gchar * unus
     {
         /* Just update the existing label string */
         g_snprintf(string_buff, sizeof(string_buff), "%9d", data->packets);
-        gtk_label_set(GTK_LABEL(data->widget), string_buff);
+         gtk_label_set_text(GTK_LABEL(data->widget), string_buff);
     }
 }
 
@@ -492,12 +492,12 @@ sipstat_draw(void *psp)
     /* Set summary label */
     g_snprintf(string_buff, sizeof(string_buff),
                 "SIP stats (%d packets)", sp->packets);
-    gtk_label_set(GTK_LABEL(sp->packets_label), string_buff);
+     gtk_label_set_text(GTK_LABEL(sp->packets_label), string_buff);
 
     /* Set resend count label */
     g_snprintf(string_buff, sizeof(string_buff),
                 "(%d resent packets)", sp->resent_packets);
-    gtk_label_set(GTK_LABEL(sp->resent_label), string_buff);
+     gtk_label_set_text(GTK_LABEL(sp->resent_label), string_buff);
 
     /* Draw responses and requests from their tables */
     g_hash_table_foreach(sp->hash_responses, (GHFunc)sip_draw_hash_responses, NULL);
@@ -506,7 +506,7 @@ sipstat_draw(void *psp)
     /* Set resend count label */
     g_snprintf(string_buff, sizeof(string_buff),
                 "Average setup time %d ms\n Min %d ms\n Max %d ms", sp->average_setup_time, sp->min_setup_time, sp->max_setup_time);
-    gtk_label_set(GTK_LABEL(sp->average_setup_time_label), string_buff);
+     gtk_label_set_text(GTK_LABEL(sp->average_setup_time_label), string_buff);
 
        gtk_widget_show_all(sp->win);
 }

diff --git a/gtk/voip_calls_dlg.c b/gtk/voip_calls_dlg.c
index 51d88896808eefd38e664609639b518fa3d4f069..712bd4c35ffe1932b5489cf4e425e90371278864 100644 (file)
--- a/gtk/voip_calls_dlg.c
+++ b/gtk/voip_calls_dlg.c
@@ -187,7 +187,7 @@ static void add_to_clist(voip_calls_info_t* strinfo)
                plurality(calls_nb, "Call", "Calls"),
                calls_ns,
                plurality(calls_ns, "Call", "Calls"));
-       gtk_label_set(GTK_LABEL(top_label), label_text);
+        gtk_label_set_text(GTK_LABEL(top_label), label_text);
 
        /* Update the status label with the number of total messages */
         g_snprintf(label_text, 256,
@@ -196,7 +196,7 @@ static void add_to_clist(voip_calls_info_t* strinfo)
                        voip_calls_get_info()->start_packets, 
                        voip_calls_get_info()->completed_calls,
                        voip_calls_get_info()->rejected_calls);
-        gtk_label_set(GTK_LABEL(status_label), label_text);
+         gtk_label_set_text(GTK_LABEL(status_label), label_text);
 }
 
 
@@ -487,7 +487,7 @@ voip_calls_on_select_row(GtkCList *clist,
             plurality(calls_nb, "Call", "Calls"),
                        calls_ns,
                        plurality(calls_ns, "Call", "Calls"));
-       gtk_label_set(GTK_LABEL(top_label), label_text);
+        gtk_label_set_text(GTK_LABEL(top_label), label_text);
 
 
        if      (calls_ns > 0) {
@@ -545,7 +545,7 @@ voip_calls_on_unselect_row(GtkCList *clist,
             plurality(calls_nb, "Call", "Calls"),
                        calls_ns,
                        plurality(calls_ns, "Call", "Calls"));
-       gtk_label_set(GTK_LABEL(top_label), label_text);
+        gtk_label_set_text(GTK_LABEL(top_label), label_text);
 
        if      (calls_ns > 0) {
                gtk_widget_set_sensitive(bt_filter, TRUE);
@@ -837,7 +837,7 @@ void voip_calls_dlg_update(GList *list)
                        voip_calls_get_info()->start_packets, 
                        voip_calls_get_info()->completed_calls,
                        voip_calls_get_info()->rejected_calls);
-               gtk_label_set(GTK_LABEL(status_label), label_text);
+                gtk_label_set_text(GTK_LABEL(status_label), label_text);
 
                gtk_clist_freeze(GTK_CLIST(clist));
                gtk_clist_clear(GTK_CLIST(clist));
@@ -855,7 +855,7 @@ void voip_calls_dlg_update(GList *list)
                        plurality(calls_nb, "Call", "Calls"),
                        calls_ns,
                        plurality(calls_ns, "Call", "Calls"));
-               gtk_label_set(GTK_LABEL(top_label), label_text);
+                gtk_label_set_text(GTK_LABEL(top_label), label_text);
        }
 
        last_list = list;

diff --git a/gtk/wsp_stat.c b/gtk/wsp_stat.c
index 837101ccec5a080f60575b75601499c4ab85c87a..da7b3761db523a233104b1d3f65260cf86397602 100644 (file)
--- a/gtk/wsp_stat.c
+++ b/gtk/wsp_stat.c
@@ -117,7 +117,7 @@ wsp_draw_statuscode(gchar *key _U_, wsp_status_code_t *data, gchar * unused _U_
        } else {
                /* Just update the label string */
                g_snprintf( string_buff, 256, "%9d", data->packets );
-               gtk_label_set( GTK_LABEL(data->widget), string_buff);
+                gtk_label_set_text( GTK_LABEL(data->widget), string_buff);
        }
 }
 static void
@@ -212,7 +212,7 @@ wspstat_draw(void *psp)
        for(i=1;i<=sp->num_pdus ; i++)
        {
                g_snprintf(str, 256, "%9d",  sp->pdu_stats[i ].packets);
-               gtk_label_set( GTK_LABEL(sp->pdu_stats[i].widget), str);
+                gtk_label_set_text( GTK_LABEL(sp->pdu_stats[i].widget), str);
        }
 
        index=sp->index;