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

[From: subversion at stage.maemo.org]

Author: jobi
Date: 2007-02-20 16:01:35 +0200 (Tue, 20 Feb 2007)
New Revision: 10050

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

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

	Ported to libhildon-1 and hildon-fm-2
	* plugin/hildon-home-webshortcut.c: changed includes
	* configure.ac: Check for libhildon-1 and hildon-fm-2



Modified: projects/haf/trunk/hildon-home-webshortcut/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-home-webshortcut/ChangeLog	2007-02-20 13:49:23 UTC (rev 10049)
+++ projects/haf/trunk/hildon-home-webshortcut/ChangeLog	2007-02-20 14:01:35 UTC (rev 10050)
@@ -1,5 +1,11 @@
 2007-02-01  Johan Bilien  <johan.bilien at nokia.com>
 
+	Ported to libhildon-1 and hildon-fm-2
+	* plugin/hildon-home-webshortcut.c: changed includes
+	* configure.ac: Check for libhildon-1 and hildon-fm-2
+
+2007-02-01  Johan Bilien  <johan.bilien at nokia.com>
+
 	* plugin/hildon-home-webshortcut.c: Do not include
 	hildon-home-plugin.h which is gone
 

Modified: projects/haf/trunk/hildon-home-webshortcut/configure.ac
===================================================================
--- projects/haf/trunk/hildon-home-webshortcut/configure.ac	2007-02-20 13:49:23 UTC (rev 10049)
+++ projects/haf/trunk/hildon-home-webshortcut/configure.ac	2007-02-20 14:01:35 UTC (rev 10050)
@@ -37,11 +37,11 @@
 AC_SUBST(OSSO_LIBS)
 AC_SUBST(OSSO_CFLAGS)
 
-PKG_CHECK_MODULES(HILDON_FM, hildon-fm >= 0.15)
+PKG_CHECK_MODULES(HILDON_FM, hildon-fm-2)
 AC_SUBST(HILDON_FM_LIBS)
 AC_SUBST(HILDON_FM_CFLAGS)
 
-PKG_CHECK_MODULES(HILDON, hildon-libs >= 0.7.1)
+PKG_CHECK_MODULES(HILDON, hildon-1)
 AC_SUBST(HILDON_LIBS)
 AC_SUBST(HILDON_CFLAGS)
 

Modified: projects/haf/trunk/hildon-home-webshortcut/debian/control
===================================================================
--- projects/haf/trunk/hildon-home-webshortcut/debian/control	2007-02-20 13:49:23 UTC (rev 10049)
+++ projects/haf/trunk/hildon-home-webshortcut/debian/control	2007-02-20 14:01:35 UTC (rev 10050)
@@ -2,7 +2,7 @@
 Section: x11
 Priority: optional
 Maintainer: Johan Bilien <johan.bilien at nokia.com>
-Build-Depends: debhelper (>= 4.0.0), pkg-config, hildon-libs-dev (>= 0.7.1), libosso-dev (>= 0.9.18), osso-af-settings, osso-ic-dev, hildon-fm-dev (>= 0.15), 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, libossomime-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-20 13:49:23 UTC (rev 10049)
+++ projects/haf/trunk/hildon-home-webshortcut/plugin/hildon-home-webshortcut.c	2007-02-20 14:01:35 UTC (rev 10050)
@@ -37,15 +37,11 @@
 #include <gtk/gtklabel.h>
 #include <gtk/gtkhbox.h>
 #include <gtk/gtkmenuitem.h>
-#include <hildon-widgets/hildon-banner.h>
-#include <hildon-widgets/hildon-note.h>
 
-
 #include <osso-ic.h>
 #include <libosso.h>
 #include <osso-uri.h>
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -53,9 +49,11 @@
 #include <libgnomevfs/gnome-vfs.h>
 #include <gconf/gconf-client.h>
 
-#include "hildon-widgets/hildon-file-chooser-dialog.h"
-#include <hildon-widgets/hildon-caption.h>
-#include <hildon-widgets/hildon-defines.h>
+#include <hildon/hildon-file-chooser-dialog.h>
+#include <hildon/hildon-caption.h>
+#include <hildon/hildon-defines.h>
+#include <hildon/hildon-banner.h>
+#include <hildon/hildon-note.h>
 
 #define HHWS_GCONF_IAP          "/apps/osso/apps/hhws/iap"
 #define HHWS_GCONF_URI          "/apps/osso/apps/hhws/uri"