diff --git a/CHANGES b/CHANGES
index 0854f0eebab7ac2483894ff3c3d97caefca65051..35cd616332159dc095a773f69cd07b04db8bbc76 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,7 +1,8 @@
-SFLphone (0.4.1) / 2005-08-11
+SFLphone (0.4.1-rc1) / 2005-08-11
* Use libeXosip2
* Add blink notification for voice-message
+ * Add scrolling text
SFLphone (0.4) / 2005-07-06
* Cleanup code
diff --git a/README b/README
index 62eb859d3134faf6b6dc004296e0bdd5046b4d51..9c4aa4c5fdb462a2eabaebfab68ef0d0b3fb0f72 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-This is SFLPhone-0.4 release.
+This is SFLPhone-0.4.1-rc1 release.
You need ccrtp-1.3.0 which needs commoncpp2>=1.3.0
diff --git a/TODO b/TODO
index 58ead5e53a195e2e1a3a9a34d5199e2b59ac1961..1735a5ec14a489e2209fd36237539a16be762b8b 100644
--- a/TODO
+++ b/TODO
@@ -5,10 +5,9 @@ Add screen shell to display debug
For project core:
----------------
-Management of message blinking-notification
Management Config like about:config in Mozilla
Improvement of STUN
-Add ZeroConf support with mDNSResponder-107.1 library from apple
+Add ZeroConf support
Add IAX support
Management of account (add, remove, ...)
Management of exceptions
diff --git a/sflphone.spec.in b/sflphone.spec.in
index a97d217b282a885046014a7a2b3e0b1a886bd2dd..ef1d008136064fa2d46297db2426c5ef2edbc94b 100644
--- a/sflphone.spec.in
+++ b/sflphone.spec.in
@@ -1,6 +1,6 @@
%define name sflphone
-%define version 0.4
-%define release 4
+%define version 0.4.1
+%define release 5
%define prefix /usr
Autoreq: 0
@@ -12,7 +12,7 @@ Copyright: GPL
Group: Networking/Utilities
URL: http://www.sflphone.org
Packager: Cyrille Béraud <cyrille.beraud@savoirfairelinux.com>
-Source: http://www.sflphone.org/sflphone-0.4.tar.gz
+Source: http://www.sflphone.org/sflphone-0.4.1.tar.gz
BuildRoot: /tmp/sflphone-%{version}-%{release}
%description
diff --git a/src/audio/audiocodec.cpp b/src/audio/audiocodec.cpp
index f38317839e4c0ca832a567d38ea93c23b6f8db4a..dcc6f748249890ebea9277cfa21f0b4b8905da02 100644
--- a/src/audio/audiocodec.cpp
+++ b/src/audio/audiocodec.cpp
@@ -17,12 +17,6 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-
-#if defined(__APPLE__)
-# include <machine/endian.h>
-#else
-# include <endian.h>
-#endif
#include <string.h>
#include <iostream>
#include <string>
diff --git a/src/audio/dtmf.cpp b/src/audio/dtmf.cpp
index d0b9cd39ee3f9be115b0a762b7e92669144e3c3f..eff5e607470383ec5639cc5025407964d6afc3f9 100644
--- a/src/audio/dtmf.cpp
+++ b/src/audio/dtmf.cpp
@@ -1,5 +1,5 @@
/**
- * Copyright (C) 2004 Savoir-Faire Linux inc.
+ * Copyright (C) 2004-2005 Savoir-Faire Linux inc.
* Author : Laurielle Lea <laurielle.lea@savoirfairelinux.com>
*
* Portions Copyright (c) 2000 Billy Biggs <bbiggs@div8.net>
diff --git a/src/audio/dtmf.h b/src/audio/dtmf.h
index bddc409a2e790fed3715c4acfbd4ed9df71581e6..476a15140824c0cc036b3211679c2f38e2412cb6 100644
--- a/src/audio/dtmf.h
+++ b/src/audio/dtmf.h
@@ -1,5 +1,5 @@
/**
- * Copyright (C) 2004 Savoir-Faire Linux inc.
+ * Copyright (C) 2004-2005 Savoir-Faire Linux inc.
* Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
*
* Portions Copyright (c) 2000 Billy Biggs <bbiggs@div8.net>
diff --git a/src/audio/dtmfgenerator.cpp b/src/audio/dtmfgenerator.cpp
index cfb6764456d2c17eb63fc264cfcac040c45e8b58..13f267bccf855a4500c69611bca3bcc4d2be7392 100644
--- a/src/audio/dtmfgenerator.cpp
+++ b/src/audio/dtmfgenerator.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004 Savoir-Faire Linux inc.
+ * Copyright (C) 2004-2005 Savoir-Faire Linux inc.
* Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
*
* Portions (c) 2003 iptel.org
diff --git a/src/audio/dtmfgenerator.h b/src/audio/dtmfgenerator.h
index 798729b3691fbb6cf7ac7d4763283f29705a403c..aa22144c87ccc7d2e856ffc405adc05d4155ae6d 100644
--- a/src/audio/dtmfgenerator.h
+++ b/src/audio/dtmfgenerator.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004 Savoir-Faire Linux inc.
+ * Copyright (C) 2004-2005 Savoir-Faire Linux inc.
* Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
*
* Portions (c) 2003 iptel.org
diff --git a/src/audio/ringbuffer.cpp b/src/audio/ringbuffer.cpp
index 71318875baaa8112e80139b01760b0d79e160b42..ba810eed0af9d95cbb85ded88fab724c88d49047 100644
--- a/src/audio/ringbuffer.cpp
+++ b/src/audio/ringbuffer.cpp
@@ -1,15 +1,25 @@
-/**********************************************************************
- Portions (c) Dominic Mazzoni (Audacity)
+/**
+ * Copyright (C) 2004-2005 Savoir-Faire Linux inc.
+ * Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
+ *
+ * Portions (c) Dominic Mazzoni (Audacity)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
- This class is thread-safe, assuming that there is only one
- thread writing, and one thread reading. If two threads both
- need to read, or both need to write, they need to lock this
- class from outside using their own mutex.
- AvailForPut and AvailForGet may underestimate but will never
- overestimate.
-
-**********************************************************************/
#include <iostream> //debug
#include <assert.h>
#include <stdlib.h>
diff --git a/src/audio/ringbuffer.h b/src/audio/ringbuffer.h
index 2fef48a545978dccfee3b14a55e68293187991b0..a7d5417937766656854e5b4527691390875169fa 100644
--- a/src/audio/ringbuffer.h
+++ b/src/audio/ringbuffer.h
@@ -1,5 +1,5 @@
/**
- * Copyright (C) 2005 Savoir-Faire Linux inc.
+ * Copyright (C) 2004-2005 Savoir-Faire Linux inc.
* Author : Laurielle Lea <laurielle.lea@savoirfairelinux.com>
*
* Portions Copyright (C) Dominic Mazzoni (Audacity)
diff --git a/src/audio/tonegenerator.cpp b/src/audio/tonegenerator.cpp
index 140ea786a28362f5a816118a2d9ba5cfce822a92..e4b5e12647c4b3158b19f737c0a5e17b2ec963b3 100644
--- a/src/audio/tonegenerator.cpp
+++ b/src/audio/tonegenerator.cpp
@@ -23,7 +23,6 @@
#include <stdlib.h>
#include "audiolayer.h"
-#include "audiortp.h"
#include "codecDescriptor.h"
#include "ringbuffer.h"
#include "ulaw.h"
diff --git a/src/configitem.cpp b/src/configitem.cpp
index d9a16ef1a7ee34ae0e23e965ad5927ea2bf63fd6..b708b058a1f57ec292a4971de2d495a7e64467d9 100644
--- a/src/configitem.cpp
+++ b/src/configitem.cpp
@@ -1,8 +1,19 @@
-//
-// (c) 2004 Jerome Oufella <jerome.oufella@savoirfairelinux.com>
-// (c) 2004 Savoir-faire Linux inc.
-//
-//
+/**
+ * Copyright (C) 2004-2005 Savoir-Faire Linux inc.
+ * Author: Jerome Oufella <jerome.oufella@savoirfairelinux.com>
+ * * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
#include <assert.h>
#include <stdio.h>
#include <string.h>
diff --git a/src/configitem.h b/src/configitem.h
index 9a236beab12a8518e64c53e7d2c8c5c354e651dc..a04d6e9e5773a32c15d0346ed15462e6ee14689d 100644
--- a/src/configitem.h
+++ b/src/configitem.h
@@ -1,8 +1,19 @@
-//
-// (c) 2004 Jerome Oufella <jerome.oufella@savoirfairelinux.com>
-// (c) 2004 Savoir-faire Linux inc.
-//
-//
+/**
+ * Copyright (C) 2004-2005 Savoir-Faire Linux inc.
+ * Author: Jerome Oufella <jerome.oufella@savoirfairelinux.com>
+ * * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
#ifndef __CONFIG_ITEM_H__
#define __CONFIG_ITEM_H__
diff --git a/src/configuration.cpp b/src/configuration.cpp
index 2cc7e4145e01114f88ab0d86b4d6e25553a006c0..c655253fe5d6d9817891ff979f093f2f84318c27 100644
--- a/src/configuration.cpp
+++ b/src/configuration.cpp
@@ -1,5 +1,5 @@
/**
- * Copyright (C) 2004 Savoir-Faire Linux inc.
+ * Copyright (C) 2004-2005 Savoir-Faire Linux inc.
* Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/configuration.h b/src/configuration.h
index 23d1a0b0e021024344991d77219a532fff9bb2f3..a68365738fa36d28d61b2aa65c6778a57ebce9c5 100644
--- a/src/configuration.h
+++ b/src/configuration.h
@@ -1,5 +1,5 @@
/**
- * Copyright (C) 2004 Savoir-Faire Linux inc.
+ * Copyright (C) 2004-2005 Savoir-Faire Linux inc.
* Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/configurationtree.cpp b/src/configurationtree.cpp
index 4a3db9e45a6c73c9104fd393c0b2a50884161c64..efeff9b164d438c490994753ba8555118eeaa0ca 100644
--- a/src/configurationtree.cpp
+++ b/src/configurationtree.cpp
@@ -1,8 +1,18 @@
-//
-// (c) 2004 Jerome Oufella <jerome.oufella@savoirfairelinux.com>
-// (c) 2004 Savoir-faire Linux inc.
-//
-//
+/**
+ * Copyright (C) 2004-2005 Savoir-Faire Linux inc.
+ * Author: Jerome Oufella <jerome.oufella@savoirfairelinux.com>
+ * * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
#include <iostream>
#include <string>
@@ -78,14 +88,6 @@ ConfigurationTree::populateFromFile (const string& fileName) {
if (key.length() > 0 and val.length() > 0) {
setValue(section, key, val);
}
-
- // To display tree
-#if 0
- if (!section.empty()) {
- cout << section << "." << key << " " << val << endl;
- }
- ///////////////////
-#endif
}
}
diff --git a/src/configurationtree.h b/src/configurationtree.h
index a4c3dc35447580b2f273265ea59aed36cd009c36..81d91fdff8c9aac40ad2354d948e1cc10527744e 100644
--- a/src/configurationtree.h
+++ b/src/configurationtree.h
@@ -1,7 +1,20 @@
-//
-// (c) 2004 Jerome Oufella <jerome.oufella@savoirfairelinux.com>
-// (c) 2004 Savoir-faire Linux inc.
-//
+/**
+ * Copyright (C) 2004-2005 Savoir-Faire Linux inc.
+ * Author: Jerome Oufella <jerome.oufella@savoirfairelinux.com>
+ * * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+
// The configuration tree holds all the runtime parameters for sflphone.
//
// Its _head pointer is a list of N Sections, N >= 0
diff --git a/src/global.h b/src/global.h
index 2a4f3344d705499eec688d1b5c3622e694d6bc5b..a0ebb0ddf13e447cb5ddb8f1650bb860241c518e 100644
--- a/src/global.h
+++ b/src/global.h
@@ -35,7 +35,7 @@ typedef short int16;
#define _debug(...)
#endif
-#define VERSION "0.4"
+#define VERSION "0.4.1-rc1"
#define VERSIONNUM 0x000400
diff --git a/src/gui/qt/configurationpanel.ui b/src/gui/qt/configurationpanel.ui
index db9cf74717386cd1bf72c4e845c3a2c4af38e3ca..0c771a45ed0433d3ef3f5bd366f39b1fecf59a10 100644
--- a/src/gui/qt/configurationpanel.ui
+++ b/src/gui/qt/configurationpanel.ui
@@ -1107,7 +1107,7 @@
<string><p align="center">
Copyright (C) 2004-2005 Savoir-faire Linux inc.<br><br>
Laurielle LEA &lt;laurielle.lea@savoirfairelinux.com&gt;<br><br>
-SFLPhone-0.4 is released under the General Public License.<br>
+SFLPhone-0.4.1-rc1 is released under <br>the General Public License.<br>
For more information, see http://www.sflphone.org<br>
</p></string>
</property>
@@ -1168,7 +1168,7 @@ Montreal, Quebec H2T 1S6</p></string>
<data format="XPM.GZ" length="58862">789ced5d596fe3b8b27e9f5f114cbd0d0eea6475625cdc878eb3b4b34ca72799e9745f9c07c74b76c776363b07e7bfdf629194488ad49249e4f40151109292488a923e7dac85a2fff9dbc2e9d1e1c26ffffce5fea1f370d95de85e74260bbff51e6f6f67fff7affffdf72fbfae2c2d2f34971696165717967ffdc72fbfe21f0bdd05682c37d61a52ffcc7a87f40eebbb4a6f2a7d47e93da57f17fafa4aa3b7be2274e8487d7d49eab8a4f43575fc96f533d2cf58df547a53e953a5f794fe22f48d95f5de866caf2df58d25a9c34ce96beaf8b9d4cf96cf56f9f890f5333a2edb1b2bbd29757c547a4f1d1f495dd7c78b44efb13e507a43e9db426fae6ef49af27c7da93797943e50fa9ad4f145ea49fd65a577947ea8f5ee1ad7df557a5f1e872dadcbe3f8c47a97daefb2fea0f4a6d2ef95de53faa5d4757de849bdbbacf496d03babcd5e47f6ff52ea9d25a583d2d7a48e7da927f59f125d5ecf27a537947ec47a97eacbfe4c94de51fab1d2fb528767a927f5af94de913a74b5de93e7df577a5f955f14fad96aa7af9ee758eac9f36d28bda1f0b22775dd1e9e28bdaff403a9f79695bece7a2f799e23a5ebe7f9ac74f5fc7045eaba3e7c4af43e1f5f557a43eac0f8eaae25cffb4eeafa7ee354e90da5f7a4aeebe3b5d23baa3d7e3fba3d7d3fe14ee9ea7ee250e9eafec195d4757dfc5debfd06eb6b4aefabf62fb42e8fc367a9f79795ceef5b6f2db99f33a927f7734fe90da57f937a52ff20d1657fba4a6fa8fefc99e8f238bf2fd43b7d3f51e9fa7a6e95aefa8f9b52d7f5e14ce91dd5de86d0fb0d7d7df855eaba7fd854baea0fec285dd587b6d607f2f8b5d2fbaafd2f5a57c7f97dee27fdc153a5ebf6264ad7f5ffd2baac8f37521f2c2bfd4ce90da5ff10fa20391fee4b3d29df52ba2edf49f4019fff46e91da533df0c06fa3882d2d5f1af0f4a1f683d4a94fa24622e4add123117a56e89988b52b744cc45a95b22e6a2d42d117351ea9688b928754bc45c94ba25622e4add123117a56e89988b52b744cc45a95b22e6a2d42d7f177308d821399bf77544f979e4b598c32ef6b08f033cc70bb55de2155ee3cdbcafe8e30bdee210ef7084639ce03d3ee0233ed1df09e9cf38c519decebb87ef2bd53147ac768d2f8cb601612dfbf7136ecefbaa3ea2600bb70855dbb883bbf8b960dbc5366171847bb83fef7ebfbd54c51c1e58dc16da0e3f0eeef81df91dbfbc4bdbfb848b23622d282cf99570f4c7abb6e379dfc1b7962a98c31b1a3ffddce6fb7b52aac53f091107344a5ff2d87c42e8f8eb2daf0fbf25fd7973d4e1293392e0a5eff8a3a0ec6221b785b6a5b7eef7bca53ce6e8e915f39bbd2de7f916c43f57c17a2b7ebb903c966f6447ae166c6b29be08cdbaddde5bdf3b6c187c342a28bbe4e1b0255c278edcc0267e05c42d00e8f8b80ef0ad7b3e5f298b39465c96cb06849b2b42c8359ce1267433c797b1e36d0d88db2e0ab8f2c41db108a56539f602bfa9f324fbe1cd31077d838f724740ea4786bf60e02b07e7597b0fcedfbae7f3957298f372dc00d7ac327f911597e5ac818fb108a7699915dc14c8c40e9cc105f48cba874ead9ea7fdd0c67da3676df8d56f7defc8df4cb928b7751a855deeea602b507694e1bac5b7eef97ca50ce6f08b974baecd32c47321cec93c0db2e0521f37c38364e3ad32838ae3dfac73749df69709bb3d204e931bc915fd774dffabbec14d5e3ffeae900f9a72513ee6006e1d9edb0a9786a1c373776fddf3f94a29cc2dfbb8c4ba4b6730cae19c15abb52fc9fee073a267744163ab331a1242cd7657a13016581fcf6151d99151760727b9656fd9fa53e561f8d6fd9eb714638ec63eafdd649559ceb7afe0dadb5ec5f8b1652f96b2ce98e7743fde97e7c685a587e42734b3f13698900771ef29dfa211f9166790d766618c46956bc2234ee9fca76f7d0f5e234598a3912ec45f3725caa80d9e8c7bfca4f62f57ed2b3c57e5ac6a3c87fb70477e64533c49dcc7198ef101a6f81d66788477d9676ff1dc1fd2d2a7e7fa0c973084195c12b70523bad4b3676a7da6f90c3a30a61acd40e91f7847e567844260940e71421ecc928e1e877009f7e40bbfa49c293816c80dae7ae7df568a30079fcac4df380b96ef4b265137b6d5c4fe4f55fb6ad87307256b54b0e70861a94fd9f1c6ca1c5bdee439e6ba4e12af4bda8147efb9a6b0e9cf3f402bcb4584c5cf057ddbf58dd6701eb80eb204ca32e47b4821cf0d82fc3548fb4dcfd66bf319db956a2fe144c8b1a2037d49ec39b82859a302cf116b14e604888b8c676bf35cb0ceb6739e0d62a6dc3a84310311706ff154f83cb6853d8171ee39a64551ecf7937ccc4149eee2d859418e425bfc894ffa37ecb9b29833edb97c8cc343b9bc00f99f498cc3e539ff465c6322085d2ef46e064e7156a65fcca98955483ed8b0b04e7b5e5c5780b96e0e772dbb1126f20ef2b84e656089add27c43a5ab4eed3928392e97e7395f3e1436c9f619e13d8f50e9fe84e9caf11c6d897f41c8dec91cff4ee36cb64edab359e9dc6ce2e11253da1cb8497bc66401dad7f72131c7fe68c817ddf194ff421e4288eb5655995563ff7295b900863d57d287b0ecb9c3dc92599e3347d16d63ffae1e95b23c0703c2e83159edf6fe84b518a5d639a4f5c6734edaceb199aa93e1397811ef029dcbe52e957f33f2c09f79144d7c06f2904d3bf27b282efdbe92873908fba397e18c395c046cc0849bac5cc33969d7e5f2ef567ceeba548dd7f39ce32fc038cb412ecfe9d82db6c0e226d00c3fb4b8a7a351a5fbca2832b849ed77788ed84af11379d98e1da86a3c18fb3fdb769b7d9daead598fe4610ebf0438ab2036a66c3bb75e12d123241c7a8ef7b1879b79715e279fbb92df0bae61c6e772633336cfd93618f779cb3caef6d93c67645c9969b2e56d2ef5cc0ae051362dc3fce4f09cc54d60e571a1aff6764c4ecc9c636a5c67e6681d928bb96e96af60b7242765e78c185164c2c20a86e6e1898cd6375f9b467c4ee57269cf09b1a42d9be96c1693e7f27d0887e71a9eb34f8de3724434796ed78ec5391cc8c74c5b0ebc36059c5b9cc628b679ce9e1940bd36cb735c86fc629b17ad5929ecc398c7e71025ce1d5bcf325c5421a606570e9739f32838bf15f6750fb3a36726df1afeab50f76a7bce1335b5388547c5bc3c04581c28222c840593af02790b93a3a41de8f09c937b25de73cb8f1c3b8fd80cef69ef049f4c8e53dbccdf8ff7945c9edb7478a56214173edbf5bde7001ac1d788ad2e3dbce7ccb374f2ad79db4dd27aba2f17738e9de3cb45ad1bfcf0cc7bcc7925ce1be5d85a6453c1a3c55781f94966ec0ea6bcc7b6e79cecabe5f34a9e9b94f673c5f6fc1628aa26b93cd7b6b8a354ae8afcd6d574ae0878edb990e00d95bfb238cb9a7f97999f774863ab98a3796d6e84f4c4267c9d3d07de397f8c22cd5b6ced59f69c930720567379cea8af6d35cf3dc8f4c3e1b90da757e30ccfdd67b82c67f3e749de577279cef65bd3b9b7c44df464fd3697f4493fe9a33c37d3f15bf385ce7a62d88f8615e6d873d725be427815cff96d2df23a537e38e23da6cde662ceb60f7f64e6c505ec28b8346d446ec9e63907ab561f183fe4d796e5b85d7a6be610a32b88cfa5398313b56713b59de68d3d305e64fcaec7333121c9af96f0339356560dae4bfc34d39e2b9789b0ecb9f27eab27f2e8f014fb9c16cfb9b195877c9e0bcd37b7da6cf31e8be7dc6cbe555ef2dc83cd6564cd1d1147cf5c216fe263c68493f9bc623612f9142f066f9c786b98b9089e73492894ba971773ceece42fac7c6bc95cadc573b963bbc34b9ef920786c1c67abaa22cfd97c159887697d3721f754e4393cb2ec46af9d305f29c0dcb5b68792586f9abff4320d5c383ee441e29b56fad69ff854b7b39ab49dda732539d3b2e7cef3de6b87973c2c0426dfb0556571cc716e7b82e79a165f79470998581cb5ce67a9ca730dab8dc2797df54b01e63a094f64e36dde6f02c907f5fb92157d5e6c2575137e34f2adaf9957720139b90bc76fcde484a83fd9785b259e7338cc6bd1d9795299d7a8cc73b7561b7e0b08e6397bb370fedc5e300ee6650d62466f79a8b8a289f18d57ea8526f65cd9d62c7bee22ef8b5b273eb7eb8eae3831b84667a52ad9733cea99e7c85eb39527d57da8ca734e1ee2366b27e0a2884e136fcf213627a4107367c118981f7327deb2b93ea3b79d6b6d131afbd2f85cc9595036cfe5f1a39b6fd579247517d0e21a9d4bafca734de71c1607e186fd0dace6daaa3ca7a2d7693b632b5b36219426b6dec7cbf1ababfa1488f5fba3584f5e4eec5a2d7e29c20c8d6487b23e18350d7baee437f98e3d27da7bc26bfe4aec0c76f026b5313df34a1e93f9235bc416296725b9d86af61cd77062678487a9980bcf2b99d8f3eabeeb79ead5790ef7ed6f64a9f777c4a12d7a73d6ad3cc72eeebd359eca4809cc75d03f4fe44f4fd91b1f278215eb861ecab973413f965a39d4fc68bda3697cae24e65c9ef36df024d8cfbf9e08bc40dfcab38a2dc9c556e539f12e79e7cae5e607aaf31cc7654a9c43e639ea9752df1afee9e52e8f756ac5d5923cab3d57c498537268e62cd4d18ecafecbfa16b68cf85ce9b547f025688f5a9c5d7a9ef0d8988d6bd671fc43e215b3debeb17fa9c479ccb97b95798ef717ae8f42e89fd3ecf492dff11f7839c2f10369b4cae44c61e4ceedc41bd8b2ca5c72066b8dc6bc7dec9bf1347b44b66276a5a39999b928be6d10e2b90cefb5cc33e3c4389659338e9ea93e66dd01f12d56ee7976ecd89df33d843b37fbd8386665897196c7a9e4417cd0ef218c2b58f172841127232bed30cb21bed9c41cc53bcce59e174260c6e6c3dfd5f10a1e49609d15fbef75a9ef2176325fd3fc20ab4b1e6b7bce7cac8e7dcfe6f3f1ab9527357dd5a32c16f029e1a6ec9a08a9afbbebe662bf8a6fd9be67cf43e79e8b1da7a5c2ba4c2b7e8e202611ab21f9befbbac89b794e185dc1cb6c7be4b3acf96b243c7a55e50af10b5c65e6d8a5f24d62db89cf6d8ad506f116ce0939c46770e7fff29438eb0e4710f2e167b01d5ef781fcd4291e93bdb8091db21bc70070e79bcfc2e74142cfc8df07f2b7ee704cfdf0f7615f7c718b47d4fe0c0506a7f3febab5e2fa73df8cfc6be15ff2154a45d1e89e7dc12e1c10a20af334342e1f54cba1951587e7d6dfe31c51a4545b67932cfcb273d856e77d65d5c4b1e7fecb57f49daf545f4f18ce3cebcc59f3e4b057cc581f4d2c9efb3ecfafdcfffbe575eba613dfadaa58b1c96dcb7812b2c53eba58f3e7e6f265cacf254994fb156b6cffbddf87c01659619bbcc666096bec230b790c29cfcdbd37957b7f1b9a1bf54ee79b605bcc3026ff7b884fc15253ff4c82f83b385ae025b1e77e8a95cac9537dd4cf148f0803019ff75dcedda7bbb52efa407f3d7122eed30f98fa675245cc6949e69ded64e35c1f51a08f6d9d8703a0ff6bf47b08ed7c6e62b2761073b774ccfbf646cca5c22b03ce7e8e5f01c12631db4b92d53f224ea9317b8adb74be06af36360dadb543e3ee4be4b9aa8220a2baf82c249d394c96df3eaf8ad8247c9a6b81006ee008c5bccb75f5053e582b324d6cfe34d6779af1d7a723dc4a66ac00b5b108e7380cc589517c952884bf06123c074311b9a636c4b70fd64a50740d47b84eef53c1db04f738c6276a690cad74bd46c2ce3936685ba7f6f5fcaa323c774ac7bcbf60103117161abd8e047a080153fdcee20f7a26e24edf132a1e04d7c84c83989706537af6e2c91fd3336b094b3bcd55c13d3dc9699a3d23dc3e0a1c93d5d3a2273862643cc240cdeedc127692380fb5ef99274f3d7a54fd78e49537c56a9a6dfebda60798d179fa12a9544eac43774c489ca2f82e312707c1f938d9c63db5a1381487b84d75c53b764af7635baf6020ed39be2f219e8310f746cc85c5e405badb6da103f38bcea0121bb465665d7872aebf4b8c933c0f40ae97cc04854769f513e2da3ac34a3ca34ac09d6431f20a037379457d3ece7599e7668a5d9b023bb28764a3b6d3160889399683b8428d4a14efceb6ea53bab2a5e895fc46a304cf718b5e8c47cc95131ecbf6388ed74e5732a7777906721d89470fe6c8e6d2775da09339418f4e13815562b7a9594bd86522064123aae0b87e78ee07f1a4e04048eb19ebe22d4aeb9d38746622826c84b66f25163ec69c9a9ffbc73d7d8d65ec3931c3c0bf3f62ae8c306371448a79cef8f681ac37f915ea3a3353c35979eb51e7f84539168dc16dc144b2969e1387fb0223e249499ecbff5d0818a4f612fbad49691a0fd9cee335eddae96a13c2560bc51e39da92fb8d188fad8a87cbf15c287a1331972fbc7afabde4288101c173e69a21642bb5d53aeb6c0d11f7b4d2df39c4b1b4e8041f12beee68ec92df729dca919af889ed3042e494acf47b14489ae9b857becd0f2de2448d6830ed3ee6e24bf9a6703bf41fa1f888da7e0afd2e19db0ea17b704a0c3911f6a8b01f794f097b2e2c117321c1167b09fcf536bde3438939e639e38b6ec154fa7fb27deea43f49a5e52a3a5bd25aa367ced8a3b148f2c4a2fcc2465873f42cd14597e4b982fedda74cc83c675a9fcc73b0adbcd912d11fb6e63c5fe4d01508bbe007db78e2ad929e45299e0b49c45c48c4334d474acef69c2b9e33ec7ab6d2adf71c26621c250e427e4ec2b34cd0c156d8808f4b5d708767652469cf15f58fb84dfb32c29e4b7a21ceca3c37947fcb5e6d766c657b33b100c5fb26cb94b3e7421231e717810ecbba9f04786e94c58688a7249ee391b2e3b46fda521ea9f47685e5e5fb6587923c67d973e6ac7969cf9d9a9e72416b23ee97b326077be3497e83af3df2dcbb094cf819682ff394b5a987e746ca9e33c625b6a75ea4b720d0435c90c6e59e9903d3b89df00492f9bf34864ba40ec379cca4ec84da51dfae727c2ec3733c86bfa4ab7d91b5300dfa98fb6caf6d2719dc0deaa988eebda416204764c6b2d7ca9e1be6d97310f855b388b990f00828be09ddc031fb93722685e00e234a4b969a8c9534e8dd5f17bf8e04d2a6532312790f633342c1f113834f84374825d6a9ddafb00d331561c6222f52fbd26a55b2a30ccfc9d8728bfde545dc00b16eec76deec059cb1cd3aa41a138ef08937e996e37e77e25de0b743c70f5b9263a5671c686f3fe621aa0bee894c02bdef7b34aaece9cc8fbd8616dd5995d1a2e313fe052f61bf19712ef1bcac1a5fed118cd8846a127300e156b10c79230d7745cdac48bb51b02e21d62a0d8f464e6e28fa457d1a17fdde35e1f252bc5d847cd01904eafdb6f88e82aeee2b217028475a7a0ff95706443fc3bf688c81bc47c4dccf2c345abef91783ef3fc721622e4add123117a56e89988b52b744cc45a95b22e6a2d42d117351ea9688b928754bc45c94ba25622e4add123117a56e89988b52b744cc45a95b22e6a2d42d117351ea9688b928754bc45c94ba25622e4add123117a56e89988b52b744cc45a95b7efdcffffcf2ff6d14cd7e</data>
</image>
<image name="image1">
- <data format="PNG" length="3610">89504e470d0a1a0a0000000d49484452000000ad0000003008060000006357fade00000de149444154789ced5d5f685bd719fff4d0918e3094b1073bb06197b9208f0de4b9037bacf8eaad8e53a8bd3dc40e1d93e294d57d699d0c46d2145585e1aa6ac9b01f945a0181dd40b03d70e46ea448292e72c199e56290022928450c39f841312228412fbf3d5c5de9fe39e7de73afe4d4697420fc5add7bbef39d73bff33bdff9ee77ae0944344f442d430028000090ae21aa40cbdb69e3338b4d1b68e26e1100e08d26414180824b5c94e2c0f4cd2d00c0f7ddf1363ebde8a862760fa85401f7cc1268b3669836d1bd03f857d136e036da467b150048716b46b58b521c28962b6d17a28d42287423aa32233a61543b185acfb60db78d9668794376af046fb4b5cc6a86de68b2ed32b4d1144d6fc01ee0de397886d5a37b66a96db86de422f74276af04f78c03c69c4b80a2004593a02830bc22470b9672c5868b2120a725860b60363a0fffa4dff02f1c090355a0582c3e3d2e0980c46aa2a513ba52ae201c09c33fe9c7c09004ffa41fa83a947f00fab1b0350c5b333094615ad2793c11c64519c026e0e9f722d99f86a7df5bffc7faff0bc1d053c1ec1782a1bafeadd2b7b252318cc79be7a71d4de483d04f8869e550963d861529fecfb71cf9b84e0cd73fe9d73c08696418b3d17900c0c2e2021001a49161cd3d5b99adc3cfb88afead32084033069e7eafccb44ee5b75a3f0e1a7e90f66cfaa0796b83f52ea69bf271a57852dca0a06558a4f80388bb004ab525cd442eeea2f9076155bf09f9283ad00fc0c09064588190b318af27a09fd5fdae79220a10518c8802005cef2f13d1181189a1ffa50cc55ee9235e09fc3b43576ff709cbe3e1c26bf768e2372fb8626a7d1998c96ce1f4d933f5f625c94773e188653d0d02181b9fa03bdfde61f649927c746e728aba5f7cc135382461ffe13eb98fba69e3568a622e974b2d2fb59ec6c54b1769ffe13e797a3c347ced3397a267ec5a1f6ddff6d1fec37d8d7c4f8f8706fabd74ee9d735a7911a0f79a3cd6b31fcf92efe5dfbbe6a2f398fb74ae5eb7a3a393eedfdf2522a2dcdb198a4d68f55150d19b55721b198afdc8e50a5401dfe889ba3c75711f75d38694a2ddc95dea3c7edc25aa9ffba8bbdedfba7e00e6aec468f9c68aa1ad8e8e4e4a9d5ca347a71ed1f33ff9b12b46a49d794ede70554c18d6ae0f6bf5064d288741b7e425fbd3904686811c905c4f0bcd78a5eec09024b75963da37cf4fd71969604802cac0d65056e386e8e56547f286ebe148d8a05f65a502ffa45f23cfd3efd56c8a348c58907f67f9a4ca7f5f0886f8e35562fbfc4841de9ba8da934686812a6417aa360ecafdd9917c73fae9183f3b92977fcf01a3a7c6b5e35d63fa3ad30656b77075db012376a408677dcc191b20a2ab3699db0c4397c6a8d3c5660e0d5681de413efb13c933ded3d34dbe211f4d8c4f68190d40663b437d7dbf3530746fbf178a8cdced0ccd5d89919a4992ab6b0de601d0fb52438fdc4686d6feb346e7df7fb7aec3d4648026264e6bdb59047a3f51d5bb9da198cbe58aa8da9e9a9ca2a937ceb802937e7cbdbdade99ba7c743fe53e374e2d511d7e2e20236be99a0c7fb012222eaeb1fa4a9b301b9bfba76464f8e52f77bef5a8f83be5f4ef53b7982026703a45c97241ff585239ae77b3118c2ca8d1522221af07a69f0d3ab2ed987a836178fcdee71a876af754c6b3b9a00201c09a3182f094511146660c9dbca6c0125ede62dd99f0632a833859e6140f26e5acf48528d7993fd6979d3c2d37fb3b16228bb7996be0a93b1da9f57d551f75769171918fb6332aec8a03e0e6a79ca26d6ae7eb8ab6d7ff4d4388006a3631d86e7070032d33af065d5e8fde51865c689593efafa1e9dffa2db91dc667c5b3dee168be8ececa4d4571be4bb3348635f1a7d568531025560eac239dabe9d31f89bacfb1f44c2b87aed3322a2ba6f7befdb7b34713650af1fbe14a213af8eb8f44cadf781d5bef05befbc559719f8f29610934dff77dbc054bbffbb57bf7ec47d8ce63efc486e97c398ea15cbce38d8d64fd7be55711f755372754db6786fb47946342be18dd6316eda8411ed626235a1618cd9e83cd40c373024012540d9cd2e2c2e301906452d63307dea5abbacfa4cfdaa30d417f119edf47f2bb3c5ec8f9e21159f563d0e2c86b6ab9fbe7dd178b9ab58aee0f827cf53b30cb8f4a75d1af3747267c9f29d5dfae38d4ea2c7cd332e2e8d71194ae38b79fb2cef53cf74ffa971d233a6bebe6f6418f5ddb98a99d4be97bee42633147b43be4fcd3c2c1f4ec1b153e3505682dcc90cc5de73c06456c8635ad5efcc7168c2a735635ab39567b75884b25720a0050c38973065da7a29039516b4b7b063e27bc118a75502deca1bbbe47a5ac3a88acf8975131f0fda5d33eb3acb6756a20c66fa69e29f60ec9a8b0d26b3f41979e3c2409e4fab5e81068624ed8aa0d3cfb64fabd723d7180f255a53d7af0ca0d0d833d4a3077ea75103057fb64678f304d92dae2b29a2fb3e47ed4e5f1a230f67463e2a5770fa8d33dc182bab787a3cf451f003eaeee9267d7cb6a3a3931e3f7cc4f4e90ccc10047a6f687d348571f40ce73bc98e7faa4b474727c53e9ea5ee17651f3ea68aadb298aca3a39326129fb7846907256dfc58641c1655ab104b3fc537d7eba1de13f08aa7c743cb9f2d52cce57251d6ee1b30152ac9304ecb742aebf00d9909d3528311c291307871c262bc24fb50fae410c8ccacc44d2b2b1579f75eaaed6a0b72120e4ad03228513de741a9178e844df54cac2634f76beac1e8db2556130d7d94eb68d44faea7edbfb142a33facdfd57a5d0886e47e67a0190751fd4cdf3c32daf34ffa814d00ebda7126db595cc12550a491b5d56c49e74ba0397bedbb670e7f724b1b0f0ec92ed3e52bb0cce6b25dca40ba64335a61d231e5a4c5f44d40da6b1ca66c9f0afe61a038d3ce886573355b44f531eb58d765763d6fb47986aed42644ba5002c091a7ba9e2e945a3a512a9c89a7b4175acf2284da29e916b437bb9987bf5a4b5a0290ddd3f62771b708292e5f573004e767feb27b2584a095375ad6ca13635ad1e8408b4ab34cebb49e08a60bc6f8b4de607971eca60c088ddc106f546bb82883d9df74816de0e2066b94ebded1f6a358e63fa7e99b36d23d018c5ee76703aac7cf9a699f10c3ea4b334cebb49ed0d2a493a73f8c397a3dcdd55b8acb47ef9d321eb71f9cf10a353951421cb96a03aa54e58d316fbc85cefc01e8ba9ce08e9bbebe25d31e44c9eec93eec524ec0700f19d35a31a864118df1166ab91a76db07bf1fe9029b6943eb0eda516168dd0683839f25689a336252afeb32fbe80e9959b877f1204c566590b5336561d47c165d19ae38f34dbf4fa615f92e847bc6beaf1b5acfda665aaea1d89d28a27261fea5a1aecb0d9f7bfae616787b0f0a9a7f89881fa7dd01374a30bc025041761d6813a0b803a3cd33da8da7b5379501ca19ef1bbd8e43cbb476e2dea66ff67806c4e807b84cdbdc772442ebec383a2c7c651e438ba07bc75abe61062ba87f71309dca8222fc9967db68793352e7430faf18cf96e90de569635a35fa57c5362b4e98f649f8b43c4c17ec9fe6f646c57c7ed3dd6eddc0e612a633c4ca37651a6d812fcfd0be884fa537ac43e2d37a0b40427dc60cb2a1abf39747af0b9ca800bf1f87c2a765a09d53dd5d77211c47e73293c6602d668893c2655af5cc5b34dee79eb136bcc3c4b43ce6a85481d172e33eab5df6f4cd2d7e3fc07f2e4df5b759b99cfa2ce46dbad84c4b44a3d78d33aa028022e60c4bc125a1d3b84ca3b5605a1e56043e24f17d32addaa7153a450ca33c7d56182b5eaa61b443e6d32a7adb3d7328fa49ace64f2e746d105e1f24bbc5699657fa2f0f68f0173f353db9702608f0ea17df7e449db5539d764e3e28e80a2e412d2f24e5e8e2cbbfaacbf3c593b8f59ddc2fa96b8c26fe2c70a60dc0b10f9769ffb1f838ccbfa7cd6f653d3fe133751cbc0320c2906b96cffca80a3cff1c91537b721f59a6077f33cf97ae5b70d75d87cce78c681d31ad141798e144e64c2b30935be5d38aeaeb8499d4f5b37b6ca6b5d53e03bb2eb3575aae0f5b00ccecc81b959f7d683d0ba0f64281d3bfec1e0c59745aa625a2c59d3c4effcbfe59aee15f6768ed35f1733e4a7132132d4f2c9035d3122d93ffef6314b8ff80067f7e4c48de81332d3518b3ef4a8ab60556200dd31251f7e504bedb3f61b84faf9f28f24e67fbbd198abd6a3c9d7bee8b0c45be66e7657b3bc668f615f60a39b799c7c55bddb4cf38d1e23e32461f48f768ea77da33811a0b96e249fbf1b502ec1707df4390f6c419d2c98a6136e313aa93052df76919e85fb51e1f3b4c2d2971748bddb9921dc76340a6cf69c198222b1bca80d764e555f43730ad996f24c280768addef21b88f8c51eeafe2bea815d33a4185d9ac9856cd50b6995685562b9f9e6995e7d7fdcf356231ae8252578a8ebde623ef3739a23ff4127d95a3d4bd5eda7f6ccef052578a52affbea2bd3a32af0ee73442c9f57d437d5e34615b8fa0f6b7996bb59119c4e656d11ad50544285b6de1c512d3cd422a6d5efc2d53e2b934954e3377dd39ede2c1f91c540dea839832fecc8b1d456f4bf5866c765cdb2bb94344647fd36593194f16656f4576b378abed999914f208814bb5f4f147d63a4477ddeab53e40dacd5f596fe0d09bd5e36ea2dece435f9a9bc5c136f54be3e7a3dddc8c73531bc859d3ca478cdc0828dbcd796e4f10298ddccd7f3699538ae1497c795ebdb98f9184ccccbdfee322b76bf7fe0d4276ce30f1b4d99cac9df5ae01d76f42ef2f34c5928f46ab38dcf245ade50a9da64dc16a05397a08dcf068add8886ef629779eda07b46f6c10ec3c0b4f1f0a278859a337f500c2b99bc0169631bd568bb42ba50323d1364179b0a8fb4f19944e70220c7219de42c2869686d666da3136c8da05a3c109077fd4a7c4dc1d1722349a2fd3770dbd82cfe1ff8c057264717d2e60000000049454e44ae426082</data>
+ <data format="PNG" length="3559">89504e470d0a1a0a0000000d49484452000000ad0000003008060000006357fade00000dae49444154789ced5d5f685bd719fff450484718cad8835dd8b0cb5c90c706f2dc813d567cf556c729d4de1e6c878e4971caeabeb44efa923445555f5c552d19f683522b60b01b3076068e9c418a95a2227724933c0c72c005b978432e7a708c0872f0cb6f0f57f7eafe39e7de73afe4d4697420fc5add7bcef9ced1777ef777befb1d9940443344d43004801d00003255c421d0f07e9af8cc62dd0e9adc2a0200fcf1555018a0f02217a55960e24e1600f0430fbc894f2fbaaa982fc904ea9d5c046d541dd3217ab780e0329a0edc44c7e8ac020069d69e519da2340b14cb95a68468a2100add88439911dd30aa138ca4f34dc76da22ddade902fedc11f6f2cb35aa13fbeda940c4db444cb1b5002bc5b47cfb046f44e2e361db7895ce45ec897f6e09d74c198d349501ca0f82a280ef4df94a3058b9bc59ac41068a7218e0b602a3e83e058d0f42f1a8b02008ac5e2d32349002497930d5dd0957205d15814c1b1207afa2404c782eedb3f02fb58d81886ad3a18cab02c99029e08e3a20c6003f075fb91edcec3d7ed57ffb1feff5238f25430fba57044b5bf61f6de86693edeba38e16a211f897d0c34afbc433866589112bc9d75a571dd386e702ca8fb22a4817e4cc567000073f373400c9006faf55f562e7bfc1957b1bf510e01bdc3fabafd75336d43ede3a0e903a9ec508316ed1dd63f9fa94be34ab3abe20e053dc3628d3f81d80250a93ed22cdac516eaff22ecead7d13e8a2eec03d0d327999e4028d8ccd713b0cfee7ecf0c11858828414421009e0f9788688888c430f8728e12af7611af84fe99a3ebf7bb84dbe3e1dcebdb34fadb173d09adbd0ccce5b2387bfe9cdabf2405683a1ab3ada743004323a3f4e0db07cc314952802e8c8d53fb4b2f7a7afb24ec3fda27ef492faddd4d51c2e3f168db4ba533b87ce532ed3fda275f878ffa6f7ce151ec4cdce8a2f5fb01da7fb4af6bdfd7e1a39e6e3f5d78f782bebd18d079439eeba94fa728f0ca1f3cd3f1194c7f3eadd66d6969a5efbfdf2522a2cd77729418d5dba3a06237ab6cdecfc9fd02089c39adb6a72dde935e5a9352b43bb64bad2fbce011b5cf7bd2ab8e57b50fc0f4b5042dddba69eaaba5a595526756e860f8809effe94f3c0922fdca73f386cbaa38d5b0766fd084721860d668d2403f500056d319a115afd4ede993e4815499f6ad8b132a23f5f449401928f4157532c4d85e7160cf743d1a8b9aedbb0d04c782baf68cda50c788a5eae70c4daafcf7a570843f5f15b6e6c71ae4bd89a63f69a01f006409559d07e5fee2c05e7df61918bf38b0277f5e00068747f4f35d657a956943cb595c5f77c1882d29c2f90073c58688e8ba43e6b6c2c895216af5b099c3c8949d2ff3d99f485ef1be8e760af40568746454cf680072eb39eaeafa9d89a13bbbfd50dad8bc9fa3e96b09d232c9eaf24a8d790c766cdecfd1caad15baf8e1fbaa0de363211a1d3dabef671ee8fc4c5f2fe1f178629abec7c7c669fccd739ed05810dfacafebc6e6ebf0517078844ebf36e0999f9fc3da7f46e9f17e888888baba7b69fc7c481eafa19fc13383d4fec1fbf6f3c018972bfbce9ca6d0f91029d72529405dd198eefbbd1c8ee0e6ad9b4444d4e3f753efe7d73db28638ac2f1eabe422984aa9714ceb389a00201a8ba2b2201645509981d15e3697052afacd5bb63b0fe4a03285896148de4d1b1949aa326fb63b2f6f5a78f66fd4184ad9cd33edbd6dd0f08671b0c6abf48b1ccce3b19857e4a0ce83b63d6513ebd43e6ce9fb1f1c1ed1313ad2307d7f002033ad0b2dab45ffaf86283742ccf2c937db74f1cb7657edd6a36d8db85b2ca2b5b595525faf51e0412f0d7d65d6ac5a2d37fede055abf9f33e94dd6fd0f63515cbff1051191aa6db7bfdda6d1f321b57ef44a844ebf36e03132b551036bb5f0dbefbeadb619faeaae10934dfc7bddc454bbffdb56af9ff09ea2e98f3f51c7c9624c2da33a9907c7f6093c11b5c57bd24babcb2bb2c7fbe3f533a25589ae358e71f3168ce81493cb491d634cc567a065b89e3e09a800ca6e766e7e8ec93028ea1983a9a9abfdb2eadb454194fa229ad1c9f8b3b92c733c46865434ad761e580cedd43e63ffa2f1724fb15cc10b9f3d4ff532e0e29f7769c8d7ca5d254b0f76e94fb75a891ed7cfb8b832c465289d16f377d9dea75de9c1e1113232a6b17e60a01feaee5cc34c5aed652c9b63394abc29dfa7651e96865370687804ca9360f34c8e121fb860323be431ade673e63cd4a169ad98d6eac9b35b2c42d92b10d000069c4e5a32ad5aaa6fcceaed6f6ec3427bc11ca75502de4affabe98c8e5115cd89b485c6837ed7ccbaced2cc4a94c1ca3e5dfc138c5d73b1c664b69a91372f0ce4695aed13a8a74fd233b0c13ec79ad66847a1765d89d6a8f69501946a7b06357a10741b3550f0e72b84b74e93d3e2b99622fa3ee0aadf892b43e4e3acc883720567df3cc78db1b28aafc3479f843fa2f68e7632c6675b5a5ae9f1a303a6a633314318e8bca5d7680ae318198e17ffd4969696564a7c3a45ed2fc91a3ea189adb298aca5a5954693b71bc2b4bd923e7e2c320ff39aa710cb3e459b1bedd0ee0978c5d7e1a3a52fe629e1f178a8e8f40d9806956418b765229577f986cc8269a9c608d15814bc386165016c0d852a3357e3a6b82d332c2ad55d6d494ec241057a062552731e947ad158d4d2cee4725277bfae9ed12ee57ec51ee53a6af556d319e76fac501b0ff3738d5d97c21179dc39e8e641d43ecb378f8cfe8263416003405a3fcfe4388b2bbc088ad5b2b6ea2d99c21e68da59ffdec9e39fdcd2c4a34372ca747b806d3697e35206f21587d10a8b8129272d26ee0052b97698b2792af8c781e24c3b2996cd556f11b5c76a606d57d9f5fcf1fa19ba525d10999d3d009cf634d7333b7b0d5d2815cec253fa8ba4f388a07a4aba01fd4ddd2b20886ad212807c493f9ee45611d2ac7c5dc108dc9ff9cb97f61081bebdc1437d7b624c2b1a1d6850a99769ddd613c17cc91c9f363a2c2f8e5d9703a1961be28feb1d176530c79bd9415de39dba676ed7bba51f47e590ff3d4ddc7190ee096070819f0da89d3f7ba67d420c6b2cf530addb7a428f26437bc6c398830b19aeddd22cc0634a11c6e38e83335f913a174a84d3aed6812a87f2c69837df4267fe00b45d4d72e7cd58df96698fa2e44bb2865ddc1470dc63c6b4760c2ad94463fca56aae86d3fec11f476687cdb491b48b7e3418493b6070f0b3042d73462ceab55d651fdd212b0ff7cf1f85cb6a1cb27aa62c8aaa6631947e70ecb2d1a63f24d38afc2e8477d2b9d68da4f38e9996eb284e178a68bbb0fea5a1b6ab35cd3d71270bdede83c2d6bf44c48fd36e811b25e8bf095049960eb401d0ac0ba72d32fa9dcde86f2a035430df37b88063cbb44ee2de966ff6780ec41807b84c5bdfef4844d2ec383a6cb4328fa145d0bb65dfbe69052b687c713091ca8362fc95e7d869792bd2a0a1fb6f9acf96191de569635a2d0697c5362b6e98f649685a1e66769c9fe6f6c7c534bfe56e5775b0e9a4e50ab1d3a64ca72df1db33f52fa2a98c8e754c34adbf0424b567cc203bba367f797041e04405f8e338169a96814e4e75b7ed40388ece65269dc3daac103785cbb4da95376fbecf3b69ef78c7896979cc513904060f6bf7d9edb227ee64f9e300ff7ba96bbcf5b6cba9cf42dea68bcdb44434b8605e510040316b86a5f0a2d0695ca6d3da30ad48bcee3832ad56d30a9d2286b93d6356182b5eaa63b463a66915bb9d9e3914fd49acfa4f2eb4ad11dee825a7c56d9657e6af0fa9f7973fb33cb9702e0cf0ea17df39a0d6eaa94e27271f14f48417a16d2f226dd2e5577eadb617985dc5ddefe471496d4334fa17b1336da73e5ea2fdc7e2f330f3813ebf95f5fd099fa9e3e003003146bb56f9cc0787c0f3cf11b9f527ef89257af89e75beb4eac16d3bee99ef4931ad342bb0c289ac99566025374ad38adaeb8699b4f5f39cb3788efa6760db55f69396ab6177002b3ff2c7e5ef3e92ce03a8be50e08caf5886298b4ecfb44434bf51c0d97f383fcbd5ff9b1cadbc2e7ece47296e56a2ed8905b2675aa2250a5e19a2d07f1f52ef2f4e09b577e44c4b35c6ecba96a2758127908e6989a8fd6a12dfed9f36dd67b44f1479a7b383fe1c255e339fcebdf0658e62dfb0f3b2fd2d4334f52afb09397daf80cb77db699f71a2c57b62883e92b669fcf7fa33813a0f9666579dc7d7782771ad8a8bdf4390cae20ce9e68961b5e2939a93050dd7b40c0c2edbcf8f13a6969438bacdee5cc98ee331205373da30a6c8930d65c06ff1e455ec3731ad953612614027c5e9ef21784f0cd1e6dfc4b5a81dd3ba4185d9ec9856cb508e995683764f3e23d32adf5ffbdf5788c5b80a4a6d293a351c20ffbf3689fed849f4f526a5b63b69ffb135c34b6d294abd11509f4c0787c0fbcf11b134afa83635e21a009e5f68dbb3ddcd8ae0442aef886885a2121a74f4e688aae1a10631ad7117aed5ac4c26d1ccdfc41d6776b334228b81fc716b069fdb90f31b1a31feca213b2e6b95dda5a431ba1ab7c51343996f66c5a032f1a26f7626e5130822c5e9af278abe3132a231efd52df226d6ee7a43ff8684d12e07f5e6360abafc545eae893f2e5f1f5cc8d4f2712d1c6f6ea30069b6ea60e15ade6b43f278014cdd2ba8f9b44a1c579a95e795ab6dac3406138bf26f775915a7bf7fe0561336f1c78d964ce5e66f2df00e3bfae7f979a62c147ab5d9c46712ed6f44e3b4a128ba95044d7c3650ec46d4b48b53e67582de4959831d878969e2f145f10a55317f540c2b59bc01696213b5e8b8426667cff24c9053ac2b3cd2c46712dd3700390ee926674149436b326b13dd60631aaac6030179d7afc4d7141c3cac254934ff066e13ebc5ff03f80a74e54cacfca30000000049454e44ae426082</data>
</image>
</images>
<connections>
diff --git a/src/gui/qt/jpushbutton.cpp b/src/gui/qt/jpushbutton.cpp
index f6c266c1c72b84edd17b60402c0d99cee90240ef..4259b5acc695e27c99b33794c56b1891ac0a8d18 100644
--- a/src/gui/qt/jpushbutton.cpp
+++ b/src/gui/qt/jpushbutton.cpp
@@ -71,9 +71,6 @@ JPushButton::~JPushButton (void) {
// This loads the pixmaps used for pressed/released state.
void
JPushButton::loadPixmaps (const char* pixname) {
-// this->btnImg[0] = new QImage (QString(pixname) + REL_PREFIX + ".png");
-// this->btnImg[1] = new QImage (QString(pixname) + PRESS_PREFIX + ".png");
-
QString pressedPixmapPath, releasedPixmapPath;
pressedPixmapPath = Skin::getPath(QString(SKINDIR),
@@ -96,11 +93,7 @@ JPushButton::MyCreateHeuristicMask (const QImage & img_XX, QImage &m,
return -1;
}
- //if ( img.depth() != 32 )
- //{
- QImage img = img_XX.convertDepth(32);
- //return MyCreateHeuristicMask( img32, m, transp_col);
- //}
+ QImage img = img_XX.convertDepth(32);
int w = img.width();
int h = img.height();
diff --git a/src/gui/qt/numerickeypad.cpp b/src/gui/qt/numerickeypad.cpp
index 48035a40608ffdb7cb4addc3a2a445a0614e0f67..21f4fb5e10fba68977add740ed5df72fc1b4976f 100644
--- a/src/gui/qt/numerickeypad.cpp
+++ b/src/gui/qt/numerickeypad.cpp
@@ -1,5 +1,5 @@
/**
- * Copyright (C) 2004 Savoir-Faire Linux inc.
+ * Copyright (C) 2004-2005 Savoir-Faire Linux inc.
* Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/gui/qt/numerickeypad.h b/src/gui/qt/numerickeypad.h
index 884bbbcd0473dea29f89f7a94f37963e67caf5ab..513929ae7d4ff6e31fb513e8ab5f0391594eb1d7 100644
--- a/src/gui/qt/numerickeypad.h
+++ b/src/gui/qt/numerickeypad.h
@@ -1,5 +1,5 @@
/**
- * Copyright (C) 2004 Savoir-Faire Linux inc.
+ * Copyright (C) 2004-2005 Savoir-Faire Linux inc.
* Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/main.cpp b/src/main.cpp
index 3698e154ce0146ebd9e1d4d5b2ef86652df3aae8..e23dd3dacd7184e50c883749f0a790c264b42e25 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -17,8 +17,6 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <getopt.h>
-
#define GUI_QT // remove when others UI are implemented
#if defined(GUI_QT)