[pkg-fso-commits] [SCM] libframeworkd-phonegui branch, upstream, updated. 640da47bfcff755388d0fb8f443eb34e0dea3c72

[quickdev]

The following commit has been merged in the upstream branch:
commit 83b4f24100f11760c6be36cdacc224fb211b8e9e
Author: quickdev <niklas.coding at gmail.com>
Date:   Sun Dec 14 23:21:10 2008 +0100

    As of now, it's possible to use PINs with a length different from 4.

diff --git a/libframeworkd-phonegui-efl/data/sim-auth.edc b/libframeworkd-phonegui-efl/data/sim-auth.edc
index 1cf9738..e82b443 100644
--- a/libframeworkd-phonegui-efl/data/sim-auth.edc
+++ b/libframeworkd-phonegui-efl/data/sim-auth.edc
@@ -197,7 +197,7 @@ collections {
                            offset, 0 0;
                     }
                     text {
-                           text, "PIN must be 4 chars long";
+                           text, "PIN must be 4-8 chars long";
                            font, "redensek";
                            size, 25;
                            align, 0.5 0.5;
diff --git a/libframeworkd-phonegui-efl/src/util/helper.c b/libframeworkd-phonegui-efl/src/util/helper.c
index 687af13..d86744f 100644
--- a/libframeworkd-phonegui-efl/src/util/helper.c
+++ b/libframeworkd-phonegui-efl/src/util/helper.c
@@ -51,7 +51,7 @@ gboolean string_is_number(const char *string) {
 }
 
 gboolean string_is_pin(const char *string) {
-    if(strlen(string) != 4)
+    if(strlen(string) < 4 || strlen(string) > 8)
         return FALSE;
 
     char *p = string;
diff --git a/libframeworkd-phonegui-efl/src/view/sim-auth-input-view.c b/libframeworkd-phonegui-efl/src/view/sim-auth-input-view.c
index 5470e3e..f67e167 100644
--- a/libframeworkd-phonegui-efl/src/view/sim-auth-input-view.c
+++ b/libframeworkd-phonegui-efl/src/view/sim-auth-input-view.c
@@ -10,12 +10,12 @@ struct SimAuthInputViewData {
     int mode;
 
     char stars[9];
-    char pin[5];
+    char pin[9];
     int  pin_length;
 
     char puk[9];
     int  puk_length;
-    char pin_confirm[5];
+    char pin_confirm[9];
     int  pin_confirm_length;
 
     Evas_Object *bt1, *bt2, *keypad;
@@ -214,7 +214,7 @@ void sim_auth_ok_clicked(struct SimAuthInputViewData *data, Evas_Object *obj, vo
     } else if(data->mode == MODE_PUK_NEW_PIN_CONFIRM) {
         g_debug("See if NEW PINs are identical");
         if(!string_is_pin(data->pin)) {
-            g_debug("NEW PIN must be 4 chars long and consist of digits");
+            g_debug("NEW PIN must be 4-8 chars long and consist of digits");
             data->mode = MODE_PUK;
             window_frame_show(data->win, data, frame_pin_invalid_length_show, NULL);
             ecore_timer_add(2, reset_callback, data);     
@@ -252,12 +252,7 @@ void sim_auth_keypad_clicked(struct SimAuthInputViewData *data, Evas_Object *obj
         length = &(data->pin_confirm_length);
     }
 
-    if(
-        (data->mode == MODE_PIN && *length < 4) ||
-        (data->mode == MODE_PUK_NEW_PIN && *length < 4) ||
-        (data->mode == MODE_PUK_NEW_PIN_CONFIRM && *length < 4) ||
-        (data->mode == MODE_PUK && *length < 8)
-    ) {
+    if(*length < 8) {
         strncat(string, &input, 1);
         (*length)++;
         sim_auth_update(data);

-- 
libframeworkd-phonegui