{
PrefsWindow *prefswindow = (PrefsWindow *) user_data;
+ prefswindow->dialog_response = PREFSWINDOW_RESPONSE_APPLY;
+
save_all_pages(prefswindow->prefs_pages);
#ifdef GENERIC_UMPC
prefs_show_sections(prefswindow);
#endif
+
+ if (prefswindow->apply_cb)
+ prefswindow->apply_cb(prefswindow);
}
static void close_prefs_window(PrefsWindow *prefswindow)
{
PrefsWindow *prefswindow = (PrefsWindow *) user_data;
+ prefswindow->dialog_response = PREFSWINDOW_RESPONSE_OK;
+
if (query_can_close_all_pages(prefswindow->prefs_pages)) {
save_all_pages(prefswindow->prefs_pages);
close_prefs_window(prefswindow);
gtk_tree_model_foreach(GTK_TREE_MODEL(store),
(GtkTreeModelForeachFunc) find_node_by_name,
&find_name);
- if (find_name.found && page->path[i] != page->path[i-1]) {
+ if (find_name.found && (i == 0 || page->path[i] != page->path[i-1])) {
node = find_name.node;
gtk_tree_model_get(GTK_TREE_MODEL(store), &node,
PREFS_PAGE_DATA, &prefs_node,
gint *save_width, gint *save_height,
gboolean preload_pages,
PrefsOpenCallbackFunc open_cb,
+ PrefsApplyCallbackFunc apply_cb,
PrefsCloseCallbackFunc close_cb)
{
PrefsWindow *prefswindow;
prefswindow->save_width = save_width;
prefswindow->save_height = save_height;
prefswindow->open_cb = open_cb;
+ prefswindow->apply_cb = apply_cb;
prefswindow->close_cb = close_cb;
+ prefswindow->dialog_response = PREFSWINDOW_RESPONSE_CANCEL;
prefswindow->window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "prefswindow");
gtk_window_set_title(GTK_WINDOW(prefswindow->window), title);
void prefswindow_open(const gchar *title, GSList *prefs_pages, gpointer data,
gint *save_width, gint *save_height,
PrefsOpenCallbackFunc open_cb,
+ PrefsApplyCallbackFunc apply_cb,
PrefsCloseCallbackFunc close_cb)
{
prefswindow_open_full(title, prefs_pages, data, NULL, save_width, save_height,
- FALSE, open_cb, close_cb);
+ FALSE, open_cb, apply_cb, close_cb);
}
/*!