Xcode 4 isn't available on DVD, but is available for download from

[obnox/wireshark/wip.git] / ui_util.h

diff --git a/ui_util.h b/ui_util.h
index 3b8be7f7ccb27557edaae4c30ff4cce4e0685f4e..cd023a32a7567ea9e28c7a4239847eac99f672bf 100644 (file)
--- a/ui_util.h
+++ b/ui_util.h
@@ -27,11 +27,7 @@
 #ifndef __UI_UTIL_H__
 #define __UI_UTIL_H__
 
-#ifdef NEW_PACKET_LIST
 #include "epan/packet_info.h"
-#else
-#include "color.h"
-#endif
 
 #ifdef __cplusplus
 extern "C" {
@@ -43,7 +39,7 @@ extern "C" {
 void set_main_window_name(const gchar *);
 /* Update the name of the main window if the user-specified decoration
    changed. */
-void update_main_window_name(void);
+void update_main_window_title(void);
 /* update the main window */
 extern void main_window_update(void);
 /* exit the main window */
@@ -60,7 +56,6 @@ extern void pipe_input_set_handler(gint source, gpointer user_data, int *child_p
 
 /* packet_list.c */
 
-#ifdef NEW_PACKET_LIST
 void new_packet_list_clear(void);
 void new_packet_list_freeze(void);
 void new_packet_list_recreate_visible_rows(void);
@@ -76,29 +71,8 @@ void new_packet_list_select_first_row(void);
 void new_packet_list_select_last_row(void);
 void new_packet_list_moveto_end(void);
 gboolean new_packet_list_check_end(void);
-gint new_packet_list_find_row_from_data(gpointer data, gboolean select);
-void new_packet_list_set_time_width(gint);
-#else
-/* packet list related functions */
-void packet_list_clear(void);
-void packet_list_freeze(void);
-void packet_list_thaw(void);
-void packet_list_next(void);
-void packet_list_prev(void);
-void packet_list_select_row(gint);
-void packet_list_moveto_end(void);
-gint packet_list_append(const gchar *text[], gpointer data);
-void packet_list_set_colors(gint, color_t *, color_t *);
-gint packet_list_find_row_from_data(gpointer);
-void packet_list_set_text(gint, gint, const gchar *);
-void packet_list_set_time_width(gint, gint);
-gpointer packet_list_get_row_data(gint);
-void packet_list_set_selected_row(gint);
-gint packet_list_get_sort_column(void);
-void packet_list_set_sort_column(void);
-gboolean packet_list_check_end(void);
-
-#endif /* NEW_PACKET_LIST */
+gboolean new_packet_list_select_row_from_data(frame_data *fdata_needle);
+void new_packet_list_resize_column(gint col);
 
 #ifdef __cplusplus
 }