[glom/glom-1-16] Use libosso instead of libossomm on Maemo

[David King <davidk src gnome org>]

commit 933c4fe6351262c028e389b4c82fc7915864070f
Author: Murray Cumming <murrayc murrayc com>
Date:   Fri Sep 10 10:43:53 2010 +0200

    Use libosso instead of libossomm on Maemo
    
    * configure.ac:
    * glom/main.cc: Use libosso instead of libossomm, because we just use
    one function.

 ChangeLog    |    8 ++++++++
 configure.ac |    2 +-
 glom/main.cc |    4 ++--
 3 files changed, 11 insertions(+), 3 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index e8df3a5..aae9136 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-09-10  Murray Cumming  <murrayc murrayc com>
+
+	Use libosso instead of libossomm on Maemo
+
+	* configure.ac:
+	* glom/main.cc: Use libosso instead of libossomm, because we just use
+	one function.
+
 2010-08-31  Murray Cumming  <murrayc murrayc com>
 
 	Avoid use of deprecated gdkmm API.
diff --git a/configure.ac b/configure.ac
index 6645141..79029d7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -165,7 +165,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 03997b7..8806c27 100644
--- a/glom/main.cc
+++ b/glom/main.cc
@@ -51,7 +51,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>
@@ -451,7 +451,7 @@ main(int argc, char* argv[])
   Glom::libglom_init(); //Also initializes python.
 
 #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;