Index: configure.in
===================================================================
RCS file: /cvs/gnome/gnome-media/configure.in,v
retrieving revision 1.302
diff -u -p -r1.302 configure.in
--- configure.in	31 Jan 2006 00:15:39 -0000	1.302
+++ configure.in	1 Feb 2006 15:09:34 -0000
@@ -54,7 +54,8 @@ dnl Start of pkg-config checks
 PKG_CHECK_MODULES(MEDIA, 				\
 			glib-2.0 >= 1.3.7		\
 			gmodule-2.0 >= 1.3.7		\
-			libgnomeui-2.0 >= 1.102.0	\
+			libgnome-2.0 >= 2.13.7		\
+			libgnomeui-2.0 >= 2.13.2		\
 			esound >= 0.2.23)
 host=`uname -s`
 case "$host" in
Index: gnome-cd/gnome-cd.c
===================================================================
RCS file: /cvs/gnome/gnome-media/gnome-cd/gnome-cd.c,v
retrieving revision 1.104
diff -u -p -r1.104 gnome-cd.c
--- gnome-cd/gnome-cd.c	19 Jan 2006 23:52:18 -0000	1.104
+++ gnome-cd/gnome-cd.c	1 Feb 2006 15:09:35 -0000
@@ -977,20 +977,22 @@ register_stock_icons (void)
 int 
 main (int argc, char *argv[])
 {
-	static struct poptOption cd_popt_options [] = {
-		{ "device", '\0', POPT_ARG_STRING, &cd_option_device, 0,
+	static const GOptionEntry cd_goptions[] = {
+		{ "device", '\0', 0, G_OPTION_ARG_FILENAME, &cd_option_device,
 		  N_("CD device to use"), NULL },
-		{ "unique", '\0', POPT_ARG_NONE, &cd_option_unique, 0,
+		{ "unique", '\0', 0, G_OPTION_ARG_NONE, &cd_option_unique,
 		  N_("Only start if there isn't already a CD player application running"), NULL },
-		{ "play",   '\0', POPT_ARG_NONE, &cd_option_play, 0,
+		{ "play",   '\0', 0, G_OPTION_ARG_NONE, &cd_option_play,
 		  N_("Play the CD on startup"), NULL },
-		{ "tray", '\0', POPT_ARG_NONE, &cd_option_tray, 0,
+		{ "tray", '\0', 0, G_OPTION_ARG_NONE, &cd_option_tray,
 		  N_("Start iconified to tray"), NULL},
-		{ NULL, '\0', 0, NULL, 0 },
+		{ NULL, '\0', 0, 0, NULL, NULL, NULL }
 	};
 
 	GnomeCD *gcd;
 	GnomeClient *client;
+	GOptionGroup *group;
+	GOptionContext *ctx;
 
 	free (malloc (8)); /* -lefence */
 
@@ -1002,16 +1004,17 @@ main (int argc, char *argv[])
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 	textdomain (GETTEXT_PACKAGE);
 
-#ifdef HAVE_GST
-	/* FIXME when transition to GOption is being made */
-        /* g_option_context_add_group (context, gst_init_get_goption_group()); */
+	ctx = g_option_context_new ("gnome-cd");
 
-	gst_init (&argc, &argv); /* gst will remove its own options */
+#ifdef HAVE_GST
+	g_option_context_add_group (ctx, gst_init_get_option_group ());
 #endif
 
+	g_option_context_add_main_entries (ctx, cd_goptions, GETTEXT_PACKAGE);
+
 	gnome_program_init ("gnome-cd", VERSION, LIBGNOMEUI_MODULE, 
 			    argc, argv, 
-			    GNOME_PARAM_POPT_TABLE, cd_popt_options,
+			    GNOME_PARAM_GOPTION_CONTEXT, ctx,
 			    GNOME_PARAM_APP_DATADIR, DATADIR, NULL);
 
 	register_stock_icons ();
Index: grecord/src/gnome-recorder.c
===================================================================
RCS file: /cvs/gnome/gnome-media/grecord/src/gnome-recorder.c,v
retrieving revision 1.21
diff -u -p -r1.21 gnome-recorder.c
--- grecord/src/gnome-recorder.c	19 Jan 2006 23:52:20 -0000	1.21
+++ grecord/src/gnome-recorder.c	1 Feb 2006 15:09:36 -0000
@@ -167,55 +167,34 @@ int
 main (int argc,
       char **argv)
 {
-	GnomeProgram *program;
 	gchar **filenames = NULL;
+	/* this is necessary because someone apparently forgot to add a
+	 * convenient way to get the remaining arguments to the GnomeProgram
+	 * API when adding the GOption stuff to it ... */
+	const GOptionEntry entries[] = {
+		{ G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &filenames,
+		"Special option that collects any remaining arguments for us" },
+		{ NULL, }
+	};
+
+	GOptionContext *ctx;
+	GnomeProgram *program;
 
 	/* Init gettext */
 	bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 	textdomain (GETTEXT_PACKAGE);
 
-/* FIXME: remove ifdef here and else branch when bumping requirements to 2.14 */
-#ifdef GNOME_PARAM_GOPTION_CONTEXT
-	if (1) {
-		GOptionContext *ctx;
-		/* this is necessary because someone apparently forgot to add a
-		 * convenient way to get the remaining arguments to the GnomeProgram
-		 * API when adding the GOption stuff to it ... */
-		GOptionEntry entries[] = {
-			{ G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &filenames,
-			"Special option that collects any remaining arguments for us" },
-			{ NULL }
-		};
-
-		ctx = g_option_context_new ("gnome-sound-recorder");
-		g_option_context_add_group (ctx, gst_init_get_option_group ());
-		g_option_context_add_main_entries (ctx, entries, GETTEXT_PACKAGE);
-		program = gnome_program_init ("gnome-sound-recorder", VERSION,
-		                              LIBGNOMEUI_MODULE, argc, argv,
-		                              GNOME_PARAM_GOPTION_CONTEXT, ctx,
-		                              GNOME_PARAM_HUMAN_READABLE_NAME,
-		                              "GNOME Sound Recorder",
-		                              GNOME_PARAM_APP_DATADIR, DATADIR,
-		                              NULL);
-	}
-#else /* GNOME_PARAM_GOPTION_CONTEXT */
-	gst_init (&argc, &argv);
-
+	ctx = g_option_context_new ("gnome-sound-recorder");
+	g_option_context_add_group (ctx, gst_init_get_option_group ());
+	g_option_context_add_main_entries (ctx, entries, GETTEXT_PACKAGE);
 	program = gnome_program_init ("gnome-sound-recorder", VERSION,
-				      LIBGNOMEUI_MODULE,
-				      argc, argv,
-				      GNOME_PARAM_HUMAN_READABLE_NAME,
-				      "GNOME Sound Recorder",
-				      GNOME_PARAM_APP_DATADIR, DATADIR,
-				      NULL);
-
-	if (argc > 1) {
-		filenames = g_strdupv (&argv[1]);
-	} else {
-		filenames = NULL;
-	}
-#endif /* GNOME_PARAM_GOPTION_CONTEXT */
+	                              LIBGNOMEUI_MODULE, argc, argv,
+	                              GNOME_PARAM_GOPTION_CONTEXT, ctx,
+	                              GNOME_PARAM_HUMAN_READABLE_NAME,
+	                              "GNOME Sound Recorder",
+	                              GNOME_PARAM_APP_DATADIR, DATADIR,
+	                              NULL);
 
 	init_recent ();
 
Index: gst-mixer/src/main.c
===================================================================
RCS file: /cvs/gnome/gnome-media/gst-mixer/src/main.c,v
retrieving revision 1.11
diff -u -p -r1.11 main.c
--- gst-mixer/src/main.c	19 Jan 2006 23:52:21 -0000	1.11
+++ gst-mixer/src/main.c	1 Feb 2006 15:09:37 -0000
@@ -166,6 +166,8 @@ gint
 main (gint   argc,
       gchar *argv[])
 {
+  GOptionContext *ctx;
+  GOptionGroup *group;
   gchar *appfile;
   GtkWidget *win;
   GList *elements;
@@ -175,29 +177,14 @@ main (gint   argc,
   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
   textdomain (GETTEXT_PACKAGE);
 
-/* FIXME: remove when bumping requirements to 2.14 */
-#ifdef GNOME_PARAM_GOPTION_CONTEXT
-  if (1) {
-    GOptionContext *ctx;
-    GOptionGroup *group;
-
-    ctx = g_option_context_new ("gnome-volume-control");
-    g_option_context_add_group (ctx, gst_init_get_option_group ());
-
-    gnome_program_init ("gnome-volume-control", VERSION,
-                        LIBGNOMEUI_MODULE, argc, argv,
-                        GNOME_PARAM_GOPTION_CONTEXT, ctx,
-                        GNOME_PARAM_APP_DATADIR, DATA_DIR,
-                        NULL);
-  }
-#else /* GNOME_PARAM_GOPTION_CONTEXT */
-  gst_init (&argc, &argv);
-  gnome_program_init ("gnome-volume-control", VERSION,
-		      LIBGNOMEUI_MODULE, argc, argv,
-		      GNOME_PARAM_APP_DATADIR, DATA_DIR, NULL);
-
-#endif /* GNOME_PARAM_GOPTION_CONTEXT */
+  ctx = g_option_context_new ("gnome-volume-control");
+  g_option_context_add_group (ctx, gst_init_get_option_group ());
 
+  gnome_program_init ("gnome-volume-control", VERSION,
+                      LIBGNOMEUI_MODULE, argc, argv,
+                      GNOME_PARAM_GOPTION_CONTEXT, ctx,
+                      GNOME_PARAM_APP_DATADIR, DATA_DIR,
+                      NULL);
 
   /* init ourselves */
   register_stock_icons ();
Index: gstreamer-properties/gstreamer-properties.c
===================================================================
RCS file: /cvs/gnome/gnome-media/gstreamer-properties/gstreamer-properties.c,v
retrieving revision 1.16
diff -u -p -r1.16 gstreamer-properties.c
--- gstreamer-properties/gstreamer-properties.c	29 Jan 2006 23:24:00 -0000	1.16
+++ gstreamer-properties/gstreamer-properties.c	1 Feb 2006 15:09:37 -0000
@@ -395,30 +395,20 @@ create_dialog (void)
 int
 main (int argc, char **argv)
 {
+  GOptionContext *ctx;
+  GOptionGroup *group;
+
   /* bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR); */
   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
   textdomain (GETTEXT_PACKAGE);
 
-/* FIXME: remove when bumping requirements to 2.14 */
-#ifdef GNOME_PARAM_GOPTION_CONTEXT
-  if (1) {
-    GOptionContext *ctx;
-    GOptionGroup *group;
-
-    ctx = g_option_context_new ("gstreamer-properties");
-    g_option_context_add_group (ctx, gst_init_get_option_group ());
-
-    gnome_program_init ("gstreamer-properties", VERSION,
-        LIBGNOMEUI_MODULE, argc, argv,
-        GNOME_PARAM_GOPTION_CONTEXT, ctx,
-        GNOME_PARAM_APP_DATADIR, DATADIR, NULL);
-  }
-#else /* GNOME_PARAM_GOPTION_CONTEXT */
-  gst_init (&argc, &argv);
+  ctx = g_option_context_new ("gstreamer-properties");
+  g_option_context_add_group (ctx, gst_init_get_option_group ());
 
   gnome_program_init ("gstreamer-properties", VERSION,
-      LIBGNOMEUI_MODULE, argc, argv, GNOME_PARAM_APP_DATADIR, DATADIR, NULL);
-#endif /* GNOME_PARAM_GOPTION_CONTEXT */
+      LIBGNOMEUI_MODULE, argc, argv,
+      GNOME_PARAM_GOPTION_CONTEXT, ctx,
+      GNOME_PARAM_APP_DATADIR, DATADIR, NULL);
 
   /* FIXME: hardcode uninstalled path here */
   if (g_file_test ("gstreamer-properties.glade", G_FILE_TEST_EXISTS) == TRUE) {
