[Igarden-commit] Garden/source/Document MaterialPictSelectDialog.cpp, 1.19.2.3, 1.19.2.4
Status: Beta
Brought to you by:
jlbedell
|
From: Jeffrey B. <jlb...@us...> - 2007-02-09 01:13:16
|
Update of /cvsroot/igarden/Garden/source/Document In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv20243 Modified Files: Tag: Release_branch_v1 MaterialPictSelectDialog.cpp Log Message: Add copyright annotations for Creative Commons compliance Index: MaterialPictSelectDialog.cpp =================================================================== RCS file: /cvsroot/igarden/Garden/source/Document/MaterialPictSelectDialog.cpp,v retrieving revision 1.19.2.3 retrieving revision 1.19.2.4 diff -C2 -d -r1.19.2.3 -r1.19.2.4 *** MaterialPictSelectDialog.cpp 11 Jan 2007 02:58:56 -0000 1.19.2.3 --- MaterialPictSelectDialog.cpp 9 Feb 2007 01:12:58 -0000 1.19.2.4 *************** *** 159,163 **** Material *mat; PictureInfo entry; ! String siteName, title; InfoSupplier *supplier; bool hasSupplier = false; --- 159,163 ---- Material *mat; PictureInfo entry; ! String siteName, title, copyright; InfoSupplier *supplier; bool hasSupplier = false; *************** *** 200,204 **** filename += "<br>"; } ! filename += entry.GetCopyright(); by = entry.GetCreatedBy(); --- 200,210 ---- filename += "<br>"; } ! ! copyright = entry.GetCopyright(); ! if(!title.empty()) ! { ! filename += copyright; ! filename += "<br>"; ! } by = entry.GetCreatedBy(); |