← Back to branch summary

~ubuntu-branches/ubuntu/trusty/xiphos/trusty

« back to all changes in this revision

Viewing changes to src/backend/sword_main.cc

  • Committer: Bazaar Package Importer
  • Author(s): Dmitrijs Ledkovs
  • Date: 2009-08-12 19:21:05 UTC
  • Revision ID: james.westby@ubuntu.com-20090812192105-dw40gql5mdqvgx84
Tags: 3.1.1-1
http://bugs.debian.org/539190
http://bugs.debian.org/539880
* New upstream release (bugfix)

* debian/copyright updates:
  - help/* is GFDL and referencing license file as per policy 3.8.2
  - updated copyright holders (Gnomesword -> Xiphos)

* debian/control:
  - Bumped standards version (Changed debian/copyright as above)
  - Updated VCS-Bzr field to point to a working URL
  - Fixed typo in debian/control (Closes: #539190)
  - Updated extended description of xiphos package (Closes: #539880)
  - Significantly improved wording of all descriptions
  - Added Conflicts: xiphos-svn - upstream deb package name for svn builds

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/backend/sword_main.cc
2
2
 * Xiphos Bible Study Tool
3
3
 * sword_main.cc - 
4
4
 *
5
 
 * Copyright (C) 2000-2008 Xiphos Developer Team
 
5
 * Copyright (C) 2000-2009 Xiphos Developer Team
6
6
 *
7
7
 * This program is free software; you can redistribute it and/or modify
8
8
 * it under the terms of the GNU General Public License as published by
951
951
GList *BackEnd::parse_range_list(const char * list)
952
952
{
953
953
        GList *retlist = NULL;
954
 
        char *buf = NULL;
 
954
        const char *buf = NULL;
955
955
        VerseKey key;
956
 
        int count = 0;
957
956
        
958
957
        verses.ClearList();
959
958
        verses = key.ParseVerseList(list, key, true);
960
 
        
961
 
        while (!verses.Error()) {       
962
 
                VerseKey *element = SWDYNAMIC_CAST(VerseKey, 
963
 
                                        verses.GetElement(count));
964
 
                if (element) {
965
 
                        buf = g_strdup_printf("%s - %s",(const char *)element->LowerBound(),
966
 
                                (const char *)element->UpperBound());
967
 
                        retlist = g_list_append(retlist,(char*)buf);
968
 
                }
969
 
                verses++;
970
 
                count++;
971
 
        }
 
959
 
 
960
        buf = verses.getRangeText();
 
961
        retlist = g_list_append(retlist, g_strdup(buf));
 
962
    
972
963
        return retlist;
973
964
}
974
965