← Back to branch summary

~ubuntu-branches/ubuntu/saucy/kopete/saucy-updates

« back to all changes in this revision

Viewing changes to libkopete/contactlist/xmlcontactstorage.cpp

  • Committer: Package Import Robot
  • Author(s): Jonathan Riddell, Howard Chan, Scott Kitterman, Jonathan Riddell
  • Date: 2013-08-14 00:23:55 UTC
  • mfrom: (1.1.4)
  • Revision ID: package-import@ubuntu.com-20130814002355-wui71omfn9ub5deh
Tags: 4:4.11.0-0ubuntu1
[ Howard Chan ]
* New upstream release
* Add libsrtp0-dev and libasound2-dev as build-dep of kopete

[ Scott Kitterman ]
* Disable building googletalk on powerpc because the embedded libjingle does
  not support ppc
  - Override config option in debian/rules
  - Add powerpc specific kopete.install file
* Removed obsolete debian/source/lintian-overrides

[ Jonathan Riddell ]
* New upstream release

Show diffs side-by-side

added added

removed removed

Lines of Context:
libkopete/contactlist/xmlcontactstorage.cpp
1032
1032
 
1033
1033
    QSet<uint> groupIdSet;
1034
1034
 
1035
 
    groupIdSet.insert( Kopete::Group::topLevel()->groupId() );
1036
 
 
1037
 
    bool idsUnique = !groupIdSet.contains( Kopete::Group::temporary()->groupId() );
1038
 
    groupIdSet.insert( Kopete::Group::temporary()->groupId() );
1039
 
 
1040
 
    if ( idsUnique )
 
1035
    bool idsUnique = true;
 
1036
    bool haveTemporary = false;
 
1037
    bool haveTopLevel = false;
 
1038
 
 
1039
    foreach( Kopete::Group * group, groups() )
1041
1040
    {
1042
 
        foreach( Kopete::Group * group, groups() )
 
1041
        if ( groupIdSet.contains( group->groupId() ) )
1043
1042
        {
1044
 
            if ( groupIdSet.contains( group->groupId() ) )
1045
 
            {
1046
 
                idsUnique = false;
1047
 
                break;
1048
 
            }
1049
 
            groupIdSet.insert( group->groupId() );
 
1043
            idsUnique = false;
 
1044
            break;
1050
1045
        }
 
1046
        groupIdSet.insert( group->groupId() );
 
1047
        if ( group->type() == Kopete::Group::Temporary )
 
1048
            haveTemporary = true;
 
1049
        else if ( group->type() == Kopete::Group::TopLevel )
 
1050
            haveTopLevel = true;
1051
1051
    }
1052
1052
 
 
1053
    if ( !haveTemporary )
 
1054
        groupIdSet.insert(Kopete::Group::topLevel()->groupId());
 
1055
 
 
1056
    if ( !haveTopLevel )
 
1057
        groupIdSet.insert(Kopete::Group::topLevel()->groupId());
 
1058
 
1053
1059
    if ( !idsUnique )
1054
1060
    {
1055
1061
        uint uniqueGroupId = 0;