[Pkg-maemo-commits] r251 ./libosso/debian: * Merged with trunk branch.

[Jonny Lamb]

------------------------------------------------------------
revno: 251
committer: Jonny Lamb <jonnylamb at jonnylamb.com>
branch nick: libosso
timestamp: Thu 2007-12-27 09:23:16 +0000
message:
  * Merged with trunk branch.
modified:
  debian/changelog
  src/libosso.h
    ------------------------------------------------------------
    revno: 217.1.32
    committer: kihamala
    timestamp: Fri 2007-10-26 06:35:45 +0000
    message:
      gtk_infoprint -> HildonBanner
    modified:
      debian/changelog
      src/libosso.h
    ------------------------------------------------------------
    revno: 217.1.33
    committer: kihamala
    timestamp: Fri 2007-11-30 08:37:03 +0000
    message:
      added mention about non-com.nokia names
    modified:
      debian/changelog
      src/libosso.h
-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2007-07-23 13:54:31 +0000
+++ b/debian/changelog	2007-12-27 09:23:16 +0000
@@ -1,4 +1,4 @@
-libosso (2.14-1.debian-1) UNRELEASED; urgency=low
+libosso (2.15-1.debian-1) UNRELEASED; urgency=low
 
   [ Loic Minier ]
   * Set Maintainer to Debian Maemo Maintainers.
@@ -27,8 +27,17 @@
   [ Jonny Lamb ]
   * Merge r235..248 from trunk.
   * Add myself to Uploaders.
-
- -- Jonny Lamb <jonnylamb at jonnylamb.com>  Mon, 23 Jul 2007 14:54:16 +0100
+  * Merged with trunk branch.
+
+ -- Jonny Lamb <jonnylamb at jonnylamb.com>  Thu, 27 Dec 2007 09:22:46 +0000
+
+libosso (2.15-1~unreleased) unstable; urgency=low
+
+  * Removed reference to gtk_infoprint. Fixes: MB#1779
+  * Added mention about using non-com.nokia application names to
+    osso_initialize documentation.
+
+ -- Kimmo H?m?l?inen <kimmo.hamalainen at nokia.com>  Fri, 30 Nov 2007 12:18:43 +0200
 
 libosso (2.14-1) unstable; urgency=low
 

=== modified file 'src/libosso.h'
--- a/src/libosso.h	2007-04-12 12:26:22 +0000
+++ b/src/libosso.h	2007-11-30 08:37:03 +0000
@@ -73,7 +73,8 @@
  * 'com.nokia.application', where 'application' is the value you gave as the
  * parameter. Note also that this argument must be identical to the
  * X-Osso-Service value in the desktop file, or the D-BUS daemon will kill
- * your application.
+ * your application. If you do not want to use the default 'com.nokia' prefix,
+ * you must pass the whole D-Bus service name, e.g. 'org.maemo.my_app'.
  * The only valid characters that the name may contain are letters a-z and
  * the underscore '_'.
  * @param version The version string of the application. It must be 
@@ -948,7 +949,7 @@
  * information banner).
  * This allows non-GUI applications to display some information to the user.
  * Applications that do have a GUI should not use this function, but the
- * gtk_infoprint widget directly.
+ * HildonBanner widget directly.
  * @param osso The library context as returned by #osso_initialize.
  * @param text The text to display on the infoprint.
  * @param retval This parameter will be used to store a possible return