Fix API issues.

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

diff --git a/gtk/capture_dlg.c b/gtk/capture_dlg.c
index 3f58bf36f1b5c49ce125074966d26dc3cce1ed95..2b97e5c8034df14bb60bd50968063b577eab9a98 100644 (file)
--- a/gtk/capture_dlg.c
+++ b/gtk/capture_dlg.c
@@ -518,9 +518,9 @@ static struct iftype_info iftype[] = {
 static void
 iftype_combo_box_add_remote_separators (GtkWidget *iftype_cbx)
 {
-  gtk_combo_box_append_text(GTK_COMBO_BOX(iftype_cbx), REMOTE_HOST_SEPARATOR);
-  gtk_combo_box_append_text(GTK_COMBO_BOX(iftype_cbx), REMOTE_HOST_SEPARATOR);
-  gtk_combo_box_append_text(GTK_COMBO_BOX(iftype_cbx), "Clear list");
+  gtk_combo_box_text_append_text(GTK_COMBO_BOX(iftype_cbx), REMOTE_HOST_SEPARATOR);
+  gtk_combo_box_text_append_text(GTK_COMBO_BOX(iftype_cbx), REMOTE_HOST_SEPARATOR);
+  gtk_combo_box_text_append_text(GTK_COMBO_BOX(iftype_cbx), "Clear list");
 }
 
 static void
@@ -539,7 +539,7 @@ iftype_combo_box_add (GtkWidget *iftype_cbx)
     if (g_hash_table_size (remote_host_list) == 0) {
       iftype_combo_box_add_remote_separators (iftype_cbx);
     }
-    gtk_combo_box_insert_text(GTK_COMBO_BOX(iftype_cbx), pos, g_array_index(global_capture_opts.ifaces, interface_options, 0).remote_host);
+    gtk_combo_box_text_insert_text(GTK_COMBO_BOX(iftype_cbx), pos, g_array_index(global_capture_opts.ifaces, interface_options, 0).remote_host);
     rh->remote_host = g_strdup (g_array_index(global_capture_opts.ifaces, interface_options, 0).remote_host);
     create_new = TRUE;
   } else {
@@ -585,7 +585,7 @@ iftype_combo_box_add (GtkWidget *iftype_cbx)
 static void
 iftype_combo_box_add_remote_host (gpointer key, gpointer value _U_, gpointer user_data)
 {
-  gtk_combo_box_insert_text(GTK_COMBO_BOX(user_data), REMOTE_HOST_START, key);
+  gtk_combo_box_text_insert_text(GTK_COMBO_BOX(user_data), REMOTE_HOST_START, key);
 
   if (g_array_index(global_capture_opts.ifaces, interface_options, 0).src_type == CAPTURE_IFREMOTE) {
     /* Ensure we select the correct entry */
@@ -602,10 +602,10 @@ iftype_combo_box_new(void)
   GtkWidget *iftype_cbx;
   unsigned int i;
 
-  iftype_cbx = gtk_combo_box_new_text();
+  iftype_cbx = gtk_combo_box_text_new();
 
   for (i = 0; i < sizeof(iftype) / sizeof(iftype[0]); i++) {
-    gtk_combo_box_append_text(GTK_COMBO_BOX(iftype_cbx), iftype[i].name);
+    gtk_combo_box_text_append_text(GTK_COMBO_BOX(iftype_cbx), iftype[i].name);
   }
 
   if (g_hash_table_size (remote_host_list) > 0) {
@@ -1667,7 +1667,7 @@ save_options_cb(GtkWidget *win _U_, gpointer user_data _U_)
     row.snaplen = WTAP_MAX_PACKET_SIZE;
   }
   
-  filter_text = gtk_combo_box_get_active_text (GTK_COMBO_BOX(filter_cm));
+  filter_text = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX(filter_cm));
   if (row.cfilter)
     g_free(row.cfilter);
   g_assert(filter_text != NULL);
@@ -3282,12 +3282,12 @@ select_if_type_cb(GtkComboBox *iftype_cbx, gpointer data _U_)
         g_hash_table_foreach_remove (remote_host_list, free_remote_host, NULL);
         num_remote += 3;
         while (num_remote--)  /* Remove separator lines and "Clear" item */
-          gtk_combo_box_remove_text (iftype_cbx, 2);
+          gtk_combo_box_text_remove(iftype_cbx, 2);
       } else {
         struct remote_host *rh;
         gchar *string;
 
-        string = gtk_combo_box_get_active_text (GTK_COMBO_BOX(iftype_cbx));
+        string = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX(iftype_cbx));
 
         rh = g_hash_table_lookup (remote_host_list, string);
         g_free (string);