--- a/pep_geoloc.c	Mon May 21 03:38:51 2012 +0300
+++ b/pep_geoloc.c	Mon May 21 19:10:25 2012 +0300
@@ -34,7 +34,7 @@
 #include <mcabber/modules.h>
 
 #include "pep.h"
-#include "geoloc.h"
+#include "pep_geoloc.h"
 
 #include "config.h"
 
@@ -45,9 +45,7 @@
 void pep_geoloc_init   (void);
 void pep_geoloc_uninit (void);
 
-#define DESCRIPTION ( \
-	"PEP geoloc event handling\n" \
-	"Recognizes option geoloc_interval" )
+#define DESCRIPTION ( PEP_GEOLOC_DESCRIPTION )
 
 static const gchar *deps[] = { "pep", NULL };
 
@@ -421,11 +419,11 @@
 {
 	geoloc_gerror_quark = g_quark_from_string ( "pep-geoloc-gerror-quark" );
 
-	geoloc_interval = settings_opt_get_int ("geoloc_interval");
+	geoloc_interval = settings_opt_get_int ( OPT_GEOLOC_INTERVAL );
 
-	geoloc_guard_installed = settings_set_guard ("geoloc_interval", geoloc_guard);
+	geoloc_guard_installed = settings_set_guard (OPT_GEOLOC_INTERVAL, geoloc_guard);
 	if (!geoloc_guard_installed)
-		scr_log_print (LPRINT_LOGNORM, "geoloc: Warning: cannot install option guard for 'geoloc_interval'.");
+		scr_log_print (LPRINT_LOGNORM, "geoloc: Warning: cannot install option guard for '" OPT_GEOLOC_INTERVAL "'.");
 
 	pep_register_xmlns_handler (NS_GEOLOC, geoloc_handler, NULL, NULL);
 
@@ -468,7 +466,7 @@
 	}
 
 	if (geoloc_guard_installed)
-		settings_del_guard ("geoloc_interval");
+		settings_del_guard ( OPT_GEOLOC_INTERVAL );
 }
 
 /* vim: se ts=4 sw=4: */