diff options
| author | Martin Mathieson <martin.r.mathieson@googlemail.com> | 2008-04-21 10:57:32 +0000 |
|---|---|---|
| committer | Martin Mathieson <martin.r.mathieson@googlemail.com> | 2008-04-21 10:57:32 +0000 |
| commit | d4dca0d94b2b3351ddebcd2e9f8e627bc5573fee (patch) | |
| tree | dd4ce0dedded8f7d62b56c1e250e772a11bfe99b /gtk/prefs_dlg.c | |
| parent | 1f3f4d39dafd2d027072fa047936f6e711dfe4e2 (diff) | |
Allow configuration of tap update interval.
- rename rtp_player config group to taps/statistics
- will rename prefs_rtp_player files later
(svn didn't seem keen to rename with changes present,
and output says its just a copy/delete anyway...)
svn path=/trunk/; revision=25133
Diffstat (limited to 'gtk/prefs_dlg.c')
| -rw-r--r-- | gtk/prefs_dlg.c | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/gtk/prefs_dlg.c b/gtk/prefs_dlg.c index 16b1ab3fc5..49f2a4cdc8 100644 --- a/gtk/prefs_dlg.c +++ b/gtk/prefs_dlg.c @@ -96,7 +96,7 @@ static void prefs_tree_select_cb(GtkTreeSelection *, gpointer); #define E_CAPTURE_PAGE_KEY "capture_options_page" #define E_PRINT_PAGE_KEY "printer_options_page" #define E_NAMERES_PAGE_KEY "nameres_options_page" -#define E_RTP_PLAYER_PAGE_KEY "rtp_player_options_page" +#define E_TAPS_PAGE_KEY "taps_options_page" #define E_PROTOCOLS_PAGE_KEY "protocols_options_page" /* @@ -586,13 +586,11 @@ prefs_cb(GtkWidget *w _U_, gpointer dummy _U_) prefs_tree_page_add(label_str, cts.page, store, NULL, FALSE); cts.page++; -#ifdef HAVE_LIBPORTAUDIO - /* RTP player prefs */ - g_strlcpy(label_str, "RTP Player", MAX_TREE_NODE_NAME_LEN); - prefs_nb_page_add(prefs_nb, label_str, rtp_player_prefs_show(), E_RTP_PLAYER_PAGE_KEY); + /* TAPS player prefs */ + g_strlcpy(label_str, "Taps/Statistics", MAX_TREE_NODE_NAME_LEN); + prefs_nb_page_add(prefs_nb, label_str, stats_prefs_show(), E_TAPS_PAGE_KEY); prefs_tree_page_add(label_str, cts.page, store, NULL, FALSE); cts.page++; -#endif /* Registered prefs */ cts.notebook = prefs_nb; @@ -1264,9 +1262,7 @@ prefs_main_fetch_all(GtkWidget *dlg, gboolean *must_redissect) #endif /* HAVE_LIBPCAP */ printer_prefs_fetch(g_object_get_data(G_OBJECT(dlg), E_PRINT_PAGE_KEY)); nameres_prefs_fetch(g_object_get_data(G_OBJECT(dlg), E_NAMERES_PAGE_KEY)); -#ifdef HAVE_LIBPORTAUDIO - rtp_player_prefs_fetch(g_object_get_data(G_OBJECT(dlg), E_RTP_PLAYER_PAGE_KEY)); -#endif + stats_prefs_fetch(g_object_get_data(G_OBJECT(dlg), E_TAPS_PAGE_KEY)); protocols_prefs_fetch(g_object_get_data(G_OBJECT(dlg), E_PROTOCOLS_PAGE_KEY)); prefs_modules_foreach(module_prefs_fetch, must_redissect); @@ -1303,9 +1299,7 @@ prefs_main_apply_all(GtkWidget *dlg, gboolean redissect) #endif /* HAVE_LIBPCAP */ printer_prefs_apply(g_object_get_data(G_OBJECT(dlg), E_PRINT_PAGE_KEY)); nameres_prefs_apply(g_object_get_data(G_OBJECT(dlg), E_NAMERES_PAGE_KEY)); -#ifdef HAVE_LIBPORTAUDIO - rtp_player_prefs_apply(g_object_get_data(G_OBJECT(dlg), E_RTP_PLAYER_PAGE_KEY)); -#endif + stats_prefs_apply(g_object_get_data(G_OBJECT(dlg), E_TAPS_PAGE_KEY)); protocols_prefs_apply(g_object_get_data(G_OBJECT(dlg), E_PROTOCOLS_PAGE_KEY)); /* show/hide the Save button - depending on setting */ @@ -1349,9 +1343,7 @@ prefs_main_destroy_all(GtkWidget *dlg) #endif /* HAVE_LIBPCAP */ printer_prefs_destroy(g_object_get_data(G_OBJECT(dlg), E_PRINT_PAGE_KEY)); nameres_prefs_destroy(g_object_get_data(G_OBJECT(dlg), E_NAMERES_PAGE_KEY)); -#ifdef HAVE_LIBPORTAUDIO - rtp_player_prefs_destroy(g_object_get_data(G_OBJECT(dlg), E_RTP_PLAYER_PAGE_KEY)); -#endif + stats_prefs_destroy(g_object_get_data(G_OBJECT(dlg), E_TAPS_PAGE_KEY)); /* Free up the saved preferences (both for "prefs" and for registered preferences). */ |