diff lib/gftp.h @ 186:13ca1defdc75

2003-6-16 Brian Masney <[e-mail]> * lib/gftp.h src/text/gftp-text.c src/gtk/misc-gtk.c - changed 2nd parameter of logging function to be a request structure, instead of request->user_data. In the logging functions, if the string isn't in UTF-8, convert it with gftp_string_to_utf8() * lib/bookmark.c lib/cache.c lib/gftp.h lib/https.c lib/local.c lib/protocols.c lib/rfc2068.c lib/rfc959.c lib/sshv2.c lib/sslcommon.c src/gtk/chmod_dialog.c src/gtk/delete_dialog.c src/gtk/gftp-gtk.h src/gtk/menu-items.c src/gtk/misc-gtk.c src/gtk/mkdir_dialog.c src/gtk/rename_dialog.c src/gtk/transfer.c src/text/gftp-text.c src/gtk/gftp-gtk.h src/text/gftp-text.h - pass request structure to logging function instead of request->user_data

--- a/lib/gftp.h	Tue Jun 17 10:13:26 2003 +0000
+++ b/lib/gftp.h	Tue Jun 17 10:49:16 2003 +0000
@@ -154,11 +154,6 @@
   gftp_logging_misc
 } gftp_logging_level;
 
-typedef void (*gftp_logging_func)		( gftp_logging_level level, 
-						  void *ptr, 
-						  const char *string, ... );
-
-
 typedef struct gftp_file_tag gftp_file;
 
 #define GFTP_TRANS_ACTION_OVERWRITE		1
@@ -295,6 +290,10 @@
 
 typedef struct gftp_request_tag gftp_request;
 
+typedef void (*gftp_logging_func)		( gftp_logging_level level, 
+						  gftp_request * request, 
+						  const char *string, ... );
+
 struct gftp_request_tag 
 {
   int protonum;			/* Current number of the protocol this is 
@@ -759,6 +758,11 @@
 
 int gftp_list_files 			( gftp_request * request );
 
+#if GLIB_MAJOR_VERSION > 1
+char * gftp_string_to_utf8		( gftp_request * request, 
+					  char *str );
+#endif
+
 int gftp_parse_bookmark 		( gftp_request * request, 
 					  const char * bookmark );