1 files changed, 7 insertions, 47 deletions
diff --git a/gtk/macros_dlg.c b/gtk/macros_dlg.c
index 05ffee4d26..797b0e3824 100644
--- a/gtk/macros_dlg.c
+++ b/gtk/macros_dlg.c
@@ -25,56 +25,16 @@
 # include "config.h"
 #endif
 
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <math.h>
 #include <gtk/gtk.h>
-#include <epan/dfilter/dfilter-macro.h>
-#include "dlg_utils.h"
-#include "gui_utils.h"
-#include "compat_macros.h"
 
-static void append_macro(dfilter_macro_t* m, void* lp) {
-	GtkWidget *list = lp;
-	simple_list_append(list, 0, m->name, 1, m->text, -1);
-}
+#include <epan/dfilter/dfilter-macro.h>
+#include <epan/uat.h>
+#include "uat_gui.h"
+#include "macros_dlg.h"
 
 void macros_dialog_cb(GtkWidget *w _U_, gpointer data _U_) {
-	GtkWidget   *macros_w, *vbox;
-    GtkWidget *scrolledwindow;
-    GtkWidget *list;
-    const gchar *titles[] = {"Name", "Text"};
-	
-	macros_w = window_new(GTK_WINDOW_TOPLEVEL, "Display Filter Macros");
-	gtk_window_set_default_size(GTK_WINDOW(macros_w), 650, 600);
-
-#if GTK_MAJOR_VERSION >= 2
-	gtk_window_set_position(GTK_WINDOW(macros_w), GTK_WIN_POS_CENTER_ON_PARENT);
-#else
-	gtk_window_set_position(GTK_WINDOW(macros_w), GTK_WIN_POS_CENTER);
-#endif
-	
-	gtk_container_border_width(GTK_CONTAINER(macros_w), 6);
-
-	vbox = gtk_vbox_new(FALSE, 12);
-	gtk_container_border_width(GTK_CONTAINER(vbox), 6);
-	gtk_container_add(GTK_CONTAINER(macros_w), vbox);
-
-	scrolledwindow = scrolled_window_new(NULL, NULL);
-	gtk_container_add(GTK_CONTAINER(vbox), scrolledwindow);
-		
-#if GTK_MAJOR_VERSION >= 2
-    gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolledwindow), 
-										GTK_SHADOW_IN);
-#endif
-	
-    list = simple_list_new(2 , titles);
-	dfilter_macro_foreach(append_macro, list);
-    gtk_container_add(GTK_CONTAINER(scrolledwindow), list);
-	
-	gtk_widget_show_all(macros_w);
-
-    return;
+		uat_t* dfmuat;
+		dfilter_macro_get_uat(&dfmuat);
+		uat_window(dfmuat);
 }