Index: gtk/capture_dlg.c
===================================================================
--- gtk/capture_dlg.c	(revision 40046)
+++ gtk/capture_dlg.c	(working copy)
@@ -795,8 +795,8 @@
 {
   capture_remote_cb(GTK_WIDGET(data), FALSE);
 }
-#endif
-
+#endif /* HAVE_PCAP_REMOTE */
+#ifdef HAVE_PCAP_REMOTE
 static void 
 insert_new_rows(GList *list)
 {
@@ -829,9 +829,7 @@
   /* Scan through the list and build a list of strings to display. */
   for (if_entry = g_list_first(list); if_entry != NULL; if_entry = g_list_next(if_entry)) {
     if_info = (if_info_t *)if_entry->data;
-#ifdef HAVE_PCAP_REMOTE
     add_interface_to_remote_list(if_info);
-#endif
     for (i = 0; i < count; i++) {
       row = g_array_index(rows, interface_row, i);
       if (strcmp(row.name, if_info->name) == 0) {
@@ -957,7 +955,6 @@
     } else {
       temp = g_strdup_printf("<b>%s</b>\n<span size='small'>%s</span>", row.display_name, row.addresses);
     }
-#ifdef HAVE_PCAP_REMOTE
     row.remote_opts.src_type= global_remote_opts.src_type;
     row.remote_opts.remote_host_opts.remote_host = g_strdup(global_remote_opts.remote_host_opts.remote_host);
     row.remote_opts.remote_host_opts.remote_port = g_strdup(global_remote_opts.remote_host_opts.remote_port);
@@ -967,7 +964,6 @@
     row.remote_opts.remote_host_opts.datatx_udp = global_remote_opts.remote_host_opts.datatx_udp;
     row.remote_opts.remote_host_opts.nocap_rpcap = global_remote_opts.remote_host_opts.nocap_rpcap;
     row.remote_opts.remote_host_opts.nocap_local = global_remote_opts.remote_host_opts.nocap_local;
-#endif
 #ifdef HAVE_PCAP_SETSAMPLING
     row.remote_opts.sampling_method = global_remote_opts.sampling_method;
     row.remote_opts.sampling_param = global_remote_opts.sampling_param;
@@ -988,12 +984,11 @@
 #endif
     count++;
     g_string_free(ip_str, TRUE);
-#ifdef HAVE_PCAP_REMOTE
     add_interface_to_list(if_info->name, if_info->description, &row.remote_opts);
-#endif
   } /*for*/
   gtk_tree_view_set_model(GTK_TREE_VIEW(if_cb), model);
 }
+#endif /* HAVE_PCAP_REMOTE*/
 
 #ifdef HAVE_PCAP_REMOTE
 /* Retrieve the list of local or remote interfaces according to selected