Index: libgnome/gnome-program.h
===================================================================
RCS file: /cvs/gnome/libgnome/libgnome/gnome-program.h,v
retrieving revision 1.30
diff -p -u -u -p -r1.30 gnome-program.h
--- libgnome/gnome-program.h	29 Sep 2005 18:34:19 -0000	1.30
+++ libgnome/gnome-program.h	15 Jan 2006 19:13:18 -0000
@@ -32,12 +32,14 @@
 #define GNOME_PROGRAM_H
 
 #include <glib.h>
-#include <popt.h>
 #include <stdarg.h>
 #include <errno.h>
 
 #include <glib-object.h>
 
+#ifndef GNOME_DISABLE_DEPRECATED
+#include <popt.h>
+#endif
 
 G_BEGIN_DECLS
 
@@ -110,9 +112,6 @@ gnome_program_locate_file               
 					 GSList         **ret_locations);
 
 #define GNOME_PARAM_NONE                NULL
-#define GNOME_PARAM_POPT_TABLE          "popt-table"
-#define GNOME_PARAM_POPT_FLAGS          "popt-flags"
-#define GNOME_PARAM_POPT_CONTEXT        "popt-context"
 #define GNOME_PARAM_GOPTION_CONTEXT     "goption-context"
 #define GNOME_PARAM_CREATE_DIRECTORIES  "create-directories"
 #define GNOME_PARAM_ENABLE_SOUND        "enable-sound"
@@ -130,6 +129,12 @@ gnome_program_locate_file               
 #define GNOME_PARAM_HUMAN_READABLE_NAME "human-readable-name"
 #define GNOME_PARAM_GNOME_PATH          "gnome-path"
 
+#ifndef GNOME_DISABLE_DEPRECATED
+#define GNOME_PARAM_POPT_TABLE          "popt-table"
+#define GNOME_PARAM_POPT_FLAGS          "popt-flags"
+#define GNOME_PARAM_POPT_CONTEXT        "popt-context"
+#endif
+
 /***** application modules (aka libraries :) ******/
 #define GNOME_TYPE_MODULE_INFO          (gnome_module_info_get_type ())
 
@@ -159,7 +164,11 @@ struct _GnomeModuleInfo {
     GnomeModuleHook instance_init;
     GnomeModuleHook pre_args_parse, post_args_parse;
 
+#ifdef GNOME_DISABLE_DEPRECATED
+    struct poptOption *_options;
+#else
     struct poptOption *options;
+#endif
 
     GnomeModuleInitHook init_pass;
 
