osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Free allocated data in prefs_reset, removed need for uat_reload_all and 

made some cleanups in profile_dlg.

svn path=/trunk/; revision=24136
This commit is contained in:
Stig Bjørlykke 2008-01-19 01:18:35 +00:00
parent cd259ecb55
commit 1621224a86
6 changed files with 44 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
epan/libwireshark.def
View File

@ -935,7 +935,6 @@ uat_fld_chk_str_isxdigit
uat_foreach_table
uat_load
uat_new
uat_reload_all
uat_remove_record_idx
uat_save
uat_swap

27
epan/prefs.c
View File

@ -1231,6 +1231,33 @@ void
prefs_reset(void)
{
prefs_initialized = FALSE;
if (prefs.pr_file)
g_free(prefs.pr_file);
if (prefs.pr_cmd)
g_free(prefs.pr_cmd);
free_col_info(&prefs);
if (prefs.gui_font_name1)
g_free(prefs.gui_font_name1);
if (prefs.gui_font_name2)
g_free(prefs.gui_font_name2);
if (prefs.gui_colorized_fg)
g_free(prefs.gui_colorized_fg);
if (prefs.gui_colorized_bg)
g_free(prefs.gui_colorized_bg);
if (prefs.gui_fileopen_dir)
g_free(prefs.gui_fileopen_dir);
if (prefs.gui_webbrowser)
g_free(prefs.gui_webbrowser);
if (prefs.gui_window_title)
g_free(prefs.gui_window_title);
if (prefs.capture_device)
g_free(prefs.capture_device);
if (prefs.capture_devices_descr)
g_free(prefs.capture_devices_descr);
if (prefs.capture_devices_hide)
g_free(prefs.capture_devices_hide);
uat_unload_all();
init_prefs();
}

4
epan/uat.c
View File

@ -285,7 +285,7 @@ void* uat_se_dup(uat_t* uat, guint* len_p) {
return size ? se_memdup(uat->user_data->data,size) : NULL ;
}
void uat_reload_all(void) {
void uat_unload_all(void) {
guint i;
for (i=0; i < all_uats->len; i++) {
@ -293,8 +293,6 @@ void uat_reload_all(void) {
uat_clear(u);
u->loaded = FALSE;
}
uat_load_all();
}
void uat_cleanup(void) {

2
epan/uat.h
View File

@ -269,7 +269,7 @@ gboolean uat_fld_chk_str_ ## what (void*, const char*, unsigned, void*, void*, c
typedef void (*uat_cb_t)(void* uat,void* user_data);
void uat_foreach_table(uat_cb_t cb,void* user_data);
void uat_reload_all(void);
void uat_unload_all(void);
char* uat_undquote(const char* si, guint in_len, guint* len_p);
char* uat_unbinstring(const char* si, guint in_len, guint* len_p);

1
gtk/main.c
View File

@ -5031,7 +5031,6 @@ void change_configuration_profile (const gchar *profile_name)
prefs_reset();
(void) read_configuration_files (&gdp_path, &dp_path);
prefs_apply_all();
uat_reload_all();
/* Update window view and redraw the toolbar */
update_main_window_name();

57
gtk/profile_dlg.c
View File

@ -51,8 +51,6 @@
#define E_PROF_COPY_BT_KEY "profile_copy_bt"
#define E_PROF_DEL_BT_KEY "profile_del_bt"
#define E_PROF_NAME_TE_KEY "profile_name_te"
#define E_PROF_SELFUNC_KEY "profile_selfunc"
#define E_PROF_SELARG_KEY "profile_selarg"
static GtkWidget *global_profile_w = NULL;
static GList *current_profiles = NULL;
@ -246,7 +244,7 @@ profile_select(GtkWidget *main_w, GtkTreeView *profile_l, gboolean destroy)
}
static void
profile_save(void)
profile_apply(GtkWidget *main_w, GtkTreeView *profile_l, gboolean destroy)
{
char *pf_dir_path, *pf_dir_path2;
GList *fl1, *fl2;
@ -316,42 +314,31 @@ profile_save(void)
}
copy_profile_list();
}
static void
profile_dlg_select(GtkTreeView *profile_l, gpointer main_w_arg)
{
GtkWidget *main_w = GTK_WIDGET(main_w_arg);
profile_save();
profile_select(main_w, profile_l, TRUE);
}
static void
profile_apply(GtkWidget *main_w, gboolean destroy)
{
GtkTreeView *profile_l = GTK_TREE_VIEW(OBJECT_GET_DATA(main_w, E_PROF_PROFILE_L_KEY));
profile_save();
profile_select(main_w, profile_l, destroy);
}
static void
profile_dlg_ok_cb(GtkWidget *ok_bt, gpointer data _U_)
{
GtkWidget *main_w = gtk_widget_get_toplevel(ok_bt);
GtkTreeView *profile_l = GTK_TREE_VIEW(OBJECT_GET_DATA(main_w, E_PROF_PROFILE_L_KEY));
/*
* Apply the profile and destroy the dialog box.
*/
profile_apply(gtk_widget_get_toplevel(ok_bt), TRUE);
profile_apply(main_w, profile_l, TRUE);
}
static void
profile_dlg_apply_cb(GtkWidget *apply_bt, gpointer data _U_)
{
GtkWidget *main_w = gtk_widget_get_toplevel(apply_bt);
GtkTreeView *profile_l = GTK_TREE_VIEW(OBJECT_GET_DATA(main_w, E_PROF_PROFILE_L_KEY));
/*
* Apply the profile, but don't destroy the dialog box.
*/
profile_apply(gtk_widget_get_toplevel(apply_bt), FALSE);
profile_apply(main_w, profile_l, FALSE);
}
/* cancel button pressed, revert changes and exit dialog */
@ -381,18 +368,12 @@ profile_dlg_destroy_cb(GtkWidget *w _U_, gpointer data _U_)
static gint
profile_sel_list_button_cb(GtkWidget *list, GdkEventButton *event,
gpointer data _U_)
profile_button_press_cb(GtkWidget *list, GdkEventButton *event, gpointer data _U_)
{
void (* func)(GtkWidget *, gpointer);
gpointer func_arg;
if (event->type == GDK_2BUTTON_PRESS) {
func = OBJECT_GET_DATA(list, E_PROF_SELFUNC_KEY);
func_arg = OBJECT_GET_DATA(list, E_PROF_SELARG_KEY);
GtkWidget *main_w = gtk_widget_get_toplevel(list);
if (func)
(*func)(list, func_arg);
profile_apply (main_w, GTK_TREE_VIEW(list), TRUE);
}
return FALSE;
@ -401,15 +382,10 @@ profile_sel_list_button_cb(GtkWidget *list, GdkEventButton *event,
static gint
profile_key_release_cb(GtkWidget *list, GdkEventKey *event, gpointer data _U_)
{
void (* func)(GtkWidget *, gpointer);
gpointer func_arg;
if (event->keyval == GDK_Return || event->keyval == GDK_KP_Enter) {
func = OBJECT_GET_DATA(list, E_PROF_SELFUNC_KEY);
func_arg = OBJECT_GET_DATA(list, E_PROF_SELARG_KEY);
GtkWidget *main_w = gtk_widget_get_toplevel(list);
if (func)
(*func)(list, func_arg);
profile_apply (main_w, GTK_TREE_VIEW(list), TRUE);
}
return FALSE;
@ -706,15 +682,12 @@ profile_dialog_new(void)
sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(profile_l));
gtk_tree_selection_set_mode(sel, GTK_SELECTION_SINGLE);
SIGNAL_CONNECT(sel, "changed", profile_sel_list_cb, profile_vb);
SIGNAL_CONNECT(profile_l, "button_press_event", profile_sel_list_button_cb, NULL);
SIGNAL_CONNECT(profile_l, "button_press_event", profile_button_press_cb, NULL);
SIGNAL_CONNECT(profile_l, "key_release_event", profile_key_release_cb, NULL);
OBJECT_SET_DATA(main_w, E_PROF_PROFILE_L_KEY, profile_l);
gtk_container_add(GTK_CONTAINER(profile_sc), profile_l);
gtk_widget_show(profile_l);
OBJECT_SET_DATA(profile_l, E_PROF_SELFUNC_KEY, profile_dlg_select);
OBJECT_SET_DATA(profile_l, E_PROF_SELARG_KEY, main_w);
/* fill in data */
l_select = fill_list(main_w);