aboutsummaryrefslogtreecommitdiffstats
path: root/gtk
diff options
context:
space:
mode:
authorUlf Lamping <ulf.lamping@web.de>2006-11-15 23:33:39 +0000
committerUlf Lamping <ulf.lamping@web.de>2006-11-15 23:33:39 +0000
commit58c388e9039f307d43315089bff9e86166267f62 (patch)
tree88ab1706a147a3fd5952c42875bedcaae4545478 /gtk
parent29c109e5bd8b56030af42c269ae5dcc0bb93a656 (diff)
add a "private_data" pointer to the read_prefs_file() function, which will be "tunneled" to the callback function. This seems to be generally a good idea - as a lot of GLib/GTK function doing similiar and I'll need this for the upcoming update mechanisms.
svn path=/trunk/; revision=19905
Diffstat (limited to 'gtk')
-rw-r--r--gtk/recent.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/gtk/recent.c b/gtk/recent.c
index d1c10a59b5..ab0d25a5b8 100644
--- a/gtk/recent.c
+++ b/gtk/recent.c
@@ -298,7 +298,7 @@ write_recent_geom(gpointer key _U_, gpointer value, gpointer rf)
/* set one user's recent file key/value pair */
static int
-read_set_recent_pair_static(gchar *key, gchar *value)
+read_set_recent_pair_static(gchar *key, gchar *value, void *private_data _U_)
{
long num;
char *p;
@@ -452,7 +452,7 @@ read_set_recent_pair_static(gchar *key, gchar *value)
/* set one user's recent file key/value pair */
static int
-read_set_recent_pair_dynamic(gchar *key, gchar *value)
+read_set_recent_pair_dynamic(gchar *key, gchar *value, void *private_data _U_)
{
if (strcmp(key, RECENT_KEY_CAPTURE_FILE) == 0) {
add_menu_recent_capture_file(value);
@@ -502,7 +502,7 @@ recent_set_arg(char *prefarg)
return PREFS_SET_SYNTAX_ERR;
}
- ret = read_set_recent_pair_static(prefarg, p);
+ ret = read_set_recent_pair_static(prefarg, p, NULL);
*colonp = ':'; /* put the colon back */
return ret;
}
@@ -560,7 +560,7 @@ recent_read_static(char **rf_path_return, int *rf_errno_return)
*rf_path_return = NULL;
if ((rf = eth_fopen(rf_path, "r")) != NULL) {
/* We succeeded in opening it; read it. */
- read_prefs_file(rf_path, rf, read_set_recent_pair_static);
+ read_prefs_file(rf_path, rf, read_set_recent_pair_static, NULL);
fclose(rf);
g_free(rf_path);
rf_path = NULL;
@@ -592,7 +592,7 @@ recent_read_dynamic(char **rf_path_return, int *rf_errno_return)
*rf_path_return = NULL;
if ((rf = eth_fopen(rf_path, "r")) != NULL) {
/* We succeeded in opening it; read it. */
- read_prefs_file(rf_path, rf, read_set_recent_pair_dynamic);
+ read_prefs_file(rf_path, rf, read_set_recent_pair_dynamic, NULL);
/* set dfilter combobox to have an empty line */
dfilter_combo_add_empty();
fclose(rf);