[SCM] libgnokii and core programs branch, master, updated. rel_0_6_29-367-gc8b0f95

[Daniele Forsi]

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  c8b0f9552c5988dc113c01651b6d1169c8bd9bef (commit)
      from  ed119035e2fd9ce7f0959de9899e1021fc52374e (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=c8b0f9552c5988dc113c01651b6d1169c8bd9bef


commit c8b0f9552c5988dc113c01651b6d1169c8bd9bef
Author: Daniele Forsi <address@hidden>
Date:   Sun Mar 4 19:13:02 2012 +0100

    Do not overwrite subentries_count and other data set in 
OkEditNumbersDialog()
    
    Fixes bug that caused to forget subentries after the first one when editing
    the phonebook.
    Reported in:
    http://lists.nongnu.org/archive/html/gnokii-users/2012-02/msg00009.html

diff --git a/ChangeLog b/ChangeLog
index d81bdb9..014576a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -33,6 +33,9 @@
  * nk6510 driver updates
     o store also the seconds in date fields when reading phonebook
       entries from phone                            (Daniele Forsi)
+ * xgnokii updates
+    o fix bug that caused to forget subentries after the first one
+      when editing the phonebook
 
 0.6.31
 ======
diff --git a/xgnokii/ChangeLog b/xgnokii/ChangeLog
index 9d0f90f..68b3b0b 100644
--- a/xgnokii/ChangeLog
+++ b/xgnokii/ChangeLog
@@ -1,3 +1,7 @@
+* Sun 04 Mar 2012
+- Fix bug that caused to forget subentries after the first one when editing the
+  phonebook.
+
 * Sat 18 Jun 2011 Daniele Forsi
 - Set "phone" as default window icon
 
diff --git a/xgnokii/xgnokii_contacts.c b/xgnokii/xgnokii_contacts.c
index 0bd82cc..06a0328 100644
--- a/xgnokii/xgnokii_contacts.c
+++ b/xgnokii/xgnokii_contacts.c
@@ -341,7 +341,6 @@ static PhonebookEntry *ChangeEntryMemoryType(PhonebookEntry 
*oldPbEntry)
 
 
 static PhonebookEntry *EditPhonebookEntry(EditEntryData *data) {
-       gchar **number;
        PhonebookEntry *current_entry = data->pbEntry;
        gn_memory_type chosen_memory_type;
        gint max_name_length, max_number_length;
@@ -393,16 +392,7 @@ static PhonebookEntry *EditPhonebookEntry(EditEntryData 
*data) {
        snprintf(current_entry->entry.name, max_name_length, "%s",
                         gtk_entry_get_text(GTK_ENTRY(data->name)));
 
-       if (phoneMonitor.supported & PM_EXTPBK) {
-               number = g_malloc(sizeof(char) * max_number_length);
-               gtk_label_get(GTK_LABEL(data->number), number);
-               snprintf(current_entry->entry.number, max_number_length, "%s", 
number[0]);
-               snprintf(current_entry->entry.subentries[0].data.number, 
max_number_length, "%s", number[0]);
-               current_entry->entry.subentries[0].entry_type = 
GN_PHONEBOOK_ENTRY_Number;
-               current_entry->entry.subentries[0].number_type = 
GN_PHONEBOOK_NUMBER_General;
-               current_entry->entry.subentries_count = 1;
-               g_free(number);
-       } else {
+       if (!(phoneMonitor.supported & PM_EXTPBK)) {
                snprintf(current_entry->entry.number, max_number_length, "%s",
                         gtk_entry_get_text(GTK_ENTRY(data->number)));
        }

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

Summary of changes:
 ChangeLog                  |    3 +++
 xgnokii/ChangeLog          |    4 ++++
 xgnokii/xgnokii_contacts.c |   12 +-----------
 3 files changed, 8 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
libgnokii and core programs