Fixes bug #3467 for "click Apply, then click Cancel" scenario.
#ifdef GENERIC_UMPC
prefs_show_sections(prefswindow);
#endif
+
+ if (prefswindow->apply_cb)
+ prefswindow->apply_cb(prefswindow);
}
static void close_prefs_window(PrefsWindow *prefswindow)
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;
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);
}
/*!
typedef void (*PrefsSavePageFunc) (PrefsPage *);
typedef gboolean (*PrefsCanClosePageFunc) (PrefsPage *);
typedef void (*PrefsOpenCallbackFunc) (PrefsWindow *);
+typedef void (*PrefsApplyCallbackFunc) (PrefsWindow *);
typedef void (*PrefsCloseCallbackFunc) (PrefsWindow *);
struct _PrefsPage
gint *save_width;
gint *save_height;
PrefsCloseCallbackFunc open_cb;
+ PrefsApplyCallbackFunc apply_cb;
PrefsCloseCallbackFunc close_cb;
gint dialog_response; /* Useful for close_cb callbacks */
gint *save_width, gint *save_height,
gboolean preload_pages,
PrefsOpenCallbackFunc open_cb,
+ PrefsApplyCallbackFunc apply_cb,
PrefsCloseCallbackFunc close_cb);
void prefswindow_open (const gchar *title,
gpointer data,
gint *save_width, gint *save_height,
PrefsOpenCallbackFunc open_cb,
+ PrefsApplyCallbackFunc apply_cb,
PrefsCloseCallbackFunc close_cb);
#endif
prefswindow_open_full(title, prefs_pages, ac_prefs, destroy_dialog,
&prefs_common.editaccountwin_width, &prefs_common.editaccountwin_height,
- TRUE, NULL, NULL);
+ TRUE, NULL, NULL, NULL);
g_free(title);
gtk_main();
prefswindow_open(title, pages, item,
&prefs_common.folderitemwin_width, &prefs_common.folderitemwin_height,
prefs_folder_item_address_completion_start,
+ NULL,
prefs_folder_item_address_completion_end);
g_slist_free(pages);
{
prefswindow_open(_("Preferences"), prefs_pages, NULL,
&prefs_common.prefswin_width, &prefs_common.prefswin_height,
- NULL, prefs_gtk_window_closed_cb);
+ NULL, prefs_gtk_window_closed_cb, prefs_gtk_window_closed_cb);
}
void prefs_gtk_register_page(PrefsPage *page)