*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
#include "globals.h"
#include "column_prefs.h"
#include "gtkglobals.h"
-#include "prefs.h"
-#include "column.h"
-#include "compat_macros.h"
-#include "ui_util.h"
+#include <epan/prefs.h>
+#include <epan/column.h>
+#include "gui_utils.h"
+#include "packet_list.h"
+#include "filter_dlg.h"
-#if GTK_MAJOR_VERSION >= 2
-#include "ui_util.h"
-#endif
-
-static GtkWidget *column_l, *del_bt, *title_te, *fmt_m, *up_bt, *dn_bt;
+static GtkWidget *column_l, *del_bt, *title_te, *field_te, *fmt_m, *up_bt, *dn_bt;
static gint cur_fmt, cur_row;
-#if GTK_MAJOR_VERSION < 2
-static void column_list_select_cb(GtkCList *clist, gint row, gint column,
- GdkEvent *event, gpointer user_data);
-static void column_list_unselect_cb(GtkCList *clist, gint row, gint column,
- GdkEvent *event, gpointer user_data);
-#else
static void column_list_select_cb(GtkTreeSelection *, gpointer);
-#endif
-static void column_list_new_cb(GtkWidget *, gpointer);
static void column_entry_changed_cb(GtkEditable *, gpointer);
+static void column_field_changed_cb(GtkEditable *, gpointer);
+static void column_list_new_cb(GtkWidget *, gpointer);
static void column_menu_changed_cb(GtkWidget *, gpointer);
static void column_list_delete_cb(GtkWidget *, gpointer);
static void column_arrow_cb(GtkWidget *, gpointer);
void column_set_arrow_button_sensitivity(GList *);
-#if GTK_MAJOR_VERSION >= 2
#define E_COL_NAME_KEY "column_name"
#define E_COL_LBL_KEY "column_label"
-#endif
#define E_COL_CM_KEY "in_col_cancel_mode"
/* Create and display the column selection widgets. */
GList *clp = NULL;
fmt_data *cfmt;
gint i;
- gchar *column_titles[] = {"Title", "Format"};
-#if GTK_MAJOR_VERSION < 2
- gchar *col_ent[2];
- gint row;
-#else
+ gchar *fmt;
+ const gchar *column_titles[] = {"Title", "Format"};
GtkListStore *store;
GtkCellRenderer *renderer;
GtkTreeViewColumn *column;
GtkTreeIter iter;
GtkTreeIter first_iter;
gint first_row = TRUE;
-#endif
/* Container for each row of widgets */
main_vb = gtk_vbox_new(FALSE, 5);
gtk_container_border_width(GTK_CONTAINER(main_vb), 5);
gtk_widget_show(main_vb);
- OBJECT_SET_DATA(GTK_OBJECT(main_vb), E_COL_CM_KEY, (gpointer)FALSE);
+ g_object_set_data(G_OBJECT(GTK_OBJECT(main_vb)), E_COL_CM_KEY, (gpointer)FALSE);
/* Top row: Column list and buttons */
top_hb = gtk_hbox_new(FALSE, 5);
gtk_container_add(GTK_CONTAINER(edit_fr), edit_vb);
gtk_widget_show(edit_vb);
- new_bt = BUTTON_NEW_FROM_STOCK(GTK_STOCK_NEW);
- SIGNAL_CONNECT(new_bt, "clicked", column_list_new_cb, NULL);
+ new_bt = gtk_button_new_from_stock(GTK_STOCK_NEW);
+ g_signal_connect(new_bt, "clicked", G_CALLBACK(column_list_new_cb), NULL);
gtk_box_pack_start (GTK_BOX (edit_vb), new_bt, FALSE, FALSE, 5);
-#if GTK_MAJOR_VERSION < 2
- WIDGET_SET_SIZE(new_bt, 50, 20);
-#endif
gtk_widget_show(new_bt);
- del_bt = BUTTON_NEW_FROM_STOCK(GTK_STOCK_DELETE);
+ del_bt = gtk_button_new_from_stock(GTK_STOCK_DELETE);
gtk_widget_set_sensitive(del_bt, FALSE);
- SIGNAL_CONNECT(del_bt, "clicked", column_list_delete_cb, NULL);
-#if GTK_MAJOR_VERSION < 2
- WIDGET_SET_SIZE(del_bt, 50, 20);
-#endif
+ g_signal_connect(del_bt, "clicked", G_CALLBACK(column_list_delete_cb), NULL);
gtk_box_pack_start (GTK_BOX (edit_vb), del_bt, FALSE, FALSE, 5);
gtk_widget_show(del_bt);
gtk_box_pack_start (GTK_BOX (list_vb), list_lb, FALSE, FALSE, 0);
list_sc = scrolled_window_new(NULL, NULL);
-#if GTK_MAJOR_VERSION >= 2
gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(list_sc),
GTK_SHADOW_IN);
-#endif
gtk_container_add(GTK_CONTAINER(list_vb), list_sc);
gtk_widget_show(list_sc);
-#if GTK_MAJOR_VERSION < 2
- column_l = gtk_clist_new_with_titles(2, column_titles);
- /* XXX - make this match the packet list prefs? */
- gtk_clist_set_selection_mode(GTK_CLIST(column_l), GTK_SELECTION_SINGLE);
- gtk_clist_column_titles_passive(GTK_CLIST(column_l));
- gtk_clist_column_titles_show(GTK_CLIST(column_l));
- gtk_clist_set_column_auto_resize(GTK_CLIST(column_l), 0, TRUE);
- gtk_clist_set_column_auto_resize(GTK_CLIST(column_l), 1, TRUE);
-
- SIGNAL_CONNECT(column_l, "select-row", column_list_select_cb, NULL);
- SIGNAL_CONNECT(column_l, "unselect-row", column_list_unselect_cb, NULL);
- gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(list_sc),
- column_l);
-#else
store = gtk_list_store_new(3, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_POINTER);
column_l = tree_view_new(GTK_TREE_MODEL(store));
gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(column_l), TRUE);
sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(column_l));
gtk_tree_selection_set_mode(sel, GTK_SELECTION_SINGLE);
- SIGNAL_CONNECT(sel, "changed", column_list_select_cb, NULL);
+ g_signal_connect(sel, "changed", G_CALLBACK(column_list_select_cb), NULL);
gtk_container_add(GTK_CONTAINER(list_sc), column_l);
-#endif
gtk_widget_show(column_l);
clp = g_list_first(prefs.col_list);
while (clp) {
cfmt = (fmt_data *) clp->data;
-#if GTK_MAJOR_VERSION < 2
- col_ent[0] = cfmt->title;
- col_ent[1] = col_format_desc(get_column_format_from_str(cfmt->fmt));
- row = gtk_clist_append(GTK_CLIST(column_l), col_ent);
- gtk_clist_set_row_data(GTK_CLIST(column_l), row, clp);
-#else
+ cur_fmt = get_column_format_from_str(cfmt->fmt);
+ if (cur_fmt == COL_CUSTOM) {
+ fmt = g_strdup_printf("%s (%s)", col_format_desc(cur_fmt), cfmt->custom_field);
+ } else {
+ fmt = g_strdup_printf("%s", col_format_desc(cur_fmt));
+ }
gtk_list_store_append(store, &iter);
- gtk_list_store_set(store, &iter, 0, cfmt->title, 1,
- col_format_desc(get_column_format_from_str(cfmt->fmt)),
- 2, clp, -1);
+ gtk_list_store_set(store, &iter, 0, cfmt->title, 1, fmt, 2, clp, -1);
if (first_row) {
first_iter = iter;
first_row = FALSE;
}
-#endif
clp = clp->next;
+ g_free (fmt);
}
-#if GTK_MAJOR_VERSION >= 2
g_object_unref(G_OBJECT(store));
-#endif
/* order frame */
gtk_container_set_border_width (GTK_CONTAINER (order_vb), 5);
gtk_widget_show(order_vb);
- up_bt = BUTTON_NEW_FROM_STOCK(GTK_STOCK_GO_UP);
+ up_bt = gtk_button_new_from_stock(GTK_STOCK_GO_UP);
gtk_widget_set_sensitive(up_bt, FALSE);
- SIGNAL_CONNECT(up_bt, "clicked", column_arrow_cb, NULL);
+ g_signal_connect(up_bt, "clicked", G_CALLBACK(column_arrow_cb), NULL);
gtk_box_pack_start(GTK_BOX(order_vb), up_bt, FALSE, FALSE, 0);
-#if GTK_MAJOR_VERSION < 2
- WIDGET_SET_SIZE(up_bt, 50, 20);
-#endif
gtk_widget_show(up_bt);
order_lb = gtk_label_new (("Move\nselected\ncolumn\nup or down"));
gtk_widget_show (order_lb);
gtk_box_pack_start (GTK_BOX (order_vb), order_lb, FALSE, FALSE, 0);
- dn_bt = BUTTON_NEW_FROM_STOCK(GTK_STOCK_GO_DOWN);
+ dn_bt = gtk_button_new_from_stock(GTK_STOCK_GO_DOWN);
gtk_widget_set_sensitive(dn_bt, FALSE);
- SIGNAL_CONNECT(dn_bt, "clicked", column_arrow_cb, NULL);
+ g_signal_connect(dn_bt, "clicked", G_CALLBACK(column_arrow_cb), NULL);
gtk_box_pack_start(GTK_BOX(order_vb), dn_bt, FALSE, FALSE, 0);
-#if GTK_MAJOR_VERSION < 2
- WIDGET_SET_SIZE(dn_bt, 50, 20);
-#endif
gtk_widget_show(dn_bt);
gtk_widget_show(props_fr);
/* Colunm name entry and format selection */
- tb = gtk_table_new(2, 2, FALSE);
+ tb = gtk_table_new(2, 3, FALSE);
gtk_container_border_width(GTK_CONTAINER(tb), 5);
gtk_container_add(GTK_CONTAINER(props_fr), tb);
gtk_table_set_row_spacings(GTK_TABLE(tb), 10);
gtk_widget_show(lb);
title_te = gtk_entry_new();
- gtk_table_attach_defaults(GTK_TABLE(tb), title_te, 1, 2, 0, 1);
- SIGNAL_CONNECT(title_te, "changed", column_entry_changed_cb, column_l);
+ gtk_table_attach_defaults(GTK_TABLE(tb), title_te, 1, 3, 0, 1);
gtk_widget_set_sensitive(title_te, FALSE);
gtk_widget_show(title_te);
GTK_SHRINK, 0, 0);
gtk_widget_show(props_hb);
+ field_te = gtk_entry_new();
+ g_signal_connect(field_te, "changed", G_CALLBACK(filter_te_syntax_check_cb), NULL);
+ gtk_table_attach_defaults(GTK_TABLE(tb), field_te, 2, 3, 1, 2);
+ gtk_widget_set_sensitive(field_te, FALSE);
+ gtk_widget_hide(field_te);
+
fmt_m = gtk_option_menu_new();
menu = gtk_menu_new();
for (i = 0; i < NUM_COL_FMTS; i++) {
mitem = gtk_menu_item_new_with_label(col_format_desc(i));
gtk_menu_append(GTK_MENU(menu), mitem);
- SIGNAL_CONNECT(mitem, "activate", column_menu_changed_cb, GINT_TO_POINTER(i));
+ g_signal_connect(mitem, "activate", G_CALLBACK(column_menu_changed_cb), GINT_TO_POINTER(i));
gtk_widget_show(mitem);
}
gtk_option_menu_set_menu(GTK_OPTION_MENU(fmt_m), menu);
gtk_widget_show(fmt_m);
/* select the first row */
-#if GTK_MAJOR_VERSION < 2
- gtk_clist_select_row(GTK_CLIST(column_l), 0, 0);
-#else
gtk_tree_selection_select_iter(sel, &first_iter);
-#endif
return(main_vb);
}
/* For each selection, set the entry and option menu widgets to match
the currently selected item. Set the up/down button sensitivity.
Draw focus to the entry widget. */
-#if GTK_MAJOR_VERSION < 2
-static void
-column_list_select_cb(GtkCList *clist,
- gint row,
- gint column _U_,
- GdkEvent *event _U_,
- gpointer user_data _U_) {
- fmt_data *cfmt;
- GList *clp;
-
- clp = gtk_clist_get_row_data(clist, row);
- g_assert(clp != NULL);
- cfmt = (fmt_data *) clp->data;
- cur_fmt = get_column_format_from_str(cfmt->fmt);
- g_assert(cur_fmt != -1); /* It should always be valid */
- cur_row = row;
-
- gtk_entry_set_text(GTK_ENTRY(title_te), cfmt->title);
- gtk_editable_select_region(GTK_EDITABLE(title_te), 0, -1);
- gtk_widget_grab_focus(title_te);
-
- gtk_widget_set_sensitive(del_bt, TRUE);
- gtk_widget_set_sensitive(title_te, TRUE);
- gtk_widget_set_sensitive(fmt_m, TRUE);
- column_set_arrow_button_sensitivity(clp);
-
- /* do this *after* set_sensitive(fmt_m), to have the correct "sensitive" effect */
- gtk_option_menu_set_history(GTK_OPTION_MENU(fmt_m), cur_fmt);
-}
-
-/* A row was deselected. Clear the text entry box and disable various widgets. */
-static void
-column_list_unselect_cb(GtkCList *clist _U_,
- gint row _U_,
- gint column _U_,
- GdkEvent *event _U_,
- gpointer user_data _U_) {
-
- cur_row = -1;
- gtk_editable_delete_text(GTK_EDITABLE(title_te), 0, -1);
-
- gtk_widget_set_sensitive(del_bt, FALSE);
- gtk_widget_set_sensitive(title_te, FALSE);
- gtk_widget_set_sensitive(fmt_m, FALSE);
- gtk_widget_set_sensitive(up_bt, FALSE);
- gtk_widget_set_sensitive(dn_bt, FALSE);
-}
-#else
static void
column_list_select_cb(GtkTreeSelection *sel, gpointer user_data _U_)
{
GtkTreeIter iter;
GtkTreePath *path;
gchar *str_path;
- gchar *title;
/* if something was selected */
if (gtk_tree_selection_get_selected(sel, &model, &iter))
g_free(str_path);
gtk_tree_path_free(path);
- title = g_strdup(cfmt->title);
- gtk_entry_set_text(GTK_ENTRY(title_te), title);
- g_free(title);
+ gtk_entry_set_text(GTK_ENTRY(title_te), cfmt->title);
+ g_signal_connect(title_te, "changed", G_CALLBACK(column_entry_changed_cb), column_l);
+
+ if (cur_fmt == COL_CUSTOM) {
+ gtk_entry_set_text(GTK_ENTRY(field_te), cfmt->custom_field);
+ gtk_widget_show(field_te);
+ } else {
+ gtk_widget_hide(field_te);
+ }
+ g_signal_connect(field_te, "changed", G_CALLBACK(column_field_changed_cb), column_l);
gtk_editable_select_region(GTK_EDITABLE(title_te), 0, -1);
gtk_widget_grab_focus(title_te);
gtk_widget_set_sensitive(del_bt, TRUE);
gtk_widget_set_sensitive(title_te, TRUE);
+ gtk_widget_set_sensitive(field_te, TRUE);
gtk_widget_set_sensitive(fmt_m, TRUE);
column_set_arrow_button_sensitivity(clp);
}
{
cur_row = -1;
gtk_editable_delete_text(GTK_EDITABLE(title_te), 0, -1);
+ gtk_editable_delete_text(GTK_EDITABLE(field_te), 0, -1);
gtk_widget_set_sensitive(del_bt, FALSE);
gtk_widget_set_sensitive(title_te, FALSE);
+ gtk_widget_set_sensitive(field_te, FALSE);
gtk_widget_set_sensitive(fmt_m, FALSE);
gtk_widget_set_sensitive(up_bt, FALSE);
gtk_widget_set_sensitive(dn_bt, FALSE);
}
}
-#endif
/* To do: add input checking to each of these callbacks */
static void
column_list_new_cb(GtkWidget *w _U_, gpointer data _U_) {
fmt_data *cfmt;
- gchar *title = "New Column";
-#if GTK_MAJOR_VERSION < 2
- gchar *col_ent[2];
-#else
+ const gchar *title = "New Column";
GtkTreeModel *model;
GtkTreeIter iter;
GtkTreePath *path;
gchar *str_path;
-#endif
- cur_fmt = 0;
+ cur_fmt = COL_NUMBER;
cfmt = (fmt_data *) g_malloc(sizeof(fmt_data));
cfmt->title = g_strdup(title);
cfmt->fmt = g_strdup(col_format_to_string(cur_fmt));
+ cfmt->custom_field = NULL;
prefs.col_list = g_list_append(prefs.col_list, cfmt);
-#if GTK_MAJOR_VERSION < 2
- col_ent[0] = title;
- col_ent[1] = col_format_desc(cur_fmt);
- cur_row = gtk_clist_append(GTK_CLIST(column_l), col_ent);
- gtk_clist_set_row_data(GTK_CLIST(column_l), cur_row,
- g_list_last(prefs.col_list));
-
- gtk_clist_select_row(GTK_CLIST(column_l), cur_row, 0);
-#else
model = gtk_tree_view_get_model(GTK_TREE_VIEW(column_l));
gtk_list_store_append(GTK_LIST_STORE(model), &iter);
gtk_list_store_set(GTK_LIST_STORE(model), &iter, 0, title, 1,
gtk_tree_selection_select_iter(gtk_tree_view_get_selection(GTK_TREE_VIEW(column_l)),
&iter);
-#endif
+ cfile.cinfo.columns_changed = TRUE;
}
static void
column_list_delete_cb(GtkWidget *w _U_, gpointer data _U_) {
GList *clp;
fmt_data *cfmt;
-#if GTK_MAJOR_VERSION >= 2
GtkTreeSelection *sel;
GtkTreeModel *model;
GtkTreeIter iter;
cfmt = (fmt_data *) clp->data;
g_free(cfmt->title);
g_free(cfmt->fmt);
+ if (cfmt->custom_field) {
+ g_free (cfmt->custom_field);
+ }
g_free(cfmt);
prefs.col_list = g_list_remove_link(prefs.col_list, clp);
gtk_list_store_remove(GTK_LIST_STORE(model), &iter);
}
-#else
- g_assert(cur_row >= 0);
- clp = gtk_clist_get_row_data(GTK_CLIST(column_l), cur_row);
-
- cfmt = (fmt_data *) clp->data;
- g_free(cfmt->title);
- g_free(cfmt->fmt);
- g_free(cfmt);
- prefs.col_list = g_list_remove_link(prefs.col_list, clp);
-
- gtk_clist_remove(GTK_CLIST(column_l), cur_row);
-#endif
+ cfile.cinfo.columns_changed = TRUE;
}
/* The user changed the column title entry box. */
fmt_data *cfmt;
GList *clp;
gchar *title;
-#if GTK_MAJOR_VERSION < 2
- GtkCList *cl = data;
+ GtkTreeView *tree = (GtkTreeView *)data;
+ GtkTreeSelection *sel;
+ GtkTreeModel *model;
+ GtkTreeIter iter;
- if (cur_row >= 0) {
+ sel = gtk_tree_view_get_selection(tree);
+ if (gtk_tree_selection_get_selected(sel, &model, &iter))
+ {
title = gtk_editable_get_chars(te, 0, -1);
- clp = gtk_clist_get_row_data(cl, cur_row);
+ gtk_tree_model_get(model, &iter, 2, &clp, -1);
cfmt = (fmt_data *) clp->data;
- gtk_clist_set_text(cl, cur_row, 0, title);
+ gtk_list_store_set(GTK_LIST_STORE(model), &iter, 0, title, -1);
g_free(cfmt->title);
cfmt->title = title;
}
-#else
+ cfile.cinfo.columns_changed = TRUE;
+}
+
+/* The user changed the custom field entry box. */
+static void
+column_field_changed_cb(GtkEditable *te, gpointer data) {
+ fmt_data *cfmt;
+ GList *clp;
+ gchar *field, *fmt;
GtkTreeView *tree = (GtkTreeView *)data;
GtkTreeSelection *sel;
GtkTreeModel *model;
sel = gtk_tree_view_get_selection(tree);
if (gtk_tree_selection_get_selected(sel, &model, &iter))
{
- title = gtk_editable_get_chars(te, 0, -1);
+ field = gtk_editable_get_chars(te, 0, -1);
gtk_tree_model_get(model, &iter, 2, &clp, -1);
cfmt = (fmt_data *) clp->data;
-
- gtk_list_store_set(GTK_LIST_STORE(model), &iter, 0, title, -1);
- g_free(cfmt->title);
- cfmt->title = title;
+ fmt = g_strdup_printf("%s (%s)", col_format_desc(cur_fmt), field);
+ gtk_list_store_set(GTK_LIST_STORE(model), &iter, 1, fmt, -1);
+ g_free(fmt);
+ if (cfmt->custom_field) {
+ g_free(cfmt->custom_field);
+ }
+ cfmt->custom_field = field;
}
-#endif
+ cfile.cinfo.columns_changed = TRUE;
}
/* The user changed the format menu. */
column_menu_changed_cb(GtkWidget *w _U_, gpointer data) {
fmt_data *cfmt;
GList *clp;
-#if GTK_MAJOR_VERSION >= 2
+ const gchar *fmt;
GtkTreeSelection *sel;
GtkTreeModel *model;
GtkTreeIter iter;
sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(column_l));
if (gtk_tree_selection_get_selected(sel, &model, &iter))
{
- cur_fmt = (gint) data;
+ cur_fmt = (gint)(long) data;
gtk_tree_model_get(model, &iter, 2, &clp, -1);
cfmt = (fmt_data *) clp->data;
- gtk_list_store_set(GTK_LIST_STORE(model), &iter, 1,
- col_format_desc(cur_fmt), -1);
- g_free(cfmt->fmt);
- cfmt->fmt = g_strdup(col_format_to_string(cur_fmt));
- }
-#else
-
- if (cur_row >= 0) {
- cur_fmt = (gint) data;
- clp = gtk_clist_get_row_data(GTK_CLIST(column_l), cur_row);
- cfmt = (fmt_data *) clp->data;
+ if (cur_fmt == COL_CUSTOM) {
+ if (cfmt->custom_field == NULL) {
+ cfmt->custom_field = g_strdup("");
+ }
+ gtk_entry_set_text(GTK_ENTRY(field_te), cfmt->custom_field);
+ fmt = g_strdup_printf("%s (%s)", col_format_desc(cur_fmt), cfmt->custom_field);
+ gtk_widget_show(field_te);
+ } else {
+ fmt = g_strdup_printf("%s", col_format_desc(cur_fmt));
+ gtk_widget_hide(field_te);
+ }
- gtk_clist_set_text(GTK_CLIST(column_l), cur_row, 1,
- col_format_desc(cur_fmt));
+ gtk_list_store_set(GTK_LIST_STORE(model), &iter, 1, fmt, -1);
g_free(cfmt->fmt);
cfmt->fmt = g_strdup(col_format_to_string(cur_fmt));
}
-#endif
+ cfile.cinfo.columns_changed = TRUE;
}
static void
column_arrow_cb(GtkWidget *w, gpointer data _U_) {
fmt_data *cfmt;
-#if GTK_MAJOR_VERSION < 2
- GList *clp;
- gint inc = 1;
-
- g_assert(cur_row >= 0);
-
- if (w == up_bt)
- inc = -1;
-
- /* This would end up appending to the list. We shouldn't have to check for
- appending past the end of the list. */
- g_assert((cur_row + inc) >= 0);
-
- clp = gtk_clist_get_row_data(GTK_CLIST(column_l), cur_row);
- cfmt = (fmt_data *) clp->data;
- prefs.col_list = g_list_remove(prefs.col_list, cfmt);
- prefs.col_list = g_list_insert(prefs.col_list, cfmt, cur_row + inc);
-
- gtk_clist_row_move(GTK_CLIST(column_l), cur_row, cur_row + inc);
- clp = g_list_find(prefs.col_list, cfmt);
- cur_row += inc;
- gtk_clist_set_row_data(GTK_CLIST(column_l), cur_row, clp);
-
- column_set_arrow_button_sensitivity(clp);
-#else
GList *clp1, *clp2;
GtkTreeSelection *sel;
GtkTreeModel *model;
return;
}
}
+ clp1 = g_list_find(prefs.col_list, cfmt);
gtk_tree_model_get(model, &iter2, 0, &title2, 1, &format2, 2,
&clp2, -1);
gtk_list_store_set(GTK_LIST_STORE(model), &iter2, 0, title1, 1,
gtk_list_store_set(GTK_LIST_STORE(model), &iter1, 0, title2, 1,
format2, 2, clp2, -1);
gtk_tree_selection_select_iter(sel, &iter2);
- /* clp1 = g_list_find(prefs.col_list, cfmt); */
+
column_set_arrow_button_sensitivity(clp1);
/* free strings read from the TreeModel */
g_free(title2);
g_free(format2);
}
-#endif
+ cfile.cinfo.columns_changed = TRUE;
}
void
}
void
-column_prefs_apply(GtkWidget *w _U_) {
+column_prefs_apply(GtkWidget *w _U_)
+{
+ /* Redraw the packet list if the columns were changed */
+ if(cfile.cinfo.columns_changed) {
+ packet_list_recreate();
+ cfile.cinfo.columns_changed = FALSE; /* Reset value */
+ }
}
void
column_prefs_destroy(GtkWidget *w) {
/* Let the list cb know we're about to destroy the widget tree, so it */
/* doesn't operate on widgets that don't exist. */
- OBJECT_SET_DATA(w, E_COL_CM_KEY, (gpointer)TRUE);
+ g_object_set_data(G_OBJECT(w), E_COL_CM_KEY, (gpointer)TRUE);
}
git.samba.org / obnox / wireshark / wip.git / blobdiff