[glom/maemo5] Use libosso instead of libossomm, because we just use one

[Murray Cumming <murrayc src gnome org>]

commit 197665bd304335f2a8108f04bd97664a7c4149b8
Author: Murray Cumming <murrayc murrayc com>
Date:   Thu Nov 5 13:27:52 2009 +0100

     Use libosso instead of libossomm, because we just use one
    function. Not actually tested yet.

 ChangeLog    |    6 ++++++
 configure.ac |    2 +-
 glom/main.cc |    4 ++--
 3 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 67abe6f..2639b83 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-11-05  Murray Cumming  <murrayc murrayc com>
+
+	* configure.ac:
+	* glom/main.cc: Use libosso instead of libossomm, because we just use one 
+	function. Not actually tested yet.
+
 2009-11-04  David King  <davidk openismus com>
 
 	* glom.xml: Add Maemo-specific category for classification of .glom
diff --git a/configure.ac b/configure.ac
index 029a761..e2cb2df 100644
--- a/configure.ac
+++ b/configure.ac
@@ -162,7 +162,7 @@ AS_IF([test "x$glom_enable_client_only" != xyes],
 AS_IF([test "x$glom_enable_sqlite" = xyes],
       [REQUIRED_GLOM_LIBS="$REQUIRED_GLOM_LIBS libgda-sqlite-4.0"])
 AS_IF([test "x$glom_enable_maemo" = xyes],
-      [REQUIRED_GLOM_LIBS="$REQUIRED_GLOM_LIBS hildonmm hildon-fmmm libossomm osso-af-settings"
+      [REQUIRED_GLOM_LIBS="$REQUIRED_GLOM_LIBS hildonmm hildon-fmmm libosso osso-af-settings"
       MM_PKG_CONFIG_SUBST([OSSO_SERVICEDIR], [--variable=dbusservicedir osso-af-settings])
       MM_PKG_CONFIG_SUBST([OSSO_DESKTOPDIR], [--variable=desktopentrydir osso-af-settings])])
 AS_IF([test "x$glom_maemo_launcher" = xyes],
diff --git a/glom/main.cc b/glom/main.cc
index 98a6ad8..51614f1 100644
--- a/glom/main.cc
+++ b/glom/main.cc
@@ -48,7 +48,7 @@
 #include <glibmm/i18n.h>
 
 #ifdef GLOM_ENABLE_MAEMO
-#include <libossomm/init.h>
+#include <libosso.h>
 #include <hildonmm/init.h>
 #include <hildonmm/note.h>
 #include <hildonmm/program.h>
@@ -425,7 +425,7 @@ main(int argc, char* argv[])
   Glom::libglom_init();
    
 #ifdef GLOM_ENABLE_MAEMO
-  if(!(Osso::initialize("org.maemo.glom", PACKAGE_NAME)))
+  if(!(osso_initialize("org.maemo.glom", PACKAGE_NAME, FALSE /* obsolete */, 0)))
   {
     std::cerr << "Glom: Error while initializing libossomm" << std::endl;
     return 0;