From: Andrej Kacian <ticho@claws-mail.org>
Date: Thu, 27 Aug 2015 10:00:00 +0000 (+0200)
Subject: Pass PrefsWindow pointer instead of GtkWindow to prefswindow's open and close callbacks.
X-Git-Tag: 3.13.0~57
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=f0cc04183e634bec1265a8e9e0cd1037125f2034

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 dfcc41ae3..16ef9e395 100644
--- 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)
-		prefswindow->close_cb(GTK_WINDOW(prefswindow->window));
+		prefswindow->close_cb(prefswindow);
 
 	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)
-		open_cb(GTK_WINDOW(prefswindow->window));
+		open_cb(prefswindow);
 
 	gtk_widget_grab_focus(prefswindow->tree_view);
 
diff --git a/src/gtk/prefswindow.h b/src/gtk/prefswindow.h
index d8530a8f8..20db56d1d 100644
--- 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 (*PrefsOpenCallbackFunc) (GtkWindow *);
-typedef void (*PrefsCloseCallbackFunc) (GtkWindow *);
+typedef void (*PrefsOpenCallbackFunc) (PrefsWindow *);
+typedef void (*PrefsCloseCallbackFunc) (PrefsWindow *);
 
 struct _PrefsPage
 {
diff --git a/src/prefs_folder_item.c b/src/prefs_folder_item.c
index 14309f8a6..37be0a2f7 100644
--- 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 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)