Pass PrefsWindow pointer instead of GtkWindow to prefswindow's open and close callbacks.

diff --git a/src/gtk/prefswindow.c b/src/gtk/prefswindow.c
index dfcc41ae3102d7f1c9854f64b87b814f827c3def..16ef9e3954741be57c5c62eebd1388128bd40a5d 100644 (file)
--- a/src/gtk/prefswindow.c
+++ b/src/gtk/prefswindow.c
@@ -133,7 +133,7 @@ static void close_prefs_window(PrefsWindow *prefswindow)
        close_all_pages(prefswindow->prefs_pages);
 
        if (prefswindow->close_cb)
        close_all_pages(prefswindow->prefs_pages);
 
        if (prefswindow->close_cb)

-               prefswindow->close_cb(GTK_WINDOW(prefswindow->window));
+               prefswindow->close_cb(prefswindow);

 
        gtk_widget_destroy(prefswindow->window);
        g_slist_free(prefswindow->prefs_pages);
 
        gtk_widget_destroy(prefswindow->window);
        g_slist_free(prefswindow->prefs_pages);


@@ -484,7 +484,7 @@ void prefswindow_open_full(const gchar *title, GSList *prefs_pages,
                                                        preload_pages);
 
        if (open_cb)
                                                        preload_pages);
 
        if (open_cb)

-               open_cb(GTK_WINDOW(prefswindow->window));
+               open_cb(prefswindow);

 
        gtk_widget_grab_focus(prefswindow->tree_view);
 
 
        gtk_widget_grab_focus(prefswindow->tree_view);
 

diff --git a/src/gtk/prefswindow.h b/src/gtk/prefswindow.h
index d8530a8f819755a03fab0f2abb19d01288f86649..20db56d1d791c443eff01befc7914fa7603c2ad4 100644 (file)
--- a/src/gtk/prefswindow.h
+++ b/src/gtk/prefswindow.h
@@ -30,8 +30,8 @@ typedef void (*PrefsCreateWidgetFunc) (PrefsPage *, GtkWindow *window, gpointer)
 typedef void (*PrefsDestroyWidgetFunc) (PrefsPage *);
 typedef void (*PrefsSavePageFunc) (PrefsPage *);
 typedef gboolean (*PrefsCanClosePageFunc) (PrefsPage *);
 typedef void (*PrefsDestroyWidgetFunc) (PrefsPage *);
 typedef void (*PrefsSavePageFunc) (PrefsPage *);
 typedef gboolean (*PrefsCanClosePageFunc) (PrefsPage *);

-typedef void (*PrefsOpenCallbackFunc) (GtkWindow *);
-typedef void (*PrefsCloseCallbackFunc) (GtkWindow *);
+typedef void (*PrefsOpenCallbackFunc) (PrefsWindow *);
+typedef void (*PrefsCloseCallbackFunc) (PrefsWindow *);

 
 struct _PrefsPage
 {
 
 struct _PrefsPage
 {

diff --git a/src/prefs_folder_item.c b/src/prefs_folder_item.c
index 14309f8a609043efe5c1737b3b49d7f7310089e5..37be0a2f7b95f6c154c3e51b47675410691f496a 100644 (file)
--- a/src/prefs_folder_item.c
+++ b/src/prefs_folder_item.c
@@ -1859,14 +1859,14 @@ static void register_templates_page(void)
 
 static GSList *prefs_pages = NULL;
 
 
 static GSList *prefs_pages = NULL;
 

-static void prefs_folder_item_address_completion_start(GtkWindow * window)
+static void prefs_folder_item_address_completion_start(PrefsWindow *window)

 {
 {

-       address_completion_start(GTK_WIDGET(window));
+       address_completion_start(window->window);

 }
 
 }
 

-static void prefs_folder_item_address_completion_end(GtkWindow * window)
+static void prefs_folder_item_address_completion_end(PrefsWindow *window)

 {
 {

-       address_completion_end(GTK_WIDGET(window));
+       address_completion_end(window->window);

 }
 
 void prefs_folder_item_open(FolderItem *item)
 }
 
 void prefs_folder_item_open(FolderItem *item)