? gnome-doc-utils.make
? docs/gnome-keyring-manager-C.omf
? docs/gnome-keyring-manager-es.omf
? docs/gnome-keyring-manager-uk.omf
? docs/es/.xml2po.mo
? docs/es/gnome-keyring-manager.xml
? docs/uk/.xml2po.mo
? docs/uk/gnome-keyring-manager.xml
? po/stamp-it
Index: src/gnome-keyring-manager.c
===================================================================
RCS file: /cvs/gnome/gnome-keyring-manager/src/gnome-keyring-manager.c,v
retrieving revision 1.26
diff -u -r1.26 gnome-keyring-manager.c
--- src/gnome-keyring-manager.c	20 Aug 2005 16:19:59 -0000	1.26
+++ src/gnome-keyring-manager.c	26 Mar 2006 14:44:26 -0000
@@ -21,7 +21,6 @@
 #include <config.h>
 
 #include <stdlib.h>
-#include <popt.h>
 
 #include <glib.h>
 #include <glib/gi18n.h>
@@ -144,14 +143,14 @@
  * Getting things going
  */
 
-/* struct poptOption options[] = */
-/* { */
-/*     { NULL, '\0', POPT_ARG_CALLBACK | POPT_CBFLAG_POST, (poptCallbackType) parse_option_callback, 0, NULL, NULL } */
-/* }; */
+static const GOptionEntry options[] = {
+        { NULL}
+};
 
 int
 main (int argc, char **argv)
 {
+  GOptionContext *context;
 
   bindtextdomain (GETTEXT_PACKAGE, GNOME_KEYRING_MANAGER_LOCALEDIR);
   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
@@ -159,9 +158,12 @@
   
   g_set_application_name (_("Keyring Manager"));
 
+  context = g_option_context_new (NULL);
+  g_option_context_add_main_entries (context, options, GETTEXT_PACKAGE);
+  
   gnome_program_init (PACKAGE, VERSION,
                       LIBGNOMEUI_MODULE, argc, argv,
-                      GNOME_PARAM_POPT_TABLE, NULL,
+                      GNOME_PARAM_GOPTION_CONTEXT, context,
 		      GNOME_PROGRAM_STANDARD_PROPERTIES,
                       GNOME_PARAM_NONE);
 
