[maemo-commits] [maemo-commits] r17383 - in projects/haf/trunk/hildon-control-panel: . src

[From: subversion at stage.maemo.org]

Author: paradi
Date: 2009-02-10 13:20:40 +0200 (Tue, 10 Feb 2009)
New Revision: 17383

Modified:
   projects/haf/trunk/hildon-control-panel/ChangeLog
   projects/haf/trunk/hildon-control-panel/configure.ac
   projects/haf/trunk/hildon-control-panel/src/hcp-rfs.c
Log:
* configure.ac:
  Corrected version number of libcodelockui.

* src/hpc-rfs.c:
  Made lock code failure banner system modal.
  Updated localization domain for incorrect code message.
  Fixes: NB#98945



Modified: projects/haf/trunk/hildon-control-panel/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-control-panel/ChangeLog	2009-02-10 08:05:26 UTC (rev 17382)
+++ projects/haf/trunk/hildon-control-panel/ChangeLog	2009-02-10 11:20:40 UTC (rev 17383)
@@ -1,3 +1,13 @@
+2009-02-10  Peter Aradi <peter.aradi at blumsoft.eu>
+
+	* configure.ac:
+	Corrected version number of libcodelockui.
+
+	* src/hpc-rfs.c:
+	Made lock code failure banner system modal.
+	Updated localization domain for incorrect code message.
+	Fixes: NB#98945
+	
 2009-01-21 Peter Aradi <peter.aradi at blumsoft.eu>
 
 	* data/hildon-control-panel.desktop.in:
@@ -2,2 +12,3 @@
 	Updated icon name, localization domain, Category and position in .desktop file
+	Fixes: NB#100776
 

Modified: projects/haf/trunk/hildon-control-panel/configure.ac
===================================================================
--- projects/haf/trunk/hildon-control-panel/configure.ac	2009-02-10 08:05:26 UTC (rev 17382)
+++ projects/haf/trunk/hildon-control-panel/configure.ac	2009-02-10 11:20:40 UTC (rev 17383)
@@ -66,7 +66,7 @@
 	gnome-vfs-2.0 >= 2.8.3
 	hildon-help
 	gconf-2.0 >= 2.6.2
-	codelockui >= 1.5.6
+	codelockui >= 1:1.5.6
 	])
 
 hildoncpdesktopentrydir=${datadir}/applications/hildon-control-panel

Modified: projects/haf/trunk/hildon-control-panel/src/hcp-rfs.c
===================================================================
--- projects/haf/trunk/hildon-control-panel/src/hcp-rfs.c	2009-02-10 08:05:26 UTC (rev 17382)
+++ projects/haf/trunk/hildon-control-panel/src/hcp-rfs.c	2009-02-10 11:20:40 UTC (rev 17383)
@@ -29,9 +29,9 @@
 #include <strings.h>
 
 #include <hildon/hildon-code-dialog.h>
-#include <hildon/hildon-banner.h>
 #include <hildon/hildon-help.h>
 #include <hildon/hildon-note.h>
+#include <hildon/hildon-banner.h>
 #include <codelockui.h>
 #include <libosso.h>
 
@@ -44,7 +44,7 @@
 
 #define HCP_RFS_INFOBANNER_OK      _("rfs_bd_ok")
 #define HCP_RFS_INFOBANNER_CANCEL  _("rfs_bd_cancel")
-#define HCP_RFS_IB_WRONG_LOCKCODE  dgettext("hildon-libs", "secu_info_incorrectcode")
+#define HCP_RFS_IB_WRONG_LOCKCODE  dgettext("osso-system-lock", "secu_info_incorrectcode")
 
 #define HCP_RFC_WARNING_DIALOG_WIDTH 450
 
@@ -126,7 +126,8 @@
 
     if (!password_correct)
     {
-      hildon_banner_show_information (dialog,
+	   
+      hildon_banner_show_information (NULL,
                                       NULL,
                                       HCP_RFS_IB_WRONG_LOCKCODE);