summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--bin/kdepim/LICENCE.TXT59
-rw-r--r--gammu/emb/gammu/gammu.pro16
-rw-r--r--kaddressbook/mainembedded.cpp1
3 files changed, 14 insertions, 62 deletions
diff --git a/bin/kdepim/LICENCE.TXT b/bin/kdepim/LICENCE.TXT
index 4d564f3..10e09f7 100644
--- a/bin/kdepim/LICENCE.TXT
+++ b/bin/kdepim/LICENCE.TXT
@@ -1,341 +1,282 @@
1 GNU GENERAL PUBLIC LICENSE 1 GNU GENERAL PUBLIC LICENSE
2 Version 2, June 1991 2 Version 2, June 1991
3 3
4 Copyright (C) 1989, 1991 Free Software Foundation, Inc. 4 Copyright (C) 1989, 1991 Free Software Foundation, Inc.
5 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 5 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
6 Everyone is permitted to copy and distribute verbatim copies 6 Everyone is permitted to copy and distribute verbatim copies
7 of this license document, but changing it is not allowed. 7 of this license document, but changing it is not allowed.
8 8
9 Preamble 9 Preamble
10 10
11 The licenses for most software are designed to take away your 11 The licenses for most software are designed to take away your
12 freedom to share and change it. By contrast, the GNU General Public 12 freedom to share and change it. By contrast, the GNU General Public
13 License is intended to guarantee your freedom to share and change free 13 License is intended to guarantee your freedom to share and change free
14 software--to make sure the software is free for all its users. This 14 software--to make sure the software is free for all its users. This
15 General Public License applies to most of the Free Software 15 General Public License applies to most of the Free Software
16 Foundation's software and to any other program whose authors commit to 16 Foundation's software and to any other program whose authors commit to
17 using it. (Some other Free Software Foundation software is covered by 17 using it. (Some other Free Software Foundation software is covered by
18 the GNU Library General Public License instead.) You can apply it to 18 the GNU Library General Public License instead.) You can apply it to
19 your programs, too. 19 your programs, too.
20 20
21 When we speak of free software, we are referring to freedom, not 21 When we speak of free software, we are referring to freedom, not
22 price. Our General Public Licenses are designed to make sure that you 22 price. Our General Public Licenses are designed to make sure that you
23 have the freedom to distribute copies of free software (and charge for 23 have the freedom to distribute copies of free software (and charge for
24 this service if you wish), that you receive source code or can get it 24 this service if you wish), that you receive source code or can get it
25 if you want it, that you can change the software or use pieces of it 25 if you want it, that you can change the software or use pieces of it
26 in new free programs; and that you know you can do these things. 26 in new free programs; and that you know you can do these things.
27 27
28 To protect your rights, we need to make restrictions that forbid 28 To protect your rights, we need to make restrictions that forbid
29 anyone to deny you these rights or to ask you to surrender the rights. 29 anyone to deny you these rights or to ask you to surrender the rights.
30 These restrictions translate to certain responsibilities for you if you 30 These restrictions translate to certain responsibilities for you if you
31 distribute copies of the software, or if you modify it. 31 distribute copies of the software, or if you modify it.
32 32
33 For example, if you distribute copies of such a program, whether 33 For example, if you distribute copies of such a program, whether
34 gratis or for a fee, you must give the recipients all the rights that 34 gratis or for a fee, you must give the recipients all the rights that
35 you have. You must make sure that they, too, receive or can get the 35 you have. You must make sure that they, too, receive or can get the
36 source code. And you must show them these terms so they know their 36 source code. And you must show them these terms so they know their
37 rights. 37 rights.
38 38
39 We protect your rights with two steps: (1) copyright the software, and 39 We protect your rights with two steps: (1) copyright the software, and
40 (2) offer you this license which gives you legal permission to copy, 40 (2) offer you this license which gives you legal permission to copy,
41 distribute and/or modify the software. 41 distribute and/or modify the software.
42 42
43 Also, for each author's protection and ours, we want to make certain 43 Also, for each author's protection and ours, we want to make certain
44 that everyone understands that there is no warranty for this free 44 that everyone understands that there is no warranty for this free
45 software. If the software is modified by someone else and passed on, we 45 software. If the software is modified by someone else and passed on, we
46 want its recipients to know that what they have is not the original, so 46 want its recipients to know that what they have is not the original, so
47 that any problems introduced by others will not reflect on the original 47 that any problems introduced by others will not reflect on the original
48 authors' reputations. 48 authors' reputations.
49 49
50 Finally, any free program is threatened constantly by software 50 Finally, any free program is threatened constantly by software
51 patents. We wish to avoid the danger that redistributors of a free 51 patents. We wish to avoid the danger that redistributors of a free
52 program will individually obtain patent licenses, in effect making the 52 program will individually obtain patent licenses, in effect making the
53 program proprietary. To prevent this, we have made it clear that any 53 program proprietary. To prevent this, we have made it clear that any
54 patent must be licensed for everyone's free use or not licensed at all. 54 patent must be licensed for everyone's free use or not licensed at all.
55 55
56 The precise terms and conditions for copying, distribution and 56 The precise terms and conditions for copying, distribution and
57 modification follow. 57 modification follow.
58 58
59 GNU GENERAL PUBLIC LICENSE 59 GNU GENERAL PUBLIC LICENSE
60 TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 60 TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
61 61
62 0. This License applies to any program or other work which contains 62 0. This License applies to any program or other work which contains
63 a notice placed by the copyright holder saying it may be distributed 63 a notice placed by the copyright holder saying it may be distributed
64 under the terms of this General Public License. The "Program", below, 64 under the terms of this General Public License. The "Program", below,
65 refers to any such program or work, and a "work based on the Program" 65 refers to any such program or work, and a "work based on the Program"
66 means either the Program or any derivative work under copyright law: 66 means either the Program or any derivative work under copyright law:
67 that is to say, a work containing the Program or a portion of it, 67 that is to say, a work containing the Program or a portion of it,
68 either verbatim or with modifications and/or translated into another 68 either verbatim or with modifications and/or translated into another
69 language. (Hereinafter, translation is included without limitation in 69 language. (Hereinafter, translation is included without limitation in
70 the term "modification".) Each licensee is addressed as "you". 70 the term "modification".) Each licensee is addressed as "you".
71 71
72 Activities other than copying, distribution and modification are not 72 Activities other than copying, distribution and modification are not
73 covered by this License; they are outside its scope. The act of 73 covered by this License; they are outside its scope. The act of
74 running the Program is not restricted, and the output from the Program 74 running the Program is not restricted, and the output from the Program
75 is covered only if its contents constitute a work based on the 75 is covered only if its contents constitute a work based on the
76 Program (independent of having been made by running the Program). 76 Program (independent of having been made by running the Program).
77 Whether that is true depends on what the Program does. 77 Whether that is true depends on what the Program does.
78 78
79 1. You may copy and distribute verbatim copies of the Program's 79 1. You may copy and distribute verbatim copies of the Program's
80 source code as you receive it, in any medium, provided that you 80 source code as you receive it, in any medium, provided that you
81 conspicuously and appropriately publish on each copy an appropriate 81 conspicuously and appropriately publish on each copy an appropriate
82 copyright notice and disclaimer of warranty; keep intact all the 82 copyright notice and disclaimer of warranty; keep intact all the
83 notices that refer to this License and to the absence of any warranty; 83 notices that refer to this License and to the absence of any warranty;
84 and give any other recipients of the Program a copy of this License 84 and give any other recipients of the Program a copy of this License
85 along with the Program. 85 along with the Program.
86 86
87 You may charge a fee for the physical act of transferring a copy, and 87 You may charge a fee for the physical act of transferring a copy, and
88 you may at your option offer warranty protection in exchange for a fee. 88 you may at your option offer warranty protection in exchange for a fee.
89 89
90 2. You may modify your copy or copies of the Program or any portion 90 2. You may modify your copy or copies of the Program or any portion
91 of it, thus forming a work based on the Program, and copy and 91 of it, thus forming a work based on the Program, and copy and
92 distribute such modifications or work under the terms of Section 1 92 distribute such modifications or work under the terms of Section 1
93 above, provided that you also meet all of these conditions: 93 above, provided that you also meet all of these conditions:
94 94
95 a) You must cause the modified files to carry prominent notices 95 a) You must cause the modified files to carry prominent notices
96 stating that you changed the files and the date of any change. 96 stating that you changed the files and the date of any change.
97 97
98 b) You must cause any work that you distribute or publish, that in 98 b) You must cause any work that you distribute or publish, that in
99 whole or in part contains or is derived from the Program or any 99 whole or in part contains or is derived from the Program or any
100 part thereof, to be licensed as a whole at no charge to all third 100 part thereof, to be licensed as a whole at no charge to all third
101 parties under the terms of this License. 101 parties under the terms of this License.
102 102
103 c) If the modified program normally reads commands interactively 103 c) If the modified program normally reads commands interactively
104 when run, you must cause it, when started running for such 104 when run, you must cause it, when started running for such
105 interactive use in the most ordinary way, to print or display an 105 interactive use in the most ordinary way, to print or display an
106 announcement including an appropriate copyright notice and a 106 announcement including an appropriate copyright notice and a
107 notice that there is no warranty (or else, saying that you provide 107 notice that there is no warranty (or else, saying that you provide
108 a warranty) and that users may redistribute the program under 108 a warranty) and that users may redistribute the program under
109 these conditions, and telling the user how to view a copy of this 109 these conditions, and telling the user how to view a copy of this
110 License. (Exception: if the Program itself is interactive but 110 License. (Exception: if the Program itself is interactive but
111 does not normally print such an announcement, your work based on 111 does not normally print such an announcement, your work based on
112 the Program is not required to print an announcement.) 112 the Program is not required to print an announcement.)
113 113
114 These requirements apply to the modified work as a whole. If 114 These requirements apply to the modified work as a whole. If
115 identifiable sections of that work are not derived from the Program, 115 identifiable sections of that work are not derived from the Program,
116 and can be reasonably considered independent and separate works in 116 and can be reasonably considered independent and separate works in
117 themselves, then this License, and its terms, do not apply to those 117 themselves, then this License, and its terms, do not apply to those
118 sections when you distribute them as separate works. But when you 118 sections when you distribute them as separate works. But when you
119 distribute the same sections as part of a whole which is a work based 119 distribute the same sections as part of a whole which is a work based
120 on the Program, the distribution of the whole must be on the terms of 120 on the Program, the distribution of the whole must be on the terms of
121 this License, whose permissions for other licensees extend to the 121 this License, whose permissions for other licensees extend to the
122 entire whole, and thus to each and every part regardless of who wrote it. 122 entire whole, and thus to each and every part regardless of who wrote it.
123 123
124 Thus, it is not the intent of this section to claim rights or contest 124 Thus, it is not the intent of this section to claim rights or contest
125 your rights to work written entirely by you; rather, the intent is to 125 your rights to work written entirely by you; rather, the intent is to
126 exercise the right to control the distribution of derivative or 126 exercise the right to control the distribution of derivative or
127 collective works based on the Program. 127 collective works based on the Program.
128 128
129 In addition, mere aggregation of another work not based on the Program 129 In addition, mere aggregation of another work not based on the Program
130 with the Program (or with a work based on the Program) on a volume of 130 with the Program (or with a work based on the Program) on a volume of
131 a storage or distribution medium does not bring the other work under 131 a storage or distribution medium does not bring the other work under
132 the scope of this License. 132 the scope of this License.
133 133
134 3. You may copy and distribute the Program (or a work based on it, 134 3. You may copy and distribute the Program (or a work based on it,
135 under Section 2) in object code or executable form under the terms of 135 under Section 2) in object code or executable form under the terms of
136 Sections 1 and 2 above provided that you also do one of the following: 136 Sections 1 and 2 above provided that you also do one of the following:
137 137
138 a) Accompany it with the complete corresponding machine-readable 138 a) Accompany it with the complete corresponding machine-readable
139 source code, which must be distributed under the terms of Sections 139 source code, which must be distributed under the terms of Sections
140 1 and 2 above on a medium customarily used for software interchange; or, 140 1 and 2 above on a medium customarily used for software interchange; or,
141 141
142 b) Accompany it with a written offer, valid for at least three 142 b) Accompany it with a written offer, valid for at least three
143 years, to give any third party, for a charge no more than your 143 years, to give any third party, for a charge no more than your
144 cost of physically performing source distribution, a complete 144 cost of physically performing source distribution, a complete
145 machine-readable copy of the corresponding source code, to be 145 machine-readable copy of the corresponding source code, to be
146 distributed under the terms of Sections 1 and 2 above on a medium 146 distributed under the terms of Sections 1 and 2 above on a medium
147 customarily used for software interchange; or, 147 customarily used for software interchange; or,
148 148
149 c) Accompany it with the information you received as to the offer 149 c) Accompany it with the information you received as to the offer
150 to distribute corresponding source code. (This alternative is 150 to distribute corresponding source code. (This alternative is
151 allowed only for noncommercial distribution and only if you 151 allowed only for noncommercial distribution and only if you
152 received the program in object code or executable form with such 152 received the program in object code or executable form with such
153 an offer, in accord with Subsection b above.) 153 an offer, in accord with Subsection b above.)
154 154
155 The source code for a work means the preferred form of the work for 155 The source code for a work means the preferred form of the work for
156 making modifications to it. For an executable work, complete source 156 making modifications to it. For an executable work, complete source
157 code means all the source code for all modules it contains, plus any 157 code means all the source code for all modules it contains, plus any
158 associated interface definition files, plus the scripts used to 158 associated interface definition files, plus the scripts used to
159 control compilation and installation of the executable. However, as a 159 control compilation and installation of the executable. However, as a
160 special exception, the source code distributed need not include 160 special exception, the source code distributed need not include
161 anything that is normally distributed (in either source or binary 161 anything that is normally distributed (in either source or binary
162 form) with the major components (compiler, kernel, and so on) of the 162 form) with the major components (compiler, kernel, and so on) of the
163 operating system on which the executable runs, unless that component 163 operating system on which the executable runs, unless that component
164 itself accompanies the executable. 164 itself accompanies the executable.
165 165
166 If distribution of executable or object code is made by offering 166 If distribution of executable or object code is made by offering
167 access to copy from a designated place, then offering equivalent 167 access to copy from a designated place, then offering equivalent
168 access to copy the source code from the same place counts as 168 access to copy the source code from the same place counts as
169 distribution of the source code, even though third parties are not 169 distribution of the source code, even though third parties are not
170 compelled to copy the source along with the object code. 170 compelled to copy the source along with the object code.
171 171
172 4. You may not copy, modify, sublicense, or distribute the Program 172 4. You may not copy, modify, sublicense, or distribute the Program
173 except as expressly provided under this License. Any attempt 173 except as expressly provided under this License. Any attempt
174 otherwise to copy, modify, sublicense or distribute the Program is 174 otherwise to copy, modify, sublicense or distribute the Program is
175 void, and will automatically terminate your rights under this License. 175 void, and will automatically terminate your rights under this License.
176 However, parties who have received copies, or rights, from you under 176 However, parties who have received copies, or rights, from you under
177 this License will not have their licenses terminated so long as such 177 this License will not have their licenses terminated so long as such
178 parties remain in full compliance. 178 parties remain in full compliance.
179 179
180 5. You are not required to accept this License, since you have not 180 5. You are not required to accept this License, since you have not
181 signed it. However, nothing else grants you permission to modify or 181 signed it. However, nothing else grants you permission to modify or
182 distribute the Program or its derivative works. These actions are 182 distribute the Program or its derivative works. These actions are
183 prohibited by law if you do not accept this License. Therefore, by 183 prohibited by law if you do not accept this License. Therefore, by
184 modifying or distributing the Program (or any work based on the 184 modifying or distributing the Program (or any work based on the
185 Program), you indicate your acceptance of this License to do so, and 185 Program), you indicate your acceptance of this License to do so, and
186 all its terms and conditions for copying, distributing or modifying 186 all its terms and conditions for copying, distributing or modifying
187 the Program or works based on it. 187 the Program or works based on it.
188 188
189 6. Each time you redistribute the Program (or any work based on the 189 6. Each time you redistribute the Program (or any work based on the
190 Program), the recipient automatically receives a license from the 190 Program), the recipient automatically receives a license from the
191 original licensor to copy, distribute or modify the Program subject to 191 original licensor to copy, distribute or modify the Program subject to
192 these terms and conditions. You may not impose any further 192 these terms and conditions. You may not impose any further
193 restrictions on the recipients' exercise of the rights granted herein. 193 restrictions on the recipients' exercise of the rights granted herein.
194 You are not responsible for enforcing compliance by third parties to 194 You are not responsible for enforcing compliance by third parties to
195 this License. 195 this License.
196 196
197 7. If, as a consequence of a court judgment or allegation of patent 197 7. If, as a consequence of a court judgment or allegation of patent
198 infringement or for any other reason (not limited to patent issues), 198 infringement or for any other reason (not limited to patent issues),
199 conditions are imposed on you (whether by court order, agreement or 199 conditions are imposed on you (whether by court order, agreement or
200 otherwise) that contradict the conditions of this License, they do not 200 otherwise) that contradict the conditions of this License, they do not
201 excuse you from the conditions of this License. If you cannot 201 excuse you from the conditions of this License. If you cannot
202 distribute so as to satisfy simultaneously your obligations under this 202 distribute so as to satisfy simultaneously your obligations under this
203 License and any other pertinent obligations, then as a consequence you 203 License and any other pertinent obligations, then as a consequence you
204 may not distribute the Program at all. For example, if a patent 204 may not distribute the Program at all. For example, if a patent
205 license would not permit royalty-free redistribution of the Program by 205 license would not permit royalty-free redistribution of the Program by
206 all those who receive copies directly or indirectly through you, then 206 all those who receive copies directly or indirectly through you, then
207 the only way you could satisfy both it and this License would be to 207 the only way you could satisfy both it and this License would be to
208 refrain entirely from distribution of the Program. 208 refrain entirely from distribution of the Program.
209 209
210 If any portion of this section is held invalid or unenforceable under 210 If any portion of this section is held invalid or unenforceable under
211 any particular circumstance, the balance of the section is intended to 211 any particular circumstance, the balance of the section is intended to
212 apply and the section as a whole is intended to apply in other 212 apply and the section as a whole is intended to apply in other
213 circumstances. 213 circumstances.
214 214
215 It is not the purpose of this section to induce you to infringe any 215 It is not the purpose of this section to induce you to infringe any
216 patents or other property right claims or to contest validity of any 216 patents or other property right claims or to contest validity of any
217 such claims; this section has the sole purpose of protecting the 217 such claims; this section has the sole purpose of protecting the
218 integrity of the free software distribution system, which is 218 integrity of the free software distribution system, which is
219 implemented by public license practices. Many people have made 219 implemented by public license practices. Many people have made
220 generous contributions to the wide range of software distributed 220 generous contributions to the wide range of software distributed
221 through that system in reliance on consistent application of that 221 through that system in reliance on consistent application of that
222 system; it is up to the author/donor to decide if he or she is willing 222 system; it is up to the author/donor to decide if he or she is willing
223 to distribute software through any other system and a licensee cannot 223 to distribute software through any other system and a licensee cannot
224 impose that choice. 224 impose that choice.
225 225
226 This section is intended to make thoroughly clear what is believed to 226 This section is intended to make thoroughly clear what is believed to
227 be a consequence of the rest of this License. 227 be a consequence of the rest of this License.
228 228
229 8. If the distribution and/or use of the Program is restricted in 229 8. If the distribution and/or use of the Program is restricted in
230 certain countries either by patents or by copyrighted interfaces, the 230 certain countries either by patents or by copyrighted interfaces, the
231 original copyright holder who places the Program under this License 231 original copyright holder who places the Program under this License
232 may add an explicit geographical distribution limitation excluding 232 may add an explicit geographical distribution limitation excluding
233 those countries, so that distribution is permitted only in or among 233 those countries, so that distribution is permitted only in or among
234 countries not thus excluded. In such case, this License incorporates 234 countries not thus excluded. In such case, this License incorporates
235 the limitation as if written in the body of this License. 235 the limitation as if written in the body of this License.
236 236
237 9. The Free Software Foundation may publish revised and/or new versions 237 9. The Free Software Foundation may publish revised and/or new versions
238 of the General Public License from time to time. Such new versions will 238 of the General Public License from time to time. Such new versions will
239 be similar in spirit to the present version, but may differ in detail to 239 be similar in spirit to the present version, but may differ in detail to
240 address new problems or concerns. 240 address new problems or concerns.
241 241
242 Each version is given a distinguishing version number. If the Program 242 Each version is given a distinguishing version number. If the Program
243 specifies a version number of this License which applies to it and "any 243 specifies a version number of this License which applies to it and "any
244 later version", you have the option of following the terms and conditions 244 later version", you have the option of following the terms and conditions
245 either of that version or of any later version published by the Free 245 either of that version or of any later version published by the Free
246 Software Foundation. If the Program does not specify a version number of 246 Software Foundation. If the Program does not specify a version number of
247 this License, you may choose any version ever published by the Free Software 247 this License, you may choose any version ever published by the Free Software
248 Foundation. 248 Foundation.
249 249
250 10. If you wish to incorporate parts of the Program into other free 250 10. If you wish to incorporate parts of the Program into other free
251 programs whose distribution conditions are different, write to the author 251 programs whose distribution conditions are different, write to the author
252 to ask for permission. For software which is copyrighted by the Free 252 to ask for permission. For software which is copyrighted by the Free
253 Software Foundation, write to the Free Software Foundation; we sometimes 253 Software Foundation, write to the Free Software Foundation; we sometimes
254 make exceptions for this. Our decision will be guided by the two goals 254 make exceptions for this. Our decision will be guided by the two goals
255 of preserving the free status of all derivatives of our free software and 255 of preserving the free status of all derivatives of our free software and
256 of promoting the sharing and reuse of software generally. 256 of promoting the sharing and reuse of software generally.
257 257
258 NO WARRANTY 258 NO WARRANTY
259 259
260 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY 260 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
261 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN 261 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
262 OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES 262 OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
263 PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED 263 PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
264 OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 264 OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
265 MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS 265 MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
266 TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE 266 TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
267 PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, 267 PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
268 REPAIR OR CORRECTION. 268 REPAIR OR CORRECTION.
269 269
270 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING 270 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
271 WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR 271 WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
272 REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, 272 REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
273 INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING 273 INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
274 OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED 274 OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
275 TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY 275 TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
276 YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER 276 YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
277 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE 277 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
278 POSSIBILITY OF SUCH DAMAGES. 278 POSSIBILITY OF SUCH DAMAGES.
279 279
280 END OF TERMS AND CONDITIONS 280 END OF TERMS AND CONDITIONS
281
282 How to Apply These Terms to Your New Programs
283
284 If you develop a new program, and you want it to be of the greatest
285 possible use to the public, the best way to achieve this is to make it
286 free software which everyone can redistribute and change under these terms.
287
288 To do so, attach the following notices to the program. It is safest
289 to attach them to the start of each source file to most effectively
290 convey the exclusion of warranty; and each file should have at least
291 the "copyright" line and a pointer to where the full notice is found.
292
293 <one line to give the program's name and a brief idea of what it does.>
294 Copyright (C) <year> <name of author>
295
296 This program is free software; you can redistribute it and/or modify
297 it under the terms of the GNU General Public License as published by
298 the Free Software Foundation; either version 2 of the License, or
299 (at your option) any later version.
300
301 This program is distributed in the hope that it will be useful,
302 but WITHOUT ANY WARRANTY; without even the implied warranty of
303 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
304 GNU General Public License for more details.
305
306 You should have received a copy of the GNU General Public License
307 along with this program; if not, write to the Free Software
308 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
309
310
311 Also add information on how to contact you by electronic and paper mail.
312
313 If the program is interactive, make it output a short notice like this
314 when it starts in an interactive mode:
315
316 Gnomovision version 69, Copyright (C) year name of author
317 Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
318 This is free software, and you are welcome to redistribute it
319 under certain conditions; type `show c' for details.
320
321 The hypothetical commands `show w' and `show c' should show the appropriate
322 parts of the General Public License. Of course, the commands you use may
323 be called something other than `show w' and `show c'; they could even be
324 mouse-clicks or menu items--whatever suits your program.
325
326 You should also get your employer (if you work as a programmer) or your
327 school, if any, to sign a "copyright disclaimer" for the program, if
328 necessary. Here is a sample; alter the names:
329
330 Yoyodyne, Inc., hereby disclaims all copyright interest in the program
331 `Gnomovision' (which makes passes at compilers) written by James Hacker.
332
333 <signature of Ty Coon>, 1 April 1989
334 Ty Coon, President of Vice
335 281
336 This General Public License does not permit incorporating your program into
337 proprietary programs. If your program is a subroutine library, you may
338 consider it more useful to permit linking proprietary applications with the
339 library. If this is what you want to do, use the GNU Library General
340 Public License instead of this License.
341 \ No newline at end of file 282 \ No newline at end of file
diff --git a/gammu/emb/gammu/gammu.pro b/gammu/emb/gammu/gammu.pro
index 299de7f..22476a1 100644
--- a/gammu/emb/gammu/gammu.pro
+++ b/gammu/emb/gammu/gammu.pro
@@ -1,52 +1,62 @@
1###################################################################### 1######################################################################
2# Automatically generated by qmake (1.07a) Fri Jul 30 22:22:02 2004 2# Automatically generated by qmake (1.07a) Fri Jul 30 22:22:02 2004
3###################################################################### 3######################################################################
4 4
5TEMPLATE = app 5TEMPLATE = app
6DEPENDPATH += msvc06.mak \ 6DEPENDPATH += msvc06.mak \
7 msvc2003.mak \ 7 msvc2003.mak \
8 smsd \ 8 smsd \
9 depend/nokia \ 9 depend/nokia \
10 depend/siemens \ 10 depend/siemens \
11 depend/nokia/dct3trac 11 depend/nokia/dct3trac
12INCLUDEPATH += . smsd depend/nokia depend/nokia/dct3trac depend/siemens 12INCLUDEPATH += . smsd depend/nokia depend/nokia/dct3trac depend/siemens
13 CONFIG = warn_off release console 13 CONFIG = warn_off release console
14# Input 14# Input
15 15
16HEADERS += gammu.h \ 16HEADERS += gammu.h \
17 sniff.h \ 17 sniff.h \
18 smsd/s_files.h \ 18 smsd/s_files.h \
19 smsd/s_mysql.h \ 19 smsd/s_mysql.h \
20 smsd/smsdcore.h \ 20 smsd/smsdcore.h \
21 depend/nokia/dct3.h \ 21 depend/nokia/dct3.h \
22 depend/nokia/dct4.h \ 22 depend/nokia/dct4.h \
23 depend/siemens/chiffre.h \ 23 depend/siemens/chiffre.h \
24 depend/siemens/dsiemens.h \ 24 depend/siemens/dsiemens.h \
25 depend/nokia/dct3trac/type-cc.h \ 25 depend/nokia/dct3trac/type-cc.h \
26 depend/nokia/dct3trac/type-mm.h \ 26 depend/nokia/dct3trac/type-mm.h \
27 depend/nokia/dct3trac/type-rr.h \ 27 depend/nokia/dct3trac/type-rr.h \
28 depend/nokia/dct3trac/type-sms.h \ 28 depend/nokia/dct3trac/type-sms.h \
29 depend/nokia/dct3trac/type-ss.h \ 29 depend/nokia/dct3trac/type-ss.h \
30 depend/nokia/dct3trac/wmx-gsm.h \ 30 depend/nokia/dct3trac/wmx-gsm.h \
31 depend/nokia/dct3trac/wmx-list.h \ 31 depend/nokia/dct3trac/wmx-list.h \
32 depend/nokia/dct3trac/wmx-sim.h \ 32 depend/nokia/dct3trac/wmx-sim.h \
33 depend/nokia/dct3trac/wmx-util.h \ 33 depend/nokia/dct3trac/wmx-util.h \
34 depend/nokia/dct3trac/wmx.h 34 depend/nokia/dct3trac/wmx.h
35SOURCES += gammu.c \ 35SOURCES += gammu.c \
36 sniff.c \ 36 sniff.c \
37 smsd/s_files.c \ 37 smsd/s_files.c \
38 smsd/smsdcore.c \ 38 smsd/smsdcore.c \
39 depend/nokia/dct3.c \ 39 depend/nokia/dct3.c \
40 depend/nokia/dct4.c \ 40 depend/nokia/dct4.c \
41 depend/siemens/chiffre.c \ 41 depend/siemens/chiffre.c \
42 depend/siemens/dsiemens.c \ 42 depend/siemens/dsiemens.c \
43 depend/nokia/dct3trac/wmx-gsm.c \ 43 depend/nokia/dct3trac/wmx-gsm.c \
44 depend/nokia/dct3trac/wmx-list.c \ 44 depend/nokia/dct3trac/wmx-list.c \
45 depend/nokia/dct3trac/wmx-sim.c \ 45 depend/nokia/dct3trac/wmx-sim.c \
46 depend/nokia/dct3trac/wmx-util.c \ 46 depend/nokia/dct3trac/wmx-util.c \
47 depend/nokia/dct3trac/wmx.c 47 depend/nokia/dct3trac/wmx.c
48 48unix : {
49LIBS += ../../../bin/libmicrogammu.so /usr/lib/libbluetooth.so /usr/lib/libsdp.so /usr/lib/libpthread.so 49LIBS += ../../../bin/libmicrogammu.so /usr/lib/libbluetooth.so /usr/lib/libsdp.so /usr/lib/libpthread.so
50DESTDIR = ../../../bin
51OBJECTS_DIR = obj/unix 50OBJECTS_DIR = obj/unix
52TARGET = kammu \ No newline at end of file 51}
52win32 : {
53 CONFIG = qt warn_on
54#LIBS += mfc71u.lib
55LIBS += libc.lib
56#LIBS += msvcrt.lib
57QMAKE_LINK += /NODEFAULTLIB:msvcrt
58LIBS += ../../../bin/microgammu.lib
59OBJECTS_DIR = obj/win
60}
61DESTDIR = ../../../bin
62TARGET = kammu
diff --git a/kaddressbook/mainembedded.cpp b/kaddressbook/mainembedded.cpp
index 4230c07..4f48850 100644
--- a/kaddressbook/mainembedded.cpp
+++ b/kaddressbook/mainembedded.cpp
@@ -1,222 +1,223 @@
1#ifndef DESKTOP_VERSION 1#ifndef DESKTOP_VERSION
2#include <qpe/qpeapplication.h> 2#include <qpe/qpeapplication.h>
3#include <stdlib.h> 3#include <stdlib.h>
4#else 4#else
5#include <qapplication.h> 5#include <qapplication.h>
6#include <qwindowsstyle.h> 6#include <qwindowsstyle.h>
7#include <qplatinumstyle.h> 7#include <qplatinumstyle.h>
8#include <qmainwindow.h> 8#include <qmainwindow.h>
9#endif 9#endif
10 10
11#include <kstandarddirs.h> 11#include <kstandarddirs.h>
12#include <qregexp.h>
12#include <kglobal.h> 13#include <kglobal.h>
13#include <stdio.h> 14#include <stdio.h>
14#include <qdir.h> 15#include <qdir.h>
15#include "kaddressbookmain.h" 16#include "kaddressbookmain.h"
16#include "externalapphandler.h" 17#include "externalapphandler.h"
17 18
18int main( int argc, char **argv ) 19int main( int argc, char **argv )
19{ 20{
20#ifndef DESKTOP_VERSION 21#ifndef DESKTOP_VERSION
21 QPEApplication a( argc, argv ); 22 QPEApplication a( argc, argv );
22 a.setKeepRunning (); 23 a.setKeepRunning ();
23#else 24#else
24 QApplication a( argc, argv ); 25 QApplication a( argc, argv );
25 QApplication::setStyle( new QPlatinumStyle ()); 26 QApplication::setStyle( new QPlatinumStyle ());
26 QString hdir = QDir::homeDirPath(); 27 QString hdir = QDir::homeDirPath();
27 // there is a bug when creating dirs for WIN 98 28 // there is a bug when creating dirs for WIN 98
28 // it is difficult to fix, because we have no WIN 98 runnung 29 // it is difficult to fix, because we have no WIN 98 runnung
29 // such that we try it to create the dirs at startup here 30 // such that we try it to create the dirs at startup here
30 if ( hdir == "C:\\" ) { // win 98 or ME 31 if ( hdir == "C:\\" ) { // win 98 or ME
31 QDir app_dir; 32 QDir app_dir;
32 if ( !app_dir.exists("C:\\kdepim") ) 33 if ( !app_dir.exists("C:\\kdepim") )
33 app_dir.mkdir ("C:\\kdepim"); 34 app_dir.mkdir ("C:\\kdepim");
34 if ( !app_dir.exists("C:\\kdepim\\apps") ) 35 if ( !app_dir.exists("C:\\kdepim\\apps") )
35 app_dir.mkdir ("C:\\kdepim\\apps"); 36 app_dir.mkdir ("C:\\kdepim\\apps");
36 if ( !app_dir.exists("C:\\kdepim\\config") ) 37 if ( !app_dir.exists("C:\\kdepim\\config") )
37 app_dir.mkdir ("C:\\kdepim\\config"); 38 app_dir.mkdir ("C:\\kdepim\\config");
38 if ( !app_dir.exists("C:\\kdepim\\apps\\kaddressbook") ) 39 if ( !app_dir.exists("C:\\kdepim\\apps\\kaddressbook") )
39 app_dir.mkdir ("C:\\kdepim\\apps\\kaddressbook"); 40 app_dir.mkdir ("C:\\kdepim\\apps\\kaddressbook");
40 } 41 }
41#endif 42#endif
42 43
43 bool exitHelp = false; 44 bool exitHelp = false;
44 if ( argc > 1 ) { 45 if ( argc > 1 ) {
45 QString command = argv[1]; 46 QString command = argv[1];
46 if ( command == "-help" ){ 47 if ( command == "-help" ){
47 printf("KA/E command line commands:\n"); 48 printf("KA/E command line commands:\n");
48 printf(" no command: Start KA/E in usual way\n"); 49 printf(" no command: Start KA/E in usual way\n");
49 printf(" -help: This output\n"); 50 printf(" -help: This output\n");
50 printf(" KA/E is exiting now. Bye!\n"); 51 printf(" KA/E is exiting now. Bye!\n");
51 exitHelp = true; 52 exitHelp = true;
52 } 53 }
53 } 54 }
54 if ( ! exitHelp ) { 55 if ( ! exitHelp ) {
55 56
56 KGlobal::setAppName( "kaddressbook" ); 57 KGlobal::setAppName( "kaddressbook" );
57#ifndef DESKTOP_VERSION 58#ifndef DESKTOP_VERSION
58 if ( QApplication::desktop()->width() > 320 ) 59 if ( QApplication::desktop()->width() > 320 )
59 KGlobal::iconLoader()->setIconPath(QString(getenv("QPEDIR"))+"/pics/kdepim/kaddressbook/icons22/"); 60 KGlobal::iconLoader()->setIconPath(QString(getenv("QPEDIR"))+"/pics/kdepim/kaddressbook/icons22/");
60 else 61 else
61 KGlobal::iconLoader()->setIconPath(QString(getenv("QPEDIR"))+"/pics/kdepim/kaddressbook/icons16/"); 62 KGlobal::iconLoader()->setIconPath(QString(getenv("QPEDIR"))+"/pics/kdepim/kaddressbook/icons16/");
62#else 63#else
63 QString fileName ; 64 QString fileName ;
64 fileName = qApp->applicationDirPath () + "/kdepim/kaddressbook/icons22/"; 65 fileName = qApp->applicationDirPath () + "/kdepim/kaddressbook/icons22/";
65 KGlobal::iconLoader()->setIconPath(QDir::convertSeparators(fileName)); 66 KGlobal::iconLoader()->setIconPath(QDir::convertSeparators(fileName));
66 QApplication::addLibraryPath ( qApp->applicationDirPath () ); 67 QApplication::addLibraryPath ( qApp->applicationDirPath () );
67 68
68#endif 69#endif
69 KStandardDirs::setAppDir( QDir::convertSeparators(locateLocal("data", "kaddressbook"))); 70 KStandardDirs::setAppDir( QDir::convertSeparators(locateLocal("data", "kaddressbook")));
70 KAddressBookMain m ; 71 KAddressBookMain m ;
71//US MainWindow m; 72//US MainWindow m;
72 QObject::connect(&a, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & ))); 73 QObject::connect(&a, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & )));
73 74
74 { 75 {
75 KConfig kon ( locateLocal( "config", "korganizerrc" ) ); 76 KConfig kon ( locateLocal( "config", "korganizerrc" ) );
76 kon.setGroup("Locale"); 77 kon.setGroup("Locale");
77 KGlobal::locale()->setIntDateFormat( (KLocale::IntDateFormat)kon.readNumEntry( "PreferredDate",0) ); 78 KGlobal::locale()->setIntDateFormat( (KLocale::IntDateFormat)kon.readNumEntry( "PreferredDate",0) );
78 QString dummy = kon.readEntry( "UserDateFormatShort","%aK %d.%m.%y" );// kon.readEntry( ""); 79 QString dummy = kon.readEntry( "UserDateFormatShort","%aK %d.%m.%y" );// kon.readEntry( "");
79 KGlobal::locale()->setHore24Format( !kon.readBoolEntry( "PreferredTime",0 ) ); 80 KGlobal::locale()->setHore24Format( !kon.readBoolEntry( "PreferredTime",0 ) );
80 KGlobal::locale()->setDateFormatShort(dummy.replace( QRegExp("K"), QString(",") )); 81 KGlobal::locale()->setDateFormatShort(dummy.replace( QRegExp("K"), QString(",") ));
81 dummy = kon.readEntry( "UserDateFormatLong","%A %d %b %y" ); 82 dummy = kon.readEntry( "UserDateFormatLong","%A %d %b %y" );
82 KGlobal::locale()->setDateFormat(dummy.replace( QRegExp("K"), QString(",") )); 83 KGlobal::locale()->setDateFormat(dummy.replace( QRegExp("K"), QString(",") ));
83 kon.setGroup("Time & Date"); 84 kon.setGroup("Time & Date");
84 KGlobal::locale()->setDaylightSaving( kon.readBoolEntry( "UseDaylightsaving", true ), 85 KGlobal::locale()->setDaylightSaving( kon.readBoolEntry( "UseDaylightsaving", true ),
85 kon.readNumEntry( "DaylightsavingStart", 90), 86 kon.readNumEntry( "DaylightsavingStart", 90),
86 kon.readNumEntry( "DaylightsavingEnd",304) ); 87 kon.readNumEntry( "DaylightsavingEnd",304) );
87 KGlobal::locale()->setTimezone( kon.readEntry( "TimeZoneName" ," 00:00 Europe/London(UTC)") ); 88 KGlobal::locale()->setTimezone( kon.readEntry( "TimeZoneName" ," 00:00 Europe/London(UTC)") );
88 } 89 }
89#ifndef DESKTOP_VERSION 90#ifndef DESKTOP_VERSION
90 a.showMainWidget( &m ); 91 a.showMainWidget( &m );
91#else 92#else
92 a.setMainWidget( &m ); 93 a.setMainWidget( &m );
93 m.resize (640, 480 ); 94 m.resize (640, 480 );
94 m.show(); 95 m.show();
95#endif 96#endif
96 a.exec(); 97 a.exec();
97 98
98 } 99 }
99 qDebug("KA: Bye! "); 100 qDebug("KA: Bye! ");
100} 101}
101 102
102/* 103/*
103#include <stdlib.h> 104#include <stdlib.h>
104 105
105#include <qstring.h> 106#include <qstring.h>
106 107
107#include <kabc/stdaddressbook.h> 108#include <kabc/stdaddressbook.h>
108#include <kaboutdata.h> 109#include <kaboutdata.h>
109#include <kcmdlineargs.h> 110#include <kcmdlineargs.h>
110#include <kcrash.h> 111#include <kcrash.h>
111#include <kdebug.h> 112#include <kdebug.h>
112#include <klocale.h> 113#include <klocale.h>
113#include <kstartupinfo.h> 114#include <kstartupinfo.h>
114#include <kuniqueapplication.h> 115#include <kuniqueapplication.h>
115#include <kwin.h> 116#include <kwin.h>
116 117
117#include "kaddressbookmain.h" 118#include "kaddressbookmain.h"
118#include "kabcore.h" 119#include "kabcore.h"
119 120
120extern "C" { 121extern "C" {
121 122
122void crashHandler( int ) 123void crashHandler( int )
123{ 124{
124 KABC::StdAddressBook::handleCrash(); 125 KABC::StdAddressBook::handleCrash();
125 ::exit( 0 ); 126 ::exit( 0 );
126} 127}
127 128
128} 129}
129 130
130class KAddressBookApp : public KUniqueApplication { 131class KAddressBookApp : public KUniqueApplication {
131 public: 132 public:
132 KAddressBookApp() : mMainWin( 0 ) {} 133 KAddressBookApp() : mMainWin( 0 ) {}
133 ~KAddressBookApp() {} 134 ~KAddressBookApp() {}
134 135
135 int newInstance(); 136 int newInstance();
136 137
137 private: 138 private:
138 KAddressBookMain *mMainWin; 139 KAddressBookMain *mMainWin;
139}; 140};
140 141
141int KAddressBookApp::newInstance() 142int KAddressBookApp::newInstance()
142{ 143{
143 if ( isRestored() ) { 144 if ( isRestored() ) {
144 // There can only be one main window 145 // There can only be one main window
145 if ( KMainWindow::canBeRestored( 1 ) ) { 146 if ( KMainWindow::canBeRestored( 1 ) ) {
146 mMainWin = new KAddressBookMain; 147 mMainWin = new KAddressBookMain;
147 mMainWin->show(); 148 mMainWin->show();
148 mMainWin->restore( 1 ); 149 mMainWin->restore( 1 );
149 } 150 }
150 } else { 151 } else {
151 KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); 152 KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
152 153
153 QCString addrStr = args->getOption( "addr" ); 154 QCString addrStr = args->getOption( "addr" );
154 QCString uidStr = args->getOption( "uid" ); 155 QCString uidStr = args->getOption( "uid" );
155 QString addr; 156 QString addr;
156 QString uid; 157 QString uid;
157 if ( !addrStr.isEmpty() ) 158 if ( !addrStr.isEmpty() )
158 addr = QString::fromLocal8Bit( addrStr ); 159 addr = QString::fromLocal8Bit( addrStr );
159 if ( !uidStr.isEmpty() ) 160 if ( !uidStr.isEmpty() )
160 uid = QString::fromLocal8Bit( uidStr ); 161 uid = QString::fromLocal8Bit( uidStr );
161 162
162 163
163 if ( args->isSet( "editor-only" ) ) { 164 if ( args->isSet( "editor-only" ) ) {
164 if ( !mMainWin ) 165 if ( !mMainWin )
165 mMainWin = new KAddressBookMain; 166 mMainWin = new KAddressBookMain;
166 KStartupInfo::appStarted(); 167 KStartupInfo::appStarted();
167 mMainWin->hide(); 168 mMainWin->hide();
168 } else { 169 } else {
169 if ( mMainWin ) { 170 if ( mMainWin ) {
170 mMainWin->show(); 171 mMainWin->show();
171 KWin::setActiveWindow( mMainWin->winId() ); 172 KWin::setActiveWindow( mMainWin->winId() );
172 } else { 173 } else {
173 mMainWin = new KAddressBookMain; 174 mMainWin = new KAddressBookMain;
174 mMainWin->show(); 175 mMainWin->show();
175 } 176 }
176 } 177 }
177 // Can not see why anyone would pass both a uid and an email address, so I'll leave it that two contact editors will show if they do 178 // Can not see why anyone would pass both a uid and an email address, so I'll leave it that two contact editors will show if they do
178 if ( !addr.isEmpty() ) 179 if ( !addr.isEmpty() )
179 mMainWin->addEmail( addr ); 180 mMainWin->addEmail( addr );
180 181
181 if ( !uid.isEmpty() ) 182 if ( !uid.isEmpty() )
182 mMainWin->showContactEditor( uid ); 183 mMainWin->showContactEditor( uid );
183 if ( args->isSet( "new-contact" ) ) { 184 if ( args->isSet( "new-contact" ) ) {
184 mMainWin->newContact(); 185 mMainWin->newContact();
185 } 186 }
186 } 187 }
187 188
188 KCrash::setEmergencySaveFunction( crashHandler ); 189 KCrash::setEmergencySaveFunction( crashHandler );
189 190
190 return 0; 191 return 0;
191} 192}
192 193
193// the dummy argument is required, because KMail apparently sends an empty 194// the dummy argument is required, because KMail apparently sends an empty
194// argument. 195// argument.
195static KCmdLineOptions kmoptions[] = 196static KCmdLineOptions kmoptions[] =
196{ 197{
197 { "a", 0 , 0 }, 198 { "a", 0 , 0 },
198 { "addr <email>", I18N_NOOP( "Shows contact editor with given email address" ), 0 }, 199 { "addr <email>", I18N_NOOP( "Shows contact editor with given email address" ), 0 },
199 { "uid <uid>", I18N_NOOP( "Shows contact editor with given uid" ), 0 }, 200 { "uid <uid>", I18N_NOOP( "Shows contact editor with given uid" ), 0 },
200 { "editor-only", I18N_NOOP( "Launches in editor only mode" ), 0 }, 201 { "editor-only", I18N_NOOP( "Launches in editor only mode" ), 0 },
201 { "new-contact", I18N_NOOP( "Launches editor for the new contact" ), 0 }, 202 { "new-contact", I18N_NOOP( "Launches editor for the new contact" ), 0 },
202 { "+[argument]", I18N_NOOP( "dummy argument" ), 0}, 203 { "+[argument]", I18N_NOOP( "dummy argument" ), 0},
203 { 0, 0, 0} 204 { 0, 0, 0}
204}; 205};
205 206
206int main( int argc, char *argv[] ) 207int main( int argc, char *argv[] )
207{ 208{
208 KLocale::setMainCatalogue( "kaddressbook" ); 209 KLocale::setMainCatalogue( "kaddressbook" );
209 210
210 KCmdLineArgs::init( argc, argv, KABCore::createAboutData() ); 211 KCmdLineArgs::init( argc, argv, KABCore::createAboutData() );
211 KCmdLineArgs::addCmdLineOptions( kmoptions ); 212 KCmdLineArgs::addCmdLineOptions( kmoptions );
212 KUniqueApplication::addCmdLineOptions(); 213 KUniqueApplication::addCmdLineOptions();
213 214
214 if ( !KAddressBookApp::start() ) 215 if ( !KAddressBookApp::start() )
215 exit( 0 ); 216 exit( 0 );
216 217
217 KAddressBookApp app; 218 KAddressBookApp app;
218 KGlobal::locale()->insertCatalogue( "libkdepim" ); 219 KGlobal::locale()->insertCatalogue( "libkdepim" );
219 220
220 return app.exec(); 221 return app.exec();
221} 222}
222*/ 223*/