From cb2f9f3e7bb3124a95a723f1a7678c28e2bb0644 Mon Sep 17 00:00:00 2001
From: Berke Viktor <bviktor@hexchat.org>
Date: Wed, 18 Jul 2012 20:16:35 +0200
Subject: [PATCH] Use GTK+ file dialogs on Windows too, the Win32 dialogs are
 too buggy

---
 src/common/thread.c    | 2 ++
 src/common/thread.h    | 2 ++
 src/fe-gtk/gtkutil.c   | 8 ++++++++
 src/fe-gtk/plugingui.c | 4 +++-
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/common/thread.c b/src/common/thread.c
index 02b17cfb..ba808737 100644
--- a/src/common/thread.c
+++ b/src/common/thread.c
@@ -1,3 +1,4 @@
+#if 0	/* native file dialogs */
 #include <fcntl.h>
 #include "thread.h"
 
@@ -31,3 +32,4 @@ thread_start (thread *th, void *(*start_routine)(void *), void *arg)
 
 	return 1;
 }
+#endif
diff --git a/src/common/thread.h b/src/common/thread.h
index 7ca0f937..97a4ed30 100644
--- a/src/common/thread.h
+++ b/src/common/thread.h
@@ -1,3 +1,4 @@
+#if 0	/* native file dialogs */
 #include <windows.h>
 
 typedef struct
@@ -8,3 +9,4 @@ typedef struct
 
 thread *thread_new (void);
 int thread_start (thread *th, void *(*start_routine)(void *), void *arg);
+#endif
diff --git a/src/fe-gtk/gtkutil.c b/src/fe-gtk/gtkutil.c
index 7b4f8b06..5fcaa194 100644
--- a/src/fe-gtk/gtkutil.c
+++ b/src/fe-gtk/gtkutil.c
@@ -53,8 +53,10 @@
 #include "pixmaps.h"
 
 #ifdef WIN32
+#if 0	/* native file dialogs */
 #include "../common/fe.h"
 #include "../common/thread.h"
+#endif
 #else
 #include <unistd.h>
 #endif
@@ -71,12 +73,14 @@ struct file_req
 	filereqcallback callback;
 	int flags;		/* FRF_* flags */
 
+#if 0	/* native file dialogs */
 #ifdef WIN32
 	int multiple;
 	thread *th;
 	char *title;	/* native locale */
 	char *filter;
 #endif
+#endif
 };
 
 static char last_dir[256] = "";
@@ -178,6 +182,7 @@ gtkutil_file_req_response (GtkWidget *dialog, gint res, struct file_req *freq)
 	}
 }
 
+#if 0	/* native file dialogs */
 #ifdef WIN32
 static int
 win32_openfile (char *file_buf, int file_buf_len, char *title_text, char *filter,
@@ -361,6 +366,7 @@ win32_read_thread (GIOChannel *source, GIOCondition cond, struct file_req *freq)
 	return FALSE;
 }
 #endif
+#endif	/* native file dialogs */
 
 void
 gtkutil_file_req (const char *title, void *callback, void *userdata, char *filter,
@@ -370,6 +376,7 @@ gtkutil_file_req (const char *title, void *callback, void *userdata, char *filte
 	GtkWidget *dialog;
 	extern char *get_xdir_fs (void);
 
+#if 0	/* native file dialogs */
 #ifdef WIN32
 	if (!(flags & FRF_WRITE))
 	{
@@ -420,6 +427,7 @@ gtkutil_file_req (const char *title, void *callback, void *userdata, char *filte
 
 	return;
 	}
+#endif
 #endif
 
 	if (flags & FRF_WRITE)
diff --git a/src/fe-gtk/plugingui.c b/src/fe-gtk/plugingui.c
index 0f316f09..33b27663 100644
--- a/src/fe-gtk/plugingui.c
+++ b/src/fe-gtk/plugingui.c
@@ -147,12 +147,14 @@ void
 plugingui_load (void)
 {
 	gtkutil_file_req (_("Select a Plugin or Script to load"), plugingui_load_cb, current_sess,
+#if 0	/* native file dialogs */
 #ifdef WIN32
 							"Plugins and Scripts\0*.dll;*.lua;*.pl;*.py;*.tcl\0"
 							"All files\0*.*\0\0", 0);
 #else
-							NULL, FRF_ADDFOLDER);
 #endif
+#endif	/* native file dialogs */
+							NULL, FRF_ADDFOLDER);
 }
 
 static void