changed popt callbacks t get a pointer into the option table

svn path=/trunk/; revision=411

3 files changed, 7 insertions, 5 deletions

diff --git a/support/popt-gnome.h b/support/popt-gnome.h
index 50580f7..bdedcea 100644
--- a/support/popt-gnome.h
+++ b/support/popt-gnome.h
@@ -55,8 +55,9 @@ extern struct poptOption poptHelpOptions[];
 typedef struct poptContext_s * poptContext;
 typedef struct poptOption * poptOption;
 
-typedef void (*poptCallbackType)(poptContext con, int key, const char * arg, 
-				 void * data);
+typedef void (*poptCallbackType)(poptContext con, 
+			         const struct poptOption * opt,
+				 const char * arg, void * data);
 
 poptContext poptGetContext(char * name, int argc, char ** argv, 
 			   const struct poptOption * options, int flags);
diff --git a/support/popt.c b/support/popt.c
index 96d6053..0df3179 100644
--- a/support/popt.c
+++ b/support/popt.c
@@ -370,7 +370,7 @@ int poptGetNextOpt(poptContext con) {
 	}
 
 	if (cb)
-	    cb(con, opt->val, con->os->nextArg, cbData);
+	    cb(con, opt, con->os->nextArg, cbData);
 	else if (opt->val) 
 	    done = 1;
 
diff --git a/support/popt.h b/support/popt.h
index 50580f7..bdedcea 100644
--- a/support/popt.h
+++ b/support/popt.h
@@ -55,8 +55,9 @@ extern struct poptOption poptHelpOptions[];
 typedef struct poptContext_s * poptContext;
 typedef struct poptOption * poptOption;
 
-typedef void (*poptCallbackType)(poptContext con, int key, const char * arg, 
-				 void * data);
+typedef void (*poptCallbackType)(poptContext con, 
+			         const struct poptOption * opt,
+				 const char * arg, void * data);
 
 poptContext poptGetContext(char * name, int argc, char ** argv, 
 			   const struct poptOption * options, int flags);