[maemo-commits] [maemo-commits] r10257 - in projects/haf/trunk/hildon-home-webshortcut: . debian plugin

[From: subversion at stage.maemo.org]

Author: jobi
Date: 2007-02-28 17:46:25 +0200 (Wed, 28 Feb 2007)
New Revision: 10257

Modified:
   projects/haf/trunk/hildon-home-webshortcut/ChangeLog
   projects/haf/trunk/hildon-home-webshortcut/configure.ac
   projects/haf/trunk/hildon-home-webshortcut/debian/changelog
   projects/haf/trunk/hildon-home-webshortcut/debian/control
   projects/haf/trunk/hildon-home-webshortcut/plugin/hildon-home-webshortcut.c
Log:

2007-02-28  Johan Bilien  <johan.bilien at nokia.com>

	* ported from libossomime to libhildonmime
	* configure.ac: 3.0.3



Modified: projects/haf/trunk/hildon-home-webshortcut/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-home-webshortcut/ChangeLog	2007-02-28 14:12:05 UTC (rev 10256)
+++ projects/haf/trunk/hildon-home-webshortcut/ChangeLog	2007-02-28 15:46:25 UTC (rev 10257)
@@ -1,3 +1,8 @@
+2007-02-28  Johan Bilien  <johan.bilien at nokia.com>
+
+	* ported from libossomime to libhildonmime
+	* configure.ac: 3.0.3
+
 2007-02-20  Johan Bilien  <johan.bilien at nokia.com>
 
 	* configure.ac: 3.0.2

Modified: projects/haf/trunk/hildon-home-webshortcut/configure.ac
===================================================================
--- projects/haf/trunk/hildon-home-webshortcut/configure.ac	2007-02-28 14:12:05 UTC (rev 10256)
+++ projects/haf/trunk/hildon-home-webshortcut/configure.ac	2007-02-28 15:46:25 UTC (rev 10257)
@@ -1,6 +1,6 @@
 AC_INIT(Makefile.am)
 
-AM_INIT_AUTOMAKE(hildon-home-webshortcut, 3.0.2)
+AM_INIT_AUTOMAKE(hildon-home-webshortcut, 3.0.3)
 AM_CONFIG_HEADER(config.h)
 
 AC_ARG_ENABLE(debug, [AC_HELP_STRING([--enable-debug],[Debug (default=no)])],
@@ -29,7 +29,7 @@
 
 AC_SUBST(CFLAGS)
 
-PKG_CHECK_MODULES(OSSOMIME,libossomime)
+PKG_CHECK_MODULES(OSSOMIME,libhildonmime)
 AC_SUBST(OSSOMIME_LIBS)
 AC_SUBST(OSSOMIME_CFLAGS)
 

Modified: projects/haf/trunk/hildon-home-webshortcut/debian/changelog
===================================================================
--- projects/haf/trunk/hildon-home-webshortcut/debian/changelog	2007-02-28 14:12:05 UTC (rev 10256)
+++ projects/haf/trunk/hildon-home-webshortcut/debian/changelog	2007-02-28 15:46:25 UTC (rev 10257)
@@ -1,3 +1,11 @@
+hildon-home-webshortcut (3.0.3-1) unstable; urgency=low
+
+  * moved build-dep from libossomime-dev to libhildonmime-dev
+
+  * ported from libossomime to libhildonmime
+
+ -- Johan Bilien <johan.bilien at nokia.com>  Wed, 28 Feb 2007 17:44:34 +0200
+
 hildon-home-webshortcut (3.0.2-1) unstable; urgency=low
 
   * changed build-dep to libhildon1-dev and libhildonfm2-dev

Modified: projects/haf/trunk/hildon-home-webshortcut/debian/control
===================================================================
--- projects/haf/trunk/hildon-home-webshortcut/debian/control	2007-02-28 14:12:05 UTC (rev 10256)
+++ projects/haf/trunk/hildon-home-webshortcut/debian/control	2007-02-28 15:46:25 UTC (rev 10257)
@@ -2,7 +2,7 @@
 Section: x11
 Priority: optional
 Maintainer: Johan Bilien <johan.bilien at nokia.com>
-Build-Depends: debhelper (>= 4.0.0), pkg-config, libhildon1-dev, libosso-dev (>= 0.9.18), osso-af-settings, osso-ic-dev, libhildonfm2-dev, libossomime-dev, libhildondesktop-dev
+Build-Depends: debhelper (>= 4.0.0), pkg-config, libhildon1-dev, libosso-dev (>= 0.9.18), osso-af-settings, osso-ic-dev, libhildonfm2-dev, libhildonmime-dev, libhildondesktop-dev
 Standards-Version: 3.6.0
 
 Package: hildon-home-webshortcut

Modified: projects/haf/trunk/hildon-home-webshortcut/plugin/hildon-home-webshortcut.c
===================================================================
--- projects/haf/trunk/hildon-home-webshortcut/plugin/hildon-home-webshortcut.c	2007-02-28 14:12:05 UTC (rev 10256)
+++ projects/haf/trunk/hildon-home-webshortcut/plugin/hildon-home-webshortcut.c	2007-02-28 15:46:25 UTC (rev 10257)
@@ -40,7 +40,7 @@
 
 #include <osso-ic.h>
 #include <libosso.h>
-#include <osso-uri.h>
+#include <hildon-uri.h>
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
@@ -490,7 +490,7 @@
   if (!priv->uri)
     return;
 
-  if (!osso_uri_open (priv->uri, NULL /* default action */, &error ))
+  if (!hildon_uri_open (priv->uri, NULL /* default action */, &error ))
     {
       g_warning ("Could not launch URI %s: %s", priv->uri, error->message);
       g_error_free (error);