Fixes to gstreamer element and caps handlings.

[mapper] / src / ui-maemo.h

diff --git a/src/ui-maemo.h b/src/ui-maemo.h
index 5c888790c1d6e7bebae02b4d3418145c0406cde2..32432f4e10105a277e7ee429ca7a34983e7a3768 100644 (file)
--- a/src/ui-maemo.h
+++ b/src/ui-maemo.h
@@ -1,29 +1,20 @@
 #ifndef _MAPPER_UI_MAEMO_H
 #define _MAPPER_UI_MAEMO_H
 
-#include <config.h>
+#include "config.h"
 
-#ifdef WITH_HILDON
+#include "hildon-mapper.h"
 
-#define HELP_ID_PREFIX "help_mapper_"
-#define HELP_ID_INTRO HELP_ID_PREFIX"intro"
-#define HELP_ID_GETSTARTED HELP_ID_PREFIX"getstarted"
-#define HELP_ID_ABOUT HELP_ID_PREFIX"about"
-#define HELP_ID_SETTINGS HELP_ID_PREFIX"settings"
-#define HELP_ID_REPOMAN HELP_ID_PREFIX"repoman"
-#define HELP_ID_MAPMAN HELP_ID_PREFIX"mapman"
-#define HELP_ID_DOWNROUTE HELP_ID_PREFIX"downroute"
-#define HELP_ID_POICAT HELP_ID_PREFIX"poicat"
+#ifdef WITH_HILDON
 
+#ifdef WITH_OSSO
 #include <libosso.h>
-#include <hildon-widgets/hildon-program.h>
+/** The main OSSO context of the application. */
+osso_context_t *_osso;
+#endif
 
 /** The main GtkWindow of the application. */
 HildonProgram *_program;
 
-/** The main OSSO context of the application. */
-osso_context_t *_osso;
-
 #endif
-
 #endif