[SCM] libgnokii and core programs branch, master, updated. rel_0_6_29-547-g72aac3c

[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  72aac3cfd4b75ed194dbf106ef62c76fa42fdb79 (commit)
      from  d73df3554452eb14325f625b6a70133f94c1a8f7 (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=72aac3cfd4b75ed194dbf106ef62c76fa42fdb79


commit 72aac3cfd4b75ed194dbf106ef62c76fa42fdb79
Author: Daniele Forsi <address@hidden>
Date:   Tue Jan 7 18:41:27 2014 +0100

    Make the code similar to gn_file_ringtone_save()
    
    So it's clear the default format is the same for both.

diff --git a/common/gsm-filetypes.c b/common/gsm-filetypes.c
index ea221bf..badf07a 100644
--- a/common/gsm-filetypes.c
+++ b/common/gsm-filetypes.c
@@ -97,11 +97,15 @@ gn_error gn_file_ringtone_read(char *filename, gn_ringtone 
*ringtone)
 
        /* FIXME: for now identify the filetype based on the extension */
        /* I don't like this but I haven't got any .ott files to work out a 
better way */
-
-       filetype = GN_FT_RTTTL;
-       if (strstr(filename, ".ott")) filetype = GN_FT_OTT; /* OTT files saved 
by NCDS3 */
-       else if (strstr(filename, ".mid")) filetype = GN_FT_MIDI;
-       else if (strstr(filename, ".raw")) filetype = GN_FT_NOKRAW_TONE;
+       if (strstr(filename, ".ott")) {
+               filetype = GN_FT_OTT; /* OTT files saved by NCDS3 */
+       } else if (strstr(filename, ".mid")) {
+               filetype = GN_FT_MIDI;
+       } else if (strstr(filename, ".raw")) {
+               filetype = GN_FT_NOKRAW_TONE;
+       } else {
+               filetype = GN_FT_RTTTL;
+       }
 
        rewind(file);  /* Not necessary for now but safer */
 

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

Summary of changes:
 common/gsm-filetypes.c |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
libgnokii and core programs