some minor fixes

[lcr.git] / port.cpp

diff --git a/port.cpp b/port.cpp
index a44cebe..95ed3d5 100644 (file)
--- a/port.cpp
+++ b/port.cpp
@@ -303,6 +303,17 @@ void Port::set_tone(char *dir, char *name)
        if (name == NULL)
                name = "";
 
+#if 0
+       /* if tones is jingle, store next tone */
+       if ((p_tone_fh >= 0 || p_tone_fetched)
+        && (!strcmp(p_tone_name, "left") || !strcmp(p_tone_name, "joined")))
+       {
+               SCPY(p_tone_dir, dir);
+               SCPY(p_tone_name, name);
+               return;
+       }
+#endif
+
        /* no counter, no eof, normal speed */
        p_tone_counter = 0;
        p_tone_eof = 0;
@@ -801,7 +812,7 @@ void Port::close_record(int beep, int mute)
 //     apply_callerid_restriction(p_record_anon_ignore, callerinfo.id, &callerinfo.ntype, &callerinfo.present, &callerinfo.screen, callerinfo.extension, callerinfo.name);
 
        SCPY(number, p_dialinginfo.id);
-       SCPY(callerid, numberrize_callerinfo(callerinfo.id, callerinfo.ntype));
+       SCPY(callerid, numberrize_callerinfo(callerinfo.id, callerinfo.ntype, options.national, options.international));
        if (callerid[0] == '\0')
        {
                if (callerinfo.present == INFO_PRESENT_RESTRICTED)