[maemo-commits] [maemo-commits] r10574 - in projects/haf/branches/hildon-control-panel/refactoring: . debian src

Wed Mar 14 12:44:49 EET 2007

Author: lucasr
Date: 2007-03-14 12:44:48 +0200 (Wed, 14 Mar 2007)
New Revision: 10574

Modified:
   projects/haf/branches/hildon-control-panel/refactoring/ChangeLog
   projects/haf/branches/hildon-control-panel/refactoring/configure.ac
   projects/haf/branches/hildon-control-panel/refactoring/debian/control
   projects/haf/branches/hildon-control-panel/refactoring/src/Makefile.am
   projects/haf/branches/hildon-control-panel/refactoring/src/hcp-rfs.c
   projects/haf/branches/hildon-control-panel/refactoring/src/hcp-window.c
Log:
2007-03-14  Lucas Rocha  <lucas.rocha at nokia.com>

	* debian/control, configure.ac, rc/hcp-rfs.c, src/hcp-window.c,
	src/Makefile.am: move from libosso-help to hildon-help.  


Modified: projects/haf/branches/hildon-control-panel/refactoring/ChangeLog
===================================================================

--- projects/haf/branches/hildon-control-panel/refactoring/ChangeLog	2007-03-14 08:38:21 UTC (rev 10573)
+++ projects/haf/branches/hildon-control-panel/refactoring/ChangeLog	2007-03-14 10:44:48 UTC (rev 10574)
@@ -1,3 +1,8 @@
+2007-03-14  Lucas Rocha  <lucas.rocha at nokia.com>
+
+	* debian/control, configure.ac, rc/hcp-rfs.c, src/hcp-window.c,
+	src/Makefile.am: move from libosso-help to hildon-help.  
+
 2007-03-09  Lucas Rocha  <lucas.rocha at nokia.com>
 
 	* configure.ac: Reverted to 1.9.0 for consistency with the rest

Modified: projects/haf/branches/hildon-control-panel/refactoring/configure.ac
===================================================================
--- projects/haf/branches/hildon-control-panel/refactoring/configure.ac	2007-03-14 08:38:21 UTC (rev 10573)
+++ projects/haf/branches/hildon-control-panel/refactoring/configure.ac	2007-03-14 10:44:48 UTC (rev 10574)
@@ -43,17 +43,17 @@
 AC_SUBST(OSSO_LIBS)
 AC_SUBST(OSSO_CFLAGS)
 
-PKG_CHECK_MODULES(HILDON, hildon-1 >= 1.0.0)
+PKG_CHECK_MODULES(HILDON, hildon-1)
 AC_SUBST(HILDON_LIBS)
 AC_SUBST(HILDON_CFLAGS)
 
 PKG_CHECK_MODULES(GNOME_VFS, gnome-vfs-2.0 >= 2.8.3)
+AC_SUBST(GNOME_VFS_LIBS)
 AC_SUBST(GNOME_VFS_CFLAGS)
-AC_SUBST(GNOME_VFS_LIBS)
 
-PKG_CHECK_MODULES(LIBOSSOHELP, libossohelp >= 0.0.4)
-AC_SUBST(LIBOSSOHELP)
-AC_SUBST(LIBOSSOHELP_CFLAGS)
+PKG_CHECK_MODULES(HILDON_HELP, hildon-help)
+AC_SUBST(HILDON_HELP_LIBS)
+AC_SUBST(HILDON_HELP_CFLAGS)
 
 PKG_CHECK_MODULES(GCONF, gconf-2.0 >= 2.6.2)
 AC_SUBST(GCONF_LIBS)

Modified: projects/haf/branches/hildon-control-panel/refactoring/debian/control
===================================================================
--- projects/haf/branches/hildon-control-panel/refactoring/debian/control	2007-03-14 08:38:21 UTC (rev 10573)
+++ projects/haf/branches/hildon-control-panel/refactoring/debian/control	2007-03-14 10:44:48 UTC (rev 10574)
@@ -2,7 +2,7 @@
 Section: x11
 Priority: optional
 Maintainer: Lucas Rocha <lucas.rocha at nokia.com>
-Build-Depends: debhelper (>= 4.0.0), libosso-gnomevfs2-dev, libhildon1-dev (>= 0.9.9), pkg-config, libosso-dev (>= 1.5), osso-af-settings, libosso-help-dev
+Build-Depends: debhelper (>= 4.0.0), libosso-gnomevfs2-dev, libhildon1-dev (>= 0.9.9), pkg-config, libosso-dev (>= 1.5), osso-af-settings, libhildonhelp-dev 
 Standards-Version: 3.6.0
 
 Package: hildon-control-panel

Modified: projects/haf/branches/hildon-control-panel/refactoring/src/Makefile.am
===================================================================
--- projects/haf/branches/hildon-control-panel/refactoring/src/Makefile.am	2007-03-14 08:38:21 UTC (rev 10573)
+++ projects/haf/branches/hildon-control-panel/refactoring/src/Makefile.am	2007-03-14 10:44:48 UTC (rev 10574)
@@ -23,7 +23,7 @@
 	$(HILDON_CFLAGS) \
 	$(MAEMO_LAUNCHER_CFLAGS) \
 	$(OSSO_CFLAGS)\
-	$(LIBOSSOHELP_CFLAGS) \
+	$(HILDON_HELP_CFLAGS) \
 	$(GCONF_CFLAGS) \
 	$(GNOME_VFS_CFLAGS) \
 	-DLOCALEDIR=\"$(localedir)\" \
@@ -68,7 +68,7 @@
 controlpanel_LDADD = \
 	$(HILDON_LIBS) \
 	$(OSSO_LIBS) \
-	$(LIBOSSOHELP_LIBS) \
+	$(HILDON_HELP_LIBS) \
 	$(GCONF_LIBS) \
 	$(GNOME_VFS_LIBS)
 

Modified: projects/haf/branches/hildon-control-panel/refactoring/src/hcp-rfs.c
===================================================================
--- projects/haf/branches/hildon-control-panel/refactoring/src/hcp-rfs.c	2007-03-14 08:38:21 UTC (rev 10573)
+++ projects/haf/branches/hildon-control-panel/refactoring/src/hcp-rfs.c	2007-03-14 10:44:48 UTC (rev 10574)
@@ -26,7 +26,7 @@
 
 #include <hildon/hildon-code-dialog.h>
 #include <hildon/hildon-banner.h>
-#include <osso-helplib.h>
+#include <hildon/hildon-help.h>
 #include <libosso.h>
 
 #include <glib/gi18n.h>
@@ -73,9 +73,9 @@
   gtk_window_set_position (GTK_WINDOW (confirm_dialog),
                            GTK_WIN_POS_NONE);
 
-  ossohelp_dialog_help_enable  (GTK_DIALOG (confirm_dialog),
-                                help_topic,
-                                program->osso);
+  hildon_help_dialog_help_enable (GTK_DIALOG (confirm_dialog),
+                                  help_topic,
+                                  program->osso);
 
   gtk_dialog_set_has_separator (GTK_DIALOG (confirm_dialog), FALSE);
 
@@ -190,9 +190,9 @@
 
   dialog = hildon_code_dialog_new ();
   
-  ossohelp_dialog_help_enable (GTK_DIALOG (dialog),
-                               HCP_CODE_DIALOG_HELP_TOPIC,
-                               program->osso);
+  hildon_help_dialog_help_enable (GTK_DIALOG (dialog),
+                                  HCP_CODE_DIALOG_HELP_TOPIC,
+                                  program->osso);
 
   gtk_widget_show_all (dialog);
 

Modified: projects/haf/branches/hildon-control-panel/refactoring/src/hcp-window.c
===================================================================
--- projects/haf/branches/hildon-control-panel/refactoring/src/hcp-window.c	2007-03-14 08:38:21 UTC (rev 10573)
+++ projects/haf/branches/hildon-control-panel/refactoring/src/hcp-window.c	2007-03-14 10:44:48 UTC (rev 10574)
@@ -23,7 +23,7 @@
  */
 
 #include <libosso.h>
-#include <osso-helplib.h>
+#include <hildon/hildon-help.h>
 #include <hildon/hildon-window.h>
 #include <hildon/hildon-program.h>
 
@@ -454,8 +454,8 @@
   HCPProgram *program = hcp_program_get_instance (); 
   osso_return_t help_ret;
   
-  help_ret = ossohelp_show (program->osso, 
-                            HCP_OSSO_HELP_ID, 0);
+  help_ret = hildon_help_show (program->osso, 
+                               HCP_OSSO_HELP_ID, 0);
 
   switch (help_ret)
   {


