Branch update for mygnokii2002_03_17_19_29nl

[gnokii.git] / xgnokii / xgnokii_contacts.c

diff --git a/xgnokii/xgnokii_contacts.c b/xgnokii/xgnokii_contacts.c
index d7c5f78..39ef62b 100644 (file)
--- a/xgnokii/xgnokii_contacts.c
+++ b/xgnokii/xgnokii_contacts.c
@@ -251,7 +251,7 @@ static void OkEditEntryDialog (GtkWidget *widget, gpointer data)
             max_phonebook_name_length);
     entry->entry.Name[max_phonebook_name_length] = '\0';
 
-    if (GetModelFeature(FN_PHONEBOOK)==F_PBK71)
+    if (GetModelFeature(FN_PHONEBOOK)==F_PBK71INT)
     {
     }
     else
@@ -297,7 +297,7 @@ because you save it into SIM memory!"));
       gtk_widget_show (errorDialog.dialog);
     }
 
-    if (GetModelFeature(FN_PHONEBOOK)==F_PBK71)
+    if (GetModelFeature(FN_PHONEBOOK)==F_PBK71INT)
     {
     }
     else
@@ -331,7 +331,7 @@ because you save it into SIM memory!"));
               max_phonebook_name_length);
       ((EditEntryData*) data)->pbEntry->entry.Name[max_phonebook_name_length] = '\0';
 
-      if (GetModelFeature(FN_PHONEBOOK)==F_PBK71)
+      if (GetModelFeature(FN_PHONEBOOK)==F_PBK71INT)
       {
       }
       else
@@ -356,7 +356,7 @@ because you save it into SIM memory!"));
         gtk_widget_show (errorDialog.dialog);
       }
 
-      if (GetModelFeature(FN_PHONEBOOK)==F_PBK71)
+      if (GetModelFeature(FN_PHONEBOOK)==F_PBK71INT)
       {
       }
       else
@@ -473,7 +473,7 @@ static void OkNewEntryDialog(GtkWidget *widget, gpointer data )
             max_phonebook_name_length);
     entry->entry.Name[max_phonebook_name_length] = '\0';
 
-    if (GetModelFeature(FN_PHONEBOOK)==F_PBK71)
+    if (GetModelFeature(FN_PHONEBOOK)==F_PBK71INT)
     {
     }
     else
@@ -511,7 +511,7 @@ because you save it into SIM memory!"));
       gtk_widget_show (errorDialog.dialog);
     }
 
-    if (GetModelFeature(FN_PHONEBOOK)==F_PBK71)
+    if (GetModelFeature(FN_PHONEBOOK)==F_PBK71INT)
     {
     }
     else
@@ -537,7 +537,7 @@ because you save it into SIM memory!"));
               max_phonebook_name_length);
       ((EditEntryData*) data)->pbEntry->entry.Name[max_phonebook_name_length] = '\0';
 
-      if (GetModelFeature(FN_PHONEBOOK)==F_PBK71)
+      if (GetModelFeature(FN_PHONEBOOK)==F_PBK71INT)
       {
       }
       else
@@ -562,7 +562,7 @@ because you save it into SIM memory!"));
         gtk_widget_show (errorDialog.dialog);
       }
 
-      if (GetModelFeature(FN_PHONEBOOK)==F_PBK71)
+      if (GetModelFeature(FN_PHONEBOOK)==F_PBK71INT)
       {
       }
       else
@@ -1077,7 +1077,7 @@ static void CreateEditDialog (EditEntryData *editEntryData, gchar *title,
   gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 2);
   gtk_widget_show (label);
 
-  if (GetModelFeature(FN_PHONEBOOK)==F_PBK71)
+  if (GetModelFeature(FN_PHONEBOOK)==F_PBK71INT)
   {
     button = gtk_button_new ();
     editEntryData->number = gtk_label_new ("");
@@ -1097,7 +1097,7 @@ static void CreateEditDialog (EditEntryData *editEntryData, gchar *title,
     gtk_widget_show (editEntryData->number);
   }
 
-/*  if (GetModelFeature(FN_PHONEBOOK)==F_PBK71) {
+/*  if (GetModelFeature(FN_PHONEBOOK)==F_PBK71INT) {
 
     hbox = gtk_hbox_new (FALSE, 0);
     gtk_container_add (GTK_CONTAINER (GTK_DIALOG (editEntryData->dialog)->vbox), hbox);
@@ -1160,7 +1160,7 @@ static void EditPbEntry(PhonebookEntry *pbEntry, gint row)
 
   gtk_entry_set_text (GTK_ENTRY (editEditEntryData.name), pbEntry->entry.Name);
 
-  if (GetModelFeature(FN_PHONEBOOK)==F_PBK71)
+  if (GetModelFeature(FN_PHONEBOOK)==F_PBK71INT)
     gtk_label_set_text (GTK_LABEL (editEditEntryData.number), pbEntry->entry.Number);
   else
     gtk_entry_set_text (GTK_ENTRY (editEditEntryData.number), pbEntry->entry.Number);
@@ -1253,7 +1253,7 @@ void NewPbEntry(PhonebookEntry *pbEntry)
 
   gtk_entry_set_text (GTK_ENTRY (newEditEntryData.name), "");
   
-  if (GetModelFeature(FN_PHONEBOOK)==F_PBK71)
+  if (GetModelFeature(FN_PHONEBOOK)==F_PBK71INT)
     gtk_label_set_text (GTK_LABEL (newEditEntryData.number), "");
   else
     gtk_entry_set_text (GTK_ENTRY (newEditEntryData.number), "");
@@ -1297,7 +1297,7 @@ void DuplicatePbEntry (PhonebookEntry *pbEntry)
 
   gtk_entry_set_text (GTK_ENTRY (duplicateEditEntryData.name), pbEntry->entry.Name);
 
-  if (GetModelFeature(FN_PHONEBOOK)==F_PBK71)
+  if (GetModelFeature(FN_PHONEBOOK)==F_PBK71INT)
     gtk_label_set_text (GTK_LABEL (duplicateEditEntryData.number), pbEntry->entry.Number);
   else
     gtk_entry_set_text (GTK_ENTRY (duplicateEditEntryData.number), pbEntry->entry.Number);
@@ -2361,7 +2361,7 @@ static void ExportVCARD (FILE *f)
     fprintf (f, "X_GSM_CALLERGROUP:%d\n", pbEntry->entry.Group);
 
     /* Add ext. pbk info if required */
-    if (GetModelFeature(FN_PHONEBOOK)==F_PBK71)
+    if (GetModelFeature(FN_PHONEBOOK)==F_PBK71INT)
       for (j = 0; j < pbEntry->entry.SubEntriesCount; j++)
       {
        if (pbEntry->entry.SubEntries[j].EntryType == GSM_Number)
@@ -2420,7 +2420,7 @@ static void ExportNative (FILE *f)
       strcat (buf, buf2);
 
       /* Add ext. pbk info if required */
-      if (GetModelFeature(FN_PHONEBOOK)==F_PBK71)
+      if (GetModelFeature(FN_PHONEBOOK)==F_PBK71INT)
       {
         for (j = 0; j < pbEntry->entry.SubEntriesCount; j++)
           if (pbEntry->entry.SubEntries[j].EntryType==GSM_Number)