[SCM] libgnokii and core programs branch, master, updated. rel_0_6_29-58-gbcc0a3f

[Jan Derfinak]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "libgnokii and core programs".

The branch, master has been updated
       via  bcc0a3f51e07f9f1625439d2907ee942842979fd (commit)
      from  9107b1a47b029c3c8cb0454acd31b9e2f843fbe1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/gnokii.git/commit/?id=bcc0a3f51e07f9f1625439d2907ee942842979fd


commit bcc0a3f51e07f9f1625439d2907ee942842979fd
Author: Jan Derfinak <address@hidden>
Date:   Sun Sep 26 10:41:06 2010 +0200

    On 64Bit Machines, while reading contacts from a mobile,
    'pbEntry->entry.caller_group' sometimes contains a large nubmer,
    seems to be unsigned -1, which causes the SEGFAULT

diff --git a/xgnokii/ChangeLog b/xgnokii/ChangeLog
index 4e42746..41009e9 100644
--- a/xgnokii/ChangeLog
+++ b/xgnokii/ChangeLog
@@ -1,3 +1,8 @@
+* Sun 26 Sep 2010 Matthias Mucks
+- On 64Bit Machines, while reading contacts from a mobile,
+  'pbEntry->entry.caller_group' sometimes contains a large nubmer,
+  seems to be unsigned -1, which causes the SEGFAULT
+
 * Sun 15 Aug 2010 Daniele Forsi
 - Replace dprintf() with gn_log_xdebug()
 
@@ -86,7 +91,7 @@
 - Deleting calendar notes work.
 - Initialization timeout shorted from 15 secs to 10 secs.
 
-* Sun Jun 18 03:18:27 CEST 2000 Jan Derfinak <address@hidden
+* Sun Jun 18 03:18:27 CEST 2000 Jan Derfinak
 - Saving SMS's to mailbox. Original idea from Petri Lahti <address@hidden>
 - User configurable maximum length of names in contacts on SIM and phone.
 
diff --git a/xgnokii/xgnokii_contacts.c b/xgnokii/xgnokii_contacts.c
index bcd8c2c..0c850fe 100644
--- a/xgnokii/xgnokii_contacts.c
+++ b/xgnokii/xgnokii_contacts.c
@@ -2257,7 +2257,7 @@ void GUI_RefreshContacts(void)
                                row[2] = "P";
                        else
                                row[2] = "S";
-                       if (phoneMonitor.supported & PM_CALLERGROUP)
+                       if (phoneMonitor.supported & PM_CALLERGROUP & 
(int)pbEntry->entry.caller_group >= 0 )
                                row[3] = 
xgnokiiConfig.callerGroups[pbEntry->entry.caller_group];
                        else
                                row[3] = "";

-----------------------------------------------------------------------

Summary of changes:
 xgnokii/ChangeLog          |    7 ++++++-
 xgnokii/xgnokii_contacts.c |    2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
libgnokii and core programs