aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contracts/test/token_registry.ts
blob: eee14ad9f50fa589d1b819919151eb6a2c3dc364 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
import { ZeroEx } from '0x.js';
import { BlockchainLifecycle, devConstants, web3Factory } from '@0xproject/dev-utils';
import { BigNumber } from '@0xproject/utils';
import { Web3Wrapper } from '@0xproject/web3-wrapper';
import * as chai from 'chai';
import ethUtil = require('ethereumjs-util');
import * as _ from 'lodash';
import * as Web3 from 'web3';

import { TokenRegistryContract } from '../src/contract_wrappers/generated/token_registry';
import { constants } from '../util/constants';
import { TokenRegWrapper } from '../util/token_registry_wrapper';
import { ContractName } from '../util/types';

import { chaiSetup } from './utils/chai_setup';
import { deployer } from './utils/deployer';

chaiSetup.configure();
const expect = chai.expect;
const web3 = web3Factory.create();
const web3Wrapper = new Web3Wrapper(web3.currentProvider);
const blockchainLifecycle = new BlockchainLifecycle();

describe('TokenRegistry', () => {
    let owner: string;
    let notOwner: string;
    let tokenReg: TokenRegistryContract;
    let tokenRegWrapper: TokenRegWrapper;
    before(async () => {
        const accounts = await web3Wrapper.getAvailableAddressesAsync();
        owner = accounts[0];
        notOwner = accounts[1];
        const tokenRegInstance = await deployer.deployAsync(ContractName.TokenRegistry);
        tokenReg = new TokenRegistryContract(web3Wrapper, tokenRegInstance.abi, tokenRegInstance.address);
        tokenRegWrapper = new TokenRegWrapper(tokenReg);
    });
    beforeEach(async () => {
        await blockchainLifecycle.startAsync();
    });
    afterEach(async () => {
        await blockchainLifecycle.revertAsync();
    });

    const tokenAddress1 = `0x${ethUtil.setLength(ethUtil.toBuffer('0x1'), 20, false).toString('hex')}`;
    const tokenAddress2 = `0x${ethUtil.setLength(ethUtil.toBuffer('0x2'), 20, false).toString('hex')}`;

    const token1 = {
        address: tokenAddress1,
        name: 'testToken1',
        symbol: 'TT1',
        decimals: 18,
        ipfsHash: `0x${ethUtil.sha3('ipfs1').toString('hex')}`,
        swarmHash: `0x${ethUtil.sha3('swarm1').toString('hex')}`,
    };

    const token2 = {
        address: tokenAddress2,
        name: 'testToken2',
        symbol: 'TT2',
        decimals: 18,
        ipfsHash: `0x${ethUtil.sha3('ipfs2').toString('hex')}`,
        swarmHash: `0x${ethUtil.sha3('swarm2').toString('hex')}`,
    };

    const nullToken = {
        address: ZeroEx.NULL_ADDRESS,
        name: '',
        symbol: '',
        decimals: 0,
        ipfsHash: constants.NULL_BYTES,
        swarmHash: constants.NULL_BYTES,
    };

    describe('addToken', () => {
        it('should throw when not called by owner', async () => {
            return expect(tokenRegWrapper.addTokenAsync(token1, notOwner)).to.be.rejectedWith(constants.REVERT);
        });

        it('should add token metadata when called by owner', async () => {
            await tokenRegWrapper.addTokenAsync(token1, owner);
            const tokenData = await tokenRegWrapper.getTokenMetaDataAsync(token1.address);
            expect(tokenData).to.be.deep.equal(token1);
        });

        it('should throw if token already exists', async () => {
            await tokenRegWrapper.addTokenAsync(token1, owner);

            return expect(tokenRegWrapper.addTokenAsync(token1, owner)).to.be.rejectedWith(constants.REVERT);
        });

        it('should throw if token address is null', async () => {
            return expect(tokenRegWrapper.addTokenAsync(nullToken, owner)).to.be.rejectedWith(constants.REVERT);
        });

        it('should throw if name already exists', async () => {
            await tokenRegWrapper.addTokenAsync(token1, owner);
            const duplicateNameToken = _.assign({}, token2, { name: token1.name });

            return expect(tokenRegWrapper.addTokenAsync(duplicateNameToken, owner)).to.be.rejectedWith(
                constants.REVERT,
            );
        });

        it('should throw if symbol already exists', async () => {
            await tokenRegWrapper.addTokenAsync(token1, owner);
            const duplicateSymbolToken = _.assign({}, token2, {
                symbol: token1.symbol,
            });

            return expect(tokenRegWrapper.addTokenAsync(duplicateSymbolToken, owner)).to.be.rejectedWith(
                constants.REVERT,
            );
        });
    });

    describe('after addToken', () => {
        beforeEach(async () => {
            await tokenRegWrapper.addTokenAsync(token1, owner);
        });

        describe('getTokenByName', () => {
            it('should return token metadata when given the token name', async () => {
                const tokenData = await tokenRegWrapper.getTokenByNameAsync(token1.name);
                expect(tokenData).to.be.deep.equal(token1);
            });
        });

        describe('getTokenBySymbol', () => {
            it('should return token metadata when given the token symbol', async () => {
                const tokenData = await tokenRegWrapper.getTokenBySymbolAsync(token1.symbol);
                expect(tokenData).to.be.deep.equal(token1);
            });
        });

        describe('setTokenName', () => {
            it('should throw when not called by owner', async () => {
                return expect(
                    tokenReg.setTokenName.sendTransactionAsync(token1.address, token2.name, { from: notOwner }),
                ).to.be.rejectedWith(constants.REVERT);
            });

            it('should change the token name when called by owner', async () => {
                await tokenReg.setTokenName.sendTransactionAsync(token1.address, token2.name, {
                    from: owner,
                });
                const [newData, oldData] = await Promise.all([
                    tokenRegWrapper.getTokenByNameAsync(token2.name),
                    tokenRegWrapper.getTokenByNameAsync(token1.name),
                ]);

                const expectedNewData = _.assign({}, token1, { name: token2.name });
                const expectedOldData = nullToken;
                expect(newData).to.be.deep.equal(expectedNewData);
                expect(oldData).to.be.deep.equal(expectedOldData);
            });

            it('should throw if the name already exists', async () => {
                await tokenRegWrapper.addTokenAsync(token2, owner);

                return expect(
                    tokenReg.setTokenName.sendTransactionAsync(token1.address, token2.name, { from: owner }),
                ).to.be.rejectedWith(constants.REVERT);
            });

            it('should throw if token does not exist', async () => {
                return expect(
                    tokenReg.setTokenName.sendTransactionAsync(nullToken.address, token2.name, { from: owner }),
                ).to.be.rejectedWith(constants.REVERT);
            });
        });

        describe('setTokenSymbol', () => {
            it('should throw when not called by owner', async () => {
                return expect(
                    tokenReg.setTokenSymbol.sendTransactionAsync(token1.address, token2.symbol, {
                        from: notOwner,
                    }),
                ).to.be.rejectedWith(constants.REVERT);
            });

            it('should change the token symbol when called by owner', async () => {
                await tokenReg.setTokenSymbol.sendTransactionAsync(token1.address, token2.symbol, { from: owner });
                const [newData, oldData] = await Promise.all([
                    tokenRegWrapper.getTokenBySymbolAsync(token2.symbol),
                    tokenRegWrapper.getTokenBySymbolAsync(token1.symbol),
                ]);

                const expectedNewData = _.assign({}, token1, { symbol: token2.symbol });
                const expectedOldData = nullToken;
                expect(newData).to.be.deep.equal(expectedNewData);
                expect(oldData).to.be.deep.equal(expectedOldData);
            });

            it('should throw if the symbol already exists', async () => {
                await tokenRegWrapper.addTokenAsync(token2, owner);

                return expect(
                    tokenReg.setTokenSymbol.sendTransactionAsync(token1.address, token2.symbol, {
                        from: owner,
                    }),
                ).to.be.rejectedWith(constants.REVERT);
            });

            it('should throw if token does not exist', async () => {
                return expect(
                    tokenReg.setTokenSymbol.sendTransactionAsync(nullToken.address, token2.symbol, {
                        from: owner,
                    }),
                ).to.be.rejectedWith(constants.REVERT);
            });
        });

        describe('removeToken', () => {
            it('should throw if not called by owner', async () => {
                const index = new BigNumber(0);
                return expect(
                    tokenReg.removeToken.sendTransactionAsync(token1.address, index, { from: notOwner }),
                ).to.be.rejectedWith(constants.REVERT);
            });

            it('should remove token metadata when called by owner', async () => {
                const index = new BigNumber(0);
                await tokenReg.removeToken.sendTransactionAsync(token1.address, index, {
                    from: owner,
                });
                const tokenData = await tokenRegWrapper.getTokenMetaDataAsync(token1.address);
                expect(tokenData).to.be.deep.equal(nullToken);
            });

            it('should throw if token does not exist', async () => {
                const index = new BigNumber(0);
                return expect(
                    tokenReg.removeToken.sendTransactionAsync(nullToken.address, index, { from: owner }),
                ).to.be.rejectedWith(constants.REVERT);
            });

            it('should throw if token at given index does not match address', async () => {
                await tokenRegWrapper.addTokenAsync(token2, owner);
                const incorrectIndex = new BigNumber(0);
                return expect(
                    tokenReg.removeToken.sendTransactionAsync(token2.address, incorrectIndex, { from: owner }),
                ).to.be.rejectedWith(constants.REVERT);
            });
        });
    });
});
td class='graph'>
-rw-r--r--art/broken-image-24.xpm2
-rw-r--r--art/empty.xpm2
-rw-r--r--art/jump.xpm4
-rw-r--r--calendar/common/authentication.c4
-rw-r--r--calendar/common/authentication.h2
-rw-r--r--calendar/conduits/calendar/calendar-conduit.c4
-rw-r--r--calendar/conduits/common/libecalendar-common-conduit.c2
-rw-r--r--calendar/conduits/common/libecalendar-common-conduit.h2
-rw-r--r--calendar/conduits/memo/memo-conduit.c2
-rw-r--r--calendar/conduits/todo/todo-conduit.c2
-rw-r--r--calendar/gui/a11y/ea-cal-view-event.c9
-rw-r--r--calendar/gui/a11y/ea-cal-view-event.h2
-rw-r--r--calendar/gui/a11y/ea-cal-view.c2
-rw-r--r--calendar/gui/a11y/ea-cal-view.h2
-rw-r--r--calendar/gui/a11y/ea-calendar-helpers.c2
-rw-r--r--calendar/gui/a11y/ea-calendar-helpers.h2
-rw-r--r--calendar/gui/a11y/ea-calendar.c2
-rw-r--r--calendar/gui/a11y/ea-calendar.h2
-rw-r--r--calendar/gui/a11y/ea-day-view-cell.c2
-rw-r--r--calendar/gui/a11y/ea-day-view-cell.h2
-rw-r--r--calendar/gui/a11y/ea-day-view-main-item.c4
-rw-r--r--calendar/gui/a11y/ea-day-view-main-item.h2
-rw-r--r--calendar/gui/a11y/ea-day-view.c2
-rw-r--r--calendar/gui/a11y/ea-day-view.h2
-rw-r--r--calendar/gui/a11y/ea-gnome-calendar.c2
-rw-r--r--calendar/gui/a11y/ea-gnome-calendar.h2
-rw-r--r--calendar/gui/a11y/ea-jump-button.c4
-rw-r--r--calendar/gui/a11y/ea-jump-button.h2
-rw-r--r--calendar/gui/a11y/ea-week-view-cell.c2
-rw-r--r--calendar/gui/a11y/ea-week-view-cell.h2
-rw-r--r--calendar/gui/a11y/ea-week-view-main-item.c2
-rw-r--r--calendar/gui/a11y/ea-week-view-main-item.h2
-rw-r--r--calendar/gui/a11y/ea-week-view.c2
-rw-r--r--calendar/gui/a11y/ea-week-view.h2
-rw-r--r--calendar/gui/alarm-notify/alarm-notify-dialog.c2
-rw-r--r--calendar/gui/alarm-notify/alarm-notify-dialog.h2
-rw-r--r--calendar/gui/alarm-notify/alarm-notify.c4
-rw-r--r--calendar/gui/alarm-notify/alarm-notify.h2
-rw-r--r--calendar/gui/alarm-notify/alarm-queue.c7
-rw-r--r--calendar/gui/alarm-notify/alarm-queue.h2
-rw-r--r--calendar/gui/alarm-notify/alarm.c2
-rw-r--r--calendar/gui/alarm-notify/alarm.h2
-rw-r--r--calendar/gui/alarm-notify/config-data.c2
-rw-r--r--calendar/gui/alarm-notify/config-data.h2
-rw-r--r--calendar/gui/alarm-notify/notify-main.c2
-rw-r--r--calendar/gui/alarm-notify/util.c2
-rw-r--r--calendar/gui/alarm-notify/util.h2
-rw-r--r--calendar/gui/cal-search-bar.c4
-rw-r--r--calendar/gui/cal-search-bar.h2
-rw-r--r--calendar/gui/calendar-commands.c4
-rw-r--r--calendar/gui/calendar-commands.h2
-rw-r--r--calendar/gui/calendar-component.c13
-rw-r--r--calendar/gui/calendar-component.h2
-rw-r--r--calendar/gui/calendar-config-keys.h2
-rw-r--r--calendar/gui/calendar-config.c2
-rw-r--r--calendar/gui/calendar-config.h2
-rw-r--r--calendar/gui/calendar-view-factory.c2
-rw-r--r--calendar/gui/calendar-view-factory.h2
-rw-r--r--calendar/gui/calendar-view.c2
-rw-r--r--calendar/gui/calendar-view.h2
-rw-r--r--calendar/gui/comp-util.c8
-rw-r--r--calendar/gui/comp-util.h2
-rw-r--r--calendar/gui/dialogs/alarm-dialog.c2
-rw-r--r--calendar/gui/dialogs/alarm-dialog.h2
-rw-r--r--calendar/gui/dialogs/alarm-list-dialog.c2
-rw-r--r--calendar/gui/dialogs/alarm-list-dialog.h2
-rw-r--r--calendar/gui/dialogs/cal-attachment-select-file.c2
-rw-r--r--calendar/gui/dialogs/cal-attachment-select-file.h2
-rw-r--r--calendar/gui/dialogs/cal-prefs-dialog.c24
-rw-r--r--calendar/gui/dialogs/cal-prefs-dialog.h2
-rw-r--r--calendar/gui/dialogs/calendar-setup.c46
-rw-r--r--calendar/gui/dialogs/calendar-setup.h2
-rw-r--r--calendar/gui/dialogs/cancel-comp.c2
-rw-r--r--calendar/gui/dialogs/cancel-comp.h2
-rw-r--r--calendar/gui/dialogs/changed-comp.c2
-rw-r--r--calendar/gui/dialogs/changed-comp.h2
-rw-r--r--calendar/gui/dialogs/comp-editor-page.c2
-rw-r--r--calendar/gui/dialogs/comp-editor-page.h2
-rw-r--r--calendar/gui/dialogs/comp-editor-util.c10
-rw-r--r--calendar/gui/dialogs/comp-editor-util.h2
-rw-r--r--calendar/gui/dialogs/comp-editor.c8
-rw-r--r--calendar/gui/dialogs/comp-editor.h2
-rw-r--r--calendar/gui/dialogs/copy-source-dialog.c2
-rw-r--r--calendar/gui/dialogs/copy-source-dialog.h2
-rw-r--r--calendar/gui/dialogs/delete-comp.c2
-rw-r--r--calendar/gui/dialogs/delete-comp.h2
-rw-r--r--calendar/gui/dialogs/delete-error.c2
-rw-r--r--calendar/gui/dialogs/delete-error.h2
-rw-r--r--calendar/gui/dialogs/e-delegate-dialog.c2
-rw-r--r--calendar/gui/dialogs/e-delegate-dialog.h2
-rw-r--r--calendar/gui/dialogs/e-send-options-utils.c4
-rw-r--r--calendar/gui/dialogs/e-send-options-utils.h4
-rw-r--r--calendar/gui/dialogs/event-editor.c2
-rw-r--r--calendar/gui/dialogs/event-editor.h4
-rw-r--r--calendar/gui/dialogs/event-page.c22
-rw-r--r--calendar/gui/dialogs/event-page.h2
-rw-r--r--calendar/gui/dialogs/memo-editor.c2
-rw-r--r--calendar/gui/dialogs/memo-editor.h2
-rw-r--r--calendar/gui/dialogs/memo-page.c2
-rw-r--r--calendar/gui/dialogs/memo-page.h2
-rw-r--r--calendar/gui/dialogs/recur-comp.c2
-rw-r--r--calendar/gui/dialogs/recur-comp.h2
-rw-r--r--calendar/gui/dialogs/recurrence-page.c2
-rw-r--r--calendar/gui/dialogs/recurrence-page.h2
-rw-r--r--calendar/gui/dialogs/save-comp.c2
-rw-r--r--calendar/gui/dialogs/save-comp.h4
-rw-r--r--calendar/gui/dialogs/schedule-page.c2
-rw-r--r--calendar/gui/dialogs/schedule-page.h2
-rw-r--r--calendar/gui/dialogs/select-source-dialog.c2
-rw-r--r--calendar/gui/dialogs/select-source-dialog.h2
-rw-r--r--calendar/gui/dialogs/send-comp.c2
-rw-r--r--calendar/gui/dialogs/send-comp.h2
-rw-r--r--calendar/gui/dialogs/task-details-page.c2
-rw-r--r--calendar/gui/dialogs/task-details-page.h2
-rw-r--r--calendar/gui/dialogs/task-editor.c2
-rw-r--r--calendar/gui/dialogs/task-editor.h2
-rw-r--r--calendar/gui/dialogs/task-page.c8
-rw-r--r--calendar/gui/dialogs/task-page.h2
-rw-r--r--calendar/gui/e-alarm-list.c2
-rw-r--r--calendar/gui/e-alarm-list.h4
-rw-r--r--calendar/gui/e-attachment-handler-calendar.c2
-rw-r--r--calendar/gui/e-attachment-handler-calendar.h2
-rw-r--r--calendar/gui/e-cal-component-preview.c2
-rw-r--r--calendar/gui/e-cal-component-preview.h2
-rw-r--r--calendar/gui/e-cal-config.c2
-rw-r--r--calendar/gui/e-cal-config.h2
-rw-r--r--calendar/gui/e-cal-event.c2
-rw-r--r--calendar/gui/e-cal-event.h2
-rw-r--r--calendar/gui/e-cal-list-view-config.c2
-rw-r--r--calendar/gui/e-cal-list-view-config.h2
-rw-r--r--calendar/gui/e-cal-list-view.c2
-rw-r--r--calendar/gui/e-cal-list-view.h2
-rw-r--r--calendar/gui/e-cal-menu.c2
-rw-r--r--calendar/gui/e-cal-menu.h2
-rw-r--r--calendar/gui/e-cal-model-calendar.c8
-rw-r--r--calendar/gui/e-cal-model-calendar.h2
-rw-r--r--calendar/gui/e-cal-model-memos.c6
-rw-r--r--calendar/gui/e-cal-model-memos.h2
-rw-r--r--calendar/gui/e-cal-model-tasks.c36
-rw-r--r--calendar/gui/e-cal-model-tasks.h2
-rw-r--r--calendar/gui/e-cal-model.c46
-rw-r--r--calendar/gui/e-cal-model.h4
-rw-r--r--calendar/gui/e-cal-popup.c2
-rw-r--r--calendar/gui/e-cal-popup.h2
-rw-r--r--calendar/gui/e-calendar-table-config.c2
-rw-r--r--calendar/gui/e-calendar-table-config.h2
-rw-r--r--calendar/gui/e-calendar-table.c2
-rw-r--r--calendar/gui/e-calendar-table.h2
-rw-r--r--calendar/gui/e-calendar-view.c78
-rw-r--r--calendar/gui/e-calendar-view.h2
-rw-r--r--calendar/gui/e-cell-date-edit-config.c2
-rw-r--r--calendar/gui/e-cell-date-edit-config.h2
-rw-r--r--calendar/gui/e-cell-date-edit-text.c2
-rw-r--r--calendar/gui/e-cell-date-edit-text.h2
-rw-r--r--calendar/gui/e-comp-editor-registry.c2
-rw-r--r--calendar/gui/e-comp-editor-registry.h2
-rw-r--r--calendar/gui/e-date-edit-config.c2
-rw-r--r--calendar/gui/e-date-edit-config.h2
-rw-r--r--calendar/gui/e-date-time-list.c2
-rw-r--r--calendar/gui/e-date-time-list.h2
-rw-r--r--calendar/gui/e-day-view-config.c2
-rw-r--r--calendar/gui/e-day-view-config.h2
-rw-r--r--calendar/gui/e-day-view-layout.c2
-rw-r--r--calendar/gui/e-day-view-layout.h2
-rw-r--r--calendar/gui/e-day-view-main-item.c9
-rw-r--r--calendar/gui/e-day-view-main-item.h2
-rw-r--r--calendar/gui/e-day-view-time-item.c7
-rw-r--r--calendar/gui/e-day-view-time-item.h2
-rw-r--r--calendar/gui/e-day-view-top-item.c6
-rw-r--r--calendar/gui/e-day-view-top-item.h2
-rw-r--r--calendar/gui/e-day-view.c40
-rw-r--r--calendar/gui/e-day-view.h4
-rw-r--r--calendar/gui/e-itip-control.c6
-rw-r--r--calendar/gui/e-itip-control.h2
-rw-r--r--calendar/gui/e-meeting-attendee.c5
-rw-r--r--calendar/gui/e-meeting-attendee.h2
-rw-r--r--calendar/gui/e-meeting-list-view.c13
-rw-r--r--calendar/gui/e-meeting-list-view.h2
-rw-r--r--calendar/gui/e-meeting-store.c4
-rw-r--r--calendar/gui/e-meeting-store.h2
-rw-r--r--calendar/gui/e-meeting-time-sel-item.c2
-rw-r--r--calendar/gui/e-meeting-time-sel-item.h2
-rw-r--r--calendar/gui/e-meeting-time-sel.c2
-rw-r--r--calendar/gui/e-meeting-time-sel.h2
-rw-r--r--calendar/gui/e-meeting-types.h2
-rw-r--r--calendar/gui/e-meeting-utils.c2
-rw-r--r--calendar/gui/e-meeting-utils.h2
-rw-r--r--calendar/gui/e-memo-list-selector.c4
-rw-r--r--calendar/gui/e-memo-table-config.c2
-rw-r--r--calendar/gui/e-memo-table-config.h2
-rw-r--r--calendar/gui/e-memo-table.c6
-rw-r--r--calendar/gui/e-memo-table.h2
-rw-r--r--calendar/gui/e-memos.c2
-rw-r--r--calendar/gui/e-memos.h2
-rw-r--r--calendar/gui/e-mini-calendar-config.c2
-rw-r--r--calendar/gui/e-mini-calendar-config.h2
-rw-r--r--calendar/gui/e-select-names-editable.c8
-rw-r--r--calendar/gui/e-select-names-editable.h2
-rw-r--r--calendar/gui/e-select-names-renderer.c4
-rw-r--r--calendar/gui/e-select-names-renderer.h2
-rw-r--r--calendar/gui/e-task-list-selector.c4
-rw-r--r--calendar/gui/e-tasks.c2
-rw-r--r--calendar/gui/e-tasks.h2
-rw-r--r--calendar/gui/e-timezone-entry.c2
-rw-r--r--calendar/gui/e-timezone-entry.h2
-rw-r--r--calendar/gui/e-week-view-config.c2
-rw-r--r--calendar/gui/e-week-view-config.h2
-rw-r--r--calendar/gui/e-week-view-event-item.c5
-rw-r--r--calendar/gui/e-week-view-event-item.h2
-rw-r--r--calendar/gui/e-week-view-layout.c2
-rw-r--r--calendar/gui/e-week-view-layout.h2
-rw-r--r--calendar/gui/e-week-view-main-item.c2
-rw-r--r--calendar/gui/e-week-view-main-item.h2
-rw-r--r--calendar/gui/e-week-view-titles-item.c2
-rw-r--r--calendar/gui/e-week-view-titles-item.h2
-rw-r--r--calendar/gui/e-week-view.c34
-rw-r--r--calendar/gui/e-week-view.h4
-rw-r--r--calendar/gui/gnome-cal.c40
-rw-r--r--calendar/gui/gnome-cal.h4
-rw-r--r--calendar/gui/goto.c2
-rw-r--r--calendar/gui/goto.h2
-rw-r--r--calendar/gui/itip-utils.c8
-rw-r--r--calendar/gui/itip-utils.h2
-rw-r--r--calendar/gui/memos-component.c2
-rw-r--r--calendar/gui/memos-component.h2
-rw-r--r--calendar/gui/misc.c2
-rw-r--r--calendar/gui/misc.h2
-rw-r--r--calendar/gui/print.c29
-rw-r--r--calendar/gui/print.h2
-rw-r--r--calendar/gui/tag-calendar.c2
-rw-r--r--calendar/gui/tag-calendar.h2
-rw-r--r--calendar/gui/tasks-component.c26
-rw-r--r--calendar/gui/tasks-component.h2
-rw-r--r--calendar/gui/tasks-control.c6
-rw-r--r--calendar/gui/tasks-control.h2
-rw-r--r--calendar/gui/weekday-picker.c4
-rw-r--r--calendar/gui/weekday-picker.h2
-rw-r--r--calendar/importers/evolution-calendar-importer.h2
-rw-r--r--calendar/importers/icalendar-importer.c12
-rw-r--r--calendar/module/e-cal-shell-backend.c4
-rw-r--r--calendar/module/e-cal-shell-backend.h2
-rw-r--r--calendar/module/e-cal-shell-content.c2
-rw-r--r--calendar/module/e-cal-shell-content.h2
-rw-r--r--calendar/module/e-cal-shell-migrate.c2
-rw-r--r--calendar/module/e-cal-shell-migrate.h2
-rw-r--r--calendar/module/e-cal-shell-settings.c2
-rw-r--r--calendar/module/e-cal-shell-settings.h2
-rw-r--r--calendar/module/e-cal-shell-sidebar.c2
-rw-r--r--calendar/module/e-cal-shell-sidebar.h2
-rw-r--r--calendar/module/e-cal-shell-view-actions.c4
-rw-r--r--calendar/module/e-cal-shell-view-actions.h2
-rw-r--r--calendar/module/e-cal-shell-view-memopad.c2
-rw-r--r--calendar/module/e-cal-shell-view-private.c4
-rw-r--r--calendar/module/e-cal-shell-view-private.h2
-rw-r--r--calendar/module/e-cal-shell-view-taskpad.c2
-rw-r--r--calendar/module/e-cal-shell-view.c2
-rw-r--r--calendar/module/e-cal-shell-view.h2
-rw-r--r--calendar/module/e-memo-shell-backend.c2
-rw-r--r--calendar/module/e-memo-shell-backend.h2
-rw-r--r--calendar/module/e-memo-shell-content.c6
-rw-r--r--calendar/module/e-memo-shell-content.h2
-rw-r--r--calendar/module/e-memo-shell-migrate.c2
-rw-r--r--calendar/module/e-memo-shell-migrate.h2
-rw-r--r--calendar/module/e-memo-shell-sidebar.c2
-rw-r--r--calendar/module/e-memo-shell-sidebar.h2
-rw-r--r--calendar/module/e-memo-shell-view-actions.c2
-rw-r--r--calendar/module/e-memo-shell-view-actions.h2
-rw-r--r--calendar/module/e-memo-shell-view-private.c2
-rw-r--r--calendar/module/e-memo-shell-view-private.h2
-rw-r--r--calendar/module/e-memo-shell-view.c2
-rw-r--r--calendar/module/e-memo-shell-view.h2
-rw-r--r--calendar/module/e-task-shell-backend.c2
-rw-r--r--calendar/module/e-task-shell-backend.h2
-rw-r--r--calendar/module/e-task-shell-content.c6
-rw-r--r--calendar/module/e-task-shell-content.h4
-rw-r--r--calendar/module/e-task-shell-migrate.c2
-rw-r--r--calendar/module/e-task-shell-migrate.h2
-rw-r--r--calendar/module/e-task-shell-sidebar.c4
-rw-r--r--calendar/module/e-task-shell-sidebar.h2
-rw-r--r--calendar/module/e-task-shell-view-actions.c4
-rw-r--r--calendar/module/e-task-shell-view-actions.h2
-rw-r--r--calendar/module/e-task-shell-view-private.c2
-rw-r--r--calendar/module/e-task-shell-view-private.h2
-rw-r--r--calendar/module/e-task-shell-view.c2
-rw-r--r--calendar/module/e-task-shell-view.h2
-rw-r--r--calendar/module/evolution-module-calendar.c2
-rw-r--r--calendar/zones.h2
-rw-r--r--composer/Makefile.am1
-rw-r--r--composer/e-composer-actions.c2
-rw-r--r--composer/e-composer-actions.h2
-rw-r--r--composer/e-composer-autosave.c2
-rw-r--r--composer/e-composer-autosave.h2
-rw-r--r--composer/e-composer-common.h2
-rw-r--r--composer/e-composer-from-header.c2
-rw-r--r--composer/e-composer-from-header.h2
-rw-r--r--composer/e-composer-header-table.c17
-rw-r--r--composer/e-composer-header-table.h2
-rw-r--r--composer/e-composer-header.c8
-rw-r--r--composer/e-composer-header.h4
-rw-r--r--composer/e-composer-name-header.c18
-rw-r--r--composer/e-composer-name-header.h2
-rw-r--r--composer/e-composer-post-header.c2
-rw-r--r--composer/e-composer-post-header.h2
-rw-r--r--composer/e-composer-private.c9
-rw-r--r--composer/e-composer-private.h2
-rw-r--r--composer/e-composer-text-header.c4
-rw-r--r--composer/e-composer-text-header.h2
-rw-r--r--composer/e-msg-composer.c10
-rw-r--r--composer/e-msg-composer.h2
-rw-r--r--configure.ac44
-rw-r--r--devel-docs/camel/Makefile.am2
-rw-r--r--e-util/e-account-utils.c2
-rw-r--r--e-util/e-account-utils.h2
-rw-r--r--e-util/e-bconf-map.c2
-rw-r--r--e-util/e-bconf-map.h16
-rw-r--r--e-util/e-binding.c2
-rw-r--r--e-util/e-binding.h2
-rw-r--r--e-util/e-bit-array.c2
-rw-r--r--e-util/e-bit-array.h5
-rw-r--r--e-util/e-categories-config.c2
-rw-r--r--e-util/e-categories-config.h2
-rw-r--r--e-util/e-config-listener.c2
-rw-r--r--e-util/e-config-listener.h2
-rw-r--r--e-util/e-config.c2
-rw-r--r--e-util/e-config.h2
-rw-r--r--e-util/e-cursor.c2
-rw-r--r--e-util/e-cursor.h2
-rw-r--r--e-util/e-dialog-utils.c2
-rw-r--r--e-util/e-dialog-utils.h2
-rw-r--r--e-util/e-dialog-widgets.c2
-rw-r--r--e-util/e-dialog-widgets.h2
-rw-r--r--e-util/e-error.c62
-rw-r--r--e-util/e-error.h2
-rw-r--r--e-util/e-event.c2
-rw-r--r--e-util/e-event.h2
-rw-r--r--e-util/e-folder-map.c4
-rw-r--r--e-util/e-folder-map.h5
-rw-r--r--e-util/e-fsutils.c2
-rw-r--r--e-util/e-fsutils.h2
-rw-r--r--e-util/e-html-utils.c4
-rw-r--r--e-util/e-html-utils.h2
-rw-r--r--e-util/e-icon-factory.c2
-rw-r--r--e-util/e-icon-factory.h2
-rw-r--r--e-util/e-import.c2
-rw-r--r--e-util/e-import.h2
-rw-r--r--e-util/e-logger.c6
-rw-r--r--e-util/e-logger.h2
-rw-r--r--e-util/e-marshal.list1
-rw-r--r--e-util/e-menu.c2
-rw-r--r--e-util/e-menu.h2
-rw-r--r--e-util/e-mktemp.c2
-rw-r--r--e-util/e-mktemp.h2
-rw-r--r--e-util/e-module.c2
-rw-r--r--e-util/e-module.h2
-rw-r--r--e-util/e-non-intrusive-error-dialog.c2
-rw-r--r--e-util/e-non-intrusive-error-dialog.h8
-rw-r--r--e-util/e-pilot-map.c2
-rw-r--r--e-util/e-pilot-map.h2
-rw-r--r--e-util/e-pilot-util.c2
-rw-r--r--e-util/e-pilot-util.h2
-rw-r--r--e-util/e-plugin-ui.c4
-rw-r--r--e-util/e-plugin-ui.h2
-rw-r--r--e-util/e-plugin.c4
-rw-r--r--e-util/e-plugin.h6
-rw-r--r--e-util/e-popup.c2
-rw-r--r--e-util/e-popup.h2
-rw-r--r--e-util/e-print.c2
-rw-r--r--e-util/e-print.h2
-rw-r--r--e-util/e-profile-event.c2
-rw-r--r--e-util/e-profile-event.h2
-rw-r--r--e-util/e-request.c2
-rw-r--r--e-util/e-request.h2
-rw-r--r--e-util/e-signature-list.c2
-rw-r--r--e-util/e-signature-list.h2
-rw-r--r--e-util/e-signature-utils.c2
-rw-r--r--e-util/e-signature-utils.h2
-rw-r--r--e-util/e-signature.c2
-rw-r--r--e-util/e-signature.h2
-rw-r--r--e-util/e-sorter-array.c2
-rw-r--r--e-util/e-sorter-array.h2
-rw-r--r--e-util/e-sorter.c2
-rw-r--r--e-util/e-sorter.h2
-rw-r--r--e-util/e-text-event-processor-emacs-like.c4
-rw-r--r--e-util/e-text-event-processor-emacs-like.h2
-rw-r--r--e-util/e-text-event-processor-types.h8
-rw-r--r--e-util/e-text-event-processor.c5
-rw-r--r--e-util/e-text-event-processor.h2
-rw-r--r--e-util/e-unicode.c6
-rw-r--r--e-util/e-unicode.h3
-rw-r--r--e-util/e-util-private.h2
-rw-r--r--e-util/e-util.c8
-rw-r--r--e-util/e-util.h12
-rw-r--r--e-util/e-win32-reloc.c2
-rw-r--r--e-util/e-xml-utils.c2
-rw-r--r--e-util/e-xml-utils.h4
-rw-r--r--e-util/gconf-bridge.c43
-rw-r--r--e-util/gconf-bridge.h6
-rw-r--r--em-format/em-format-quote.c50
-rw-r--r--em-format/em-format-quote.h2
-rw-r--r--em-format/em-format.c39
-rw-r--r--em-format/em-format.h4
-rw-r--r--em-format/em-stripsig-filter.c2
-rw-r--r--em-format/em-stripsig-filter.h2
-rw-r--r--filter/filter-code.c2
-rw-r--r--filter/filter-code.h2
-rw-r--r--filter/filter-colour.c2
-rw-r--r--filter/filter-colour.h2
-rw-r--r--filter/filter-datespec.c2
-rw-r--r--filter/filter-datespec.h2
-rw-r--r--filter/filter-element.c2
-rw-r--r--filter/filter-element.h2
-rw-r--r--filter/filter-file.c4
-rw-r--r--filter/filter-file.h2
-rw-r--r--filter/filter-input.c4
-rw-r--r--filter/filter-input.h2
-rw-r--r--filter/filter-int.c2
-rw-r--r--filter/filter-int.h2
-rw-r--r--filter/filter-option.c2
-rw-r--r--filter/filter-option.h2
-rw-r--r--filter/filter-part.c2
-rw-r--r--filter/filter-part.h2
-rw-r--r--filter/filter-rule.c6
-rw-r--r--filter/filter-rule.h2
-rw-r--r--filter/rule-context.c2
-rw-r--r--filter/rule-context.h2
-rw-r--r--filter/rule-editor.c4
-rw-r--r--filter/rule-editor.h2
-rw-r--r--help/el/el.po5479
-rw-r--r--help/el/figures/account_editor_a.pngbin0 -> 74930 bytes-rw-r--r--help/el/figures/attach_reminder_a.pngbin0 -> 32748 bytes-rw-r--r--help/el/figures/categories_a.pngbin0 -> 67805 bytes-rw-r--r--help/el/figures/collap_head_a.pngbin0 -> 18934 bytes-rw-r--r--help/el/figures/contacts_mainwindow_a.pngbin0 -> 80979 bytes-rw-r--r--help/el/figures/evo_Wcal_prop_a.pngbin0 -> 47371 bytes-rw-r--r--help/el/figures/evo_account_editor_a.pngbin0 -> 65027 bytes-rw-r--r--help/el/figures/evo_adv_search_a.pngbin0 -> 45662 bytes-rw-r--r--help/el/figures/evo_allday_a.pngbin0 -> 145643 bytes-rw-r--r--help/el/figures/evo_attachreminder_plugin.pngbin0 -> 85023 bytes-rw-r--r--help/el/figures/evo_backup.pngbin0 -> 30348 bytes-rw-r--r--help/el/figures/evo_backup_prgsbar.pngbin0 -> 49216 bytes-rw-r--r--help/el/figures/evo_backup_warning.pngbin0 -> 42326 bytes-rw-r--r--help/el/figures/evo_cal_a.pngbin0 -> 126981 bytes-rw-r--r--help/el/figures/evo_cal_advsearch.pngbin0 -> 35989 bytes-rw-r--r--help/el/figures/evo_cal_callout_a.pngbin0 -> 106234 bytes-rw-r--r--help/el/figures/evo_cal_prop_a.pngbin0 -> 25784 bytes-rw-r--r--help/el/figures/evo_calender_appointmnt.pngbin0 -> 56722 bytes-rw-r--r--help/el/figures/evo_contacteditor_a.pngbin0 -> 81465 bytes-rw-r--r--help/el/figures/evo_custom_header.pngbin0 -> 19553 bytes-rw-r--r--help/el/figures/evo_edit_rule_a.pngbin0 -> 47996 bytes-rw-r--r--help/el/figures/evo_edit_search.pngbin0 -> 33644 bytes-rw-r--r--help/el/figures/evo_exchng_mapi.pngbin0 -> 78289 bytes-rw-r--r--help/el/figures/evo_flag_follow_up_a.pngbin0 -> 40660 bytes-rw-r--r--help/el/figures/evo_gwreceive_a.pngbin0 -> 60909 bytes-rw-r--r--help/el/figures/evo_identity_a.pngbin0 -> 60016 bytes-rw-r--r--help/el/figures/evo_imapreceive_a.pngbin0 -> 87180 bytes-rw-r--r--help/el/figures/evo_import.pngbin0 -> 43519 bytes-rw-r--r--help/el/figures/evo_import_asst_a.pngbin0 -> 48093 bytes-rw-r--r--help/el/figures/evo_mail_a.pngbin0 -> 169456 bytes-rw-r--r--help/el/figures/evo_mail_callout_a.pngbin0 -> 182740 bytes-rw-r--r--help/el/figures/evo_maildirreceive_a.pngbin0 -> 36563 bytes-rw-r--r--help/el/figures/evo_mboxreceive_a.pngbin0 -> 42352 bytes-rw-r--r--help/el/figures/evo_memo_a.pngbin0 -> 40120 bytes-rw-r--r--help/el/figures/evo_mereceive_a.pngbin0 -> 83588 bytes-rw-r--r--help/el/figures/evo_message_filters_a.pngbin0 -> 37127 bytes-rw-r--r--help/el/figures/evo_mhreceive_a.pngbin0 -> 36894 bytes-rw-r--r--help/el/figures/evo_newmail.pngbin0 -> 7738 bytes-rw-r--r--help/el/figures/evo_newmess_a.pngbin0 -> 43220 bytes-rw-r--r--help/el/figures/evo_offline.pngbin0 -> 31953 bytes-rw-r--r--help/el/figures/evo_popreceive_a.pngbin0 -> 87180 bytes-rw-r--r--help/el/figures/evo_receive_setup_a.pngbin0 -> 64065 bytes-rw-r--r--help/el/figures/evo_rule_a.pngbin0 -> 75174 bytes-rw-r--r--help/el/figures/evo_select_folder.pngbin0 -> 36423 bytes-rw-r--r--help/el/figures/evo_send_setup_a.pngbin0 -> 77180 bytes-rw-r--r--help/el/figures/evo_timezone_a.pngbin0 -> 198129 bytes-rw-r--r--help/el/figures/evo_usereceive_a.pngbin0 -> 42446 bytes-rw-r--r--help/el/figures/exchg-identity.pngbin0 -> 60015 bytes-rw-r--r--help/el/figures/exchng-rec-mails.pngbin0 -> 65564 bytes-rw-r--r--help/el/figures/exchng-rec-options.pngbin0 -> 84818 bytes-rw-r--r--help/el/figures/filter-new-fig.pngbin0 -> 46393 bytes-rw-r--r--help/el/figures/free_busy.pngbin0 -> 50895 bytes-rw-r--r--help/el/figures/google_cal_view.pngbin0 -> 46299 bytes-rw-r--r--help/el/figures/mail-threaded.pngbin0 -> 17136 bytes-rw-r--r--help/el/figures/quick_add_a.pngbin0 -> 28292 bytes-rw-r--r--help/el/figures/ver_view_a.pngbin0 -> 183841 bytes-rw-r--r--iconv-detect.c2
-rw-r--r--mail/Makefile.am1
-rw-r--r--mail/e-attachment-handler-mail.c6
-rw-r--r--mail/e-attachment-handler-mail.h2
-rw-r--r--mail/e-mail-attachment-bar.c2
-rw-r--r--mail/e-mail-attachment-bar.h2
-rw-r--r--mail/e-mail-browser.c2
-rw-r--r--mail/e-mail-browser.h2
-rw-r--r--mail/e-mail-display.c2
-rw-r--r--mail/e-mail-display.h2
-rw-r--r--mail/e-mail-label-dialog.c2
-rw-r--r--mail/e-mail-label-dialog.h2
-rw-r--r--mail/e-mail-label-list-store.c2
-rw-r--r--mail/e-mail-label-list-store.h2
-rw-r--r--mail/e-mail-label-manager.c2
-rw-r--r--mail/e-mail-label-manager.h2
-rw-r--r--mail/e-mail-label-tree-view.c2
-rw-r--r--mail/e-mail-label-tree-view.h2
-rw-r--r--mail/e-mail-reader-utils.c2
-rw-r--r--mail/e-mail-reader-utils.h2
-rw-r--r--mail/e-mail-reader.c4
-rw-r--r--mail/e-mail-reader.h2
-rw-r--r--mail/e-mail-search-bar.c2
-rw-r--r--mail/e-mail-search-bar.h2
-rw-r--r--mail/e-mail-shell-backend.c4
-rw-r--r--mail/e-mail-shell-backend.h2
-rw-r--r--mail/e-mail-shell-content.c2
-rw-r--r--mail/e-mail-shell-content.h2
-rw-r--r--mail/e-mail-shell-migrate.c158
-rw-r--r--mail/e-mail-shell-migrate.h2
-rw-r--r--mail/e-mail-shell-sidebar.c2
-rw-r--r--mail/e-mail-shell-sidebar.h2
-rw-r--r--mail/e-mail-shell-view-actions.c2
-rw-r--r--mail/e-mail-shell-view-actions.h2
-rw-r--r--mail/e-mail-shell-view-private.c2
-rw-r--r--mail/e-mail-shell-view-private.h2
-rw-r--r--mail/e-mail-shell-view.c2
-rw-r--r--mail/e-mail-shell-view.h2
-rw-r--r--mail/e-searching-tokenizer.c7
-rw-r--r--mail/e-searching-tokenizer.h2
-rw-r--r--mail/em-account-editor.c208
-rw-r--r--mail/em-account-editor.h4
-rw-r--r--mail/em-account-prefs.c2
-rw-r--r--mail/em-account-prefs.h2
-rw-r--r--mail/em-composer-prefs.c18
-rw-r--r--mail/em-composer-prefs.h2
-rw-r--r--mail/em-composer-utils.c29
-rw-r--r--mail/em-composer-utils.h4
-rw-r--r--mail/em-config.c2
-rw-r--r--mail/em-config.h2
-rw-r--r--mail/em-event.c2
-rw-r--r--mail/em-event.h2
-rw-r--r--mail/em-filter-context.c2
-rw-r--r--mail/em-filter-context.h2
-rw-r--r--mail/em-filter-editor.c4
-rw-r--r--mail/em-filter-editor.h6
-rw-r--r--mail/em-filter-folder-element.c2
-rw-r--r--mail/em-filter-folder-element.h2
-rw-r--r--mail/em-filter-rule.c4
-rw-r--r--mail/em-filter-rule.h2
-rw-r--r--mail/em-filter-source-element.c2
-rw-r--r--mail/em-filter-source-element.h2
-rw-r--r--mail/em-folder-browser.c10
-rw-r--r--mail/em-folder-browser.h2
-rw-r--r--mail/em-folder-properties.c14
-rw-r--r--mail/em-folder-properties.h2
-rw-r--r--mail/em-folder-selection-button.c2
-rw-r--r--mail/em-folder-selection-button.h2
-rw-r--r--mail/em-folder-selection.c2
-rw-r--r--mail/em-folder-selection.h2
-rw-r--r--mail/em-folder-selector.c2
-rw-r--r--mail/em-folder-selector.h2
-rw-r--r--mail/em-folder-tree-model.c3
-rw-r--r--mail/em-folder-tree-model.h2
-rw-r--r--mail/em-folder-tree.c30
-rw-r--r--mail/em-folder-tree.h2
-rw-r--r--mail/em-folder-utils.c8
-rw-r--r--mail/em-folder-utils.h2
-rw-r--r--mail/em-folder-view.c17
-rw-r--r--mail/em-folder-view.h2
-rw-r--r--mail/em-format-hook.c2
-rw-r--r--mail/em-format-hook.h2
-rw-r--r--mail/em-format-html-display.c52
-rw-r--r--mail/em-format-html-display.h2
-rw-r--r--mail/em-format-html-print.c2
-rw-r--r--mail/em-format-html-print.h2
-rw-r--r--mail/em-format-html.c128
-rw-r--r--mail/em-format-html.h2
-rw-r--r--mail/em-html-stream.c2
-rw-r--r--mail/em-html-stream.h2
-rw-r--r--mail/em-icon-stream.c2
-rw-r--r--mail/em-icon-stream.h2
-rw-r--r--mail/em-inline-filter.c2
-rw-r--r--mail/em-inline-filter.h2
-rw-r--r--mail/em-junk-hook.c2
-rw-r--r--mail/em-junk-hook.h2
-rw-r--r--mail/em-mailer-prefs.c38
-rw-r--r--mail/em-mailer-prefs.h6
-rw-r--r--mail/em-menu.c2
-rw-r--r--mail/em-menu.h2
-rw-r--r--mail/em-network-prefs.c89
-rw-r--r--mail/em-network-prefs.h8
-rw-r--r--mail/em-popup.c2
-rw-r--r--mail/em-popup.h2
-rw-r--r--mail/em-search-context.c2
-rw-r--r--mail/em-search-context.h2
-rw-r--r--mail/em-subscribe-editor.c13
-rw-r--r--mail/em-subscribe-editor.h2
-rw-r--r--mail/em-sync-stream.c2
-rw-r--r--mail/em-sync-stream.h2
-rw-r--r--mail/em-utils.c20
-rw-r--r--mail/em-utils.h2
-rw-r--r--mail/em-vfolder-context.c2
-rw-r--r--mail/em-vfolder-context.h2
-rw-r--r--mail/em-vfolder-editor.c2
-rw-r--r--mail/em-vfolder-editor.h2
-rw-r--r--mail/em-vfolder-rule.c8
-rw-r--r--mail/em-vfolder-rule.h2
-rw-r--r--mail/evolution-module-mail.c2
-rw-r--r--mail/importers/elm-importer.c2
-rw-r--r--mail/importers/evolution-mbox-importer.c2
-rw-r--r--mail/importers/mail-importer.c2
-rw-r--r--mail/importers/mail-importer.h4
-rw-r--r--mail/importers/pine-importer.c2
-rw-r--r--mail/mail-autofilter.c2
-rw-r--r--mail/mail-autofilter.h2
-rw-r--r--mail/mail-component.c5
-rw-r--r--mail/mail-component.h2
-rw-r--r--mail/mail-config.c30
-rw-r--r--mail/mail-config.h2
-rw-r--r--mail/mail-dialogs.glade56
-rw-r--r--mail/mail-folder-cache.c5
-rw-r--r--mail/mail-folder-cache.h2
-rw-r--r--mail/mail-mt.c2
-rw-r--r--mail/mail-mt.h2
-rw-r--r--mail/mail-ops.c24
-rw-r--r--mail/mail-ops.h6
-rw-r--r--mail/mail-send-recv.c14
-rw-r--r--mail/mail-send-recv.h2
-rw-r--r--mail/mail-session.c2
-rw-r--r--mail/mail-session.h2
-rw-r--r--mail/mail-tools.c2
-rw-r--r--mail/mail-tools.h2
-rw-r--r--mail/mail-vfolder.c5
-rw-r--r--mail/mail-vfolder.h2
-rw-r--r--mail/message-list.c46
-rw-r--r--mail/message-list.h2
-rw-r--r--mail/message-tag-editor.c2
-rw-r--r--mail/message-tag-editor.h2
-rw-r--r--mail/message-tag-followup.c4
-rw-r--r--mail/message-tag-followup.h2
-rw-r--r--plugins/addressbook-file/addressbook-file.c2
-rw-r--r--plugins/attachment-reminder/attachment-reminder.c2
-rw-r--r--plugins/audio-inline/audio-inline.c4
-rw-r--r--plugins/backup-restore/backup-restore.c6
-rw-r--r--plugins/backup-restore/backup.c39
-rw-r--r--plugins/bbdb/bbdb.c5
-rw-r--r--plugins/bbdb/bbdb.h2
-rw-r--r--plugins/bbdb/gaimbuddies.c10
-rw-r--r--plugins/bbdb/test-evobuddy.c2
-rw-r--r--plugins/bogo-junk-plugin/bf-junk-filter.c30
-rw-r--r--plugins/caldav/caldav-source.c57
-rw-r--r--plugins/calendar-file/calendar-file.c2
-rw-r--r--plugins/copy-tool/copy-tool.c2
-rw-r--r--plugins/default-mailer/default-mailer.c2
-rw-r--r--plugins/default-source/default-source.c2
-rw-r--r--plugins/email-custom-header/Makefile.am1
-rw-r--r--plugins/email-custom-header/email-custom-header.c92
-rw-r--r--plugins/email-custom-header/email-custom-header.h4
-rw-r--r--plugins/exchange-operations/exchange-account-setup.c46
-rw-r--r--plugins/exchange-operations/exchange-calendar.c2
-rw-r--r--plugins/exchange-operations/exchange-change-password.c2
-rw-r--r--plugins/exchange-operations/exchange-change-password.h2
-rw-r--r--plugins/exchange-operations/exchange-config-listener.c8
-rw-r--r--plugins/exchange-operations/exchange-config-listener.h2
-rw-r--r--plugins/exchange-operations/exchange-contacts.c4
-rw-r--r--plugins/exchange-operations/exchange-delegates-user.c15
-rw-r--r--plugins/exchange-operations/exchange-delegates-user.h2
-rw-r--r--plugins/exchange-operations/exchange-delegates.c2
-rw-r--r--plugins/exchange-operations/exchange-delegates.h2
-rw-r--r--plugins/exchange-operations/exchange-folder-permission.c4
-rw-r--r--plugins/exchange-operations/exchange-folder-size-display.c2
-rw-r--r--plugins/exchange-operations/exchange-folder-size-display.h2
-rw-r--r--plugins/exchange-operations/exchange-folder-subscription.c8
-rw-r--r--plugins/exchange-operations/exchange-folder-subscription.h4
-rw-r--r--plugins/exchange-operations/exchange-folder.c23
-rw-r--r--plugins/exchange-operations/exchange-mail-send-options.c2
-rw-r--r--plugins/exchange-operations/exchange-operations.c40
-rw-r--r--plugins/exchange-operations/exchange-operations.h2
-rw-r--r--plugins/exchange-operations/exchange-permissions-dialog.c2
-rw-r--r--plugins/exchange-operations/exchange-permissions-dialog.h2
-rw-r--r--plugins/exchange-operations/exchange-send-options.c2
-rw-r--r--plugins/exchange-operations/exchange-send-options.h2
-rw-r--r--plugins/exchange-operations/exchange-user-dialog.c2
-rw-r--r--plugins/exchange-operations/exchange-user-dialog.h2
-rw-r--r--plugins/face/Makefile.am1
-rw-r--r--plugins/face/face.c2
-rw-r--r--plugins/folder-unsubscribe/folder-unsubscribe.c2
-rw-r--r--plugins/google-account-setup/google-contacts-source.c2
-rw-r--r--plugins/google-account-setup/google-contacts-source.h2
-rw-r--r--plugins/google-account-setup/google-source.c4
-rw-r--r--plugins/groupwise-account-setup/camel-gw-listener.c18
-rw-r--r--plugins/groupwise-account-setup/camel-gw-listener.h2
-rw-r--r--plugins/groupwise-account-setup/groupwise-account-setup.c6
-rw-r--r--plugins/groupwise-features/Makefile.am1
-rw-r--r--plugins/groupwise-features/addressbook-groupwise.c2
-rw-r--r--plugins/groupwise-features/install-shared.c2
-rw-r--r--plugins/groupwise-features/junk-mail-settings.c4
-rw-r--r--plugins/groupwise-features/junk-settings.c19
-rw-r--r--plugins/groupwise-features/junk-settings.h2
-rw-r--r--plugins/groupwise-features/mail-retract.c12
-rw-r--r--plugins/groupwise-features/mail-send-options.c2
-rw-r--r--plugins/groupwise-features/mail-send-options.h2
-rw-r--r--plugins/groupwise-features/org-gnome-process-meeting.error.xml44
-rw-r--r--plugins/groupwise-features/process-meeting.c38
-rw-r--r--plugins/groupwise-features/proxy-login.c10
-rw-r--r--plugins/groupwise-features/proxy-login.h2
-rw-r--r--plugins/groupwise-features/proxy.c5
-rw-r--r--plugins/groupwise-features/proxy.h3
-rw-r--r--plugins/groupwise-features/send-options.c9
-rw-r--r--plugins/groupwise-features/share-folder-common.c6
-rw-r--r--plugins/groupwise-features/share-folder.c16
-rw-r--r--plugins/groupwise-features/share-folder.h6
-rw-r--r--plugins/groupwise-features/status-track.c4
-rw-r--r--plugins/hula-account-setup/camel-hula-listener.c2
-rw-r--r--plugins/hula-account-setup/camel-hula-listener.h2
-rw-r--r--plugins/hula-account-setup/hula-account-setup.c2
-rw-r--r--plugins/imap-features/Makefile.am1
-rw-r--r--plugins/imap-features/imap-headers.c4
-rw-r--r--plugins/ipod-sync/evolution-ipod-sync.c2
-rw-r--r--plugins/ipod-sync/evolution-ipod-sync.h2
-rw-r--r--plugins/ipod-sync/format-handler.h2
-rw-r--r--plugins/ipod-sync/ical-format.c4
-rw-r--r--plugins/ipod-sync/ipod-sync.c4
-rw-r--r--plugins/ipod-sync/ipod.c2
-rw-r--r--plugins/ipod-sync/sync.c4
-rw-r--r--plugins/itip-formatter/itip-formatter.c27
-rw-r--r--plugins/itip-formatter/itip-view.c29
-rw-r--r--plugins/itip-formatter/itip-view.h2
-rw-r--r--plugins/mail-notification/mail-notification.c24
-rw-r--r--plugins/mail-to-task/mail-to-task.c6
-rw-r--r--plugins/mailing-list-actions/mailing-list-actions.c2
-rw-r--r--plugins/mark-all-read/Makefile.am1
-rw-r--r--plugins/mark-all-read/mark-all-read.c2
-rw-r--r--plugins/mono/mono-plugin.c8
-rw-r--r--plugins/mono/mono-plugin.h2
-rw-r--r--plugins/plugin-manager/plugin-manager.c6
-rw-r--r--plugins/prefer-plain/prefer-plain.c2
-rw-r--r--plugins/profiler/profiler.c2
-rw-r--r--plugins/pst-import/pst-importer.c240
-rw-r--r--plugins/publish-calendar/publish-calendar.c14
-rw-r--r--plugins/publish-calendar/publish-format-fb.c2
-rw-r--r--plugins/publish-calendar/publish-format-fb.h2
-rw-r--r--plugins/publish-calendar/publish-format-ical.c2
-rw-r--r--plugins/publish-calendar/publish-format-ical.h2
-rw-r--r--plugins/publish-calendar/publish-location.c2
-rw-r--r--plugins/publish-calendar/publish-location.h2
-rw-r--r--plugins/publish-calendar/url-editor-dialog.c5
-rw-r--r--plugins/publish-calendar/url-editor-dialog.h2
-rw-r--r--plugins/python/python-plugin-loader.c12
-rw-r--r--plugins/python/python-plugin-loader.h2
-rw-r--r--plugins/sa-junk-plugin/em-junk-filter.c68
-rw-r--r--plugins/save-calendar/csv-format.c4
-rw-r--r--plugins/save-calendar/format-handler.h2
-rw-r--r--plugins/save-calendar/ical-format.c2
-rw-r--r--plugins/save-calendar/rdf-format.c2
-rw-r--r--plugins/save-calendar/save-calendar.c2
-rw-r--r--plugins/startup-wizard/startup-wizard.c4
-rw-r--r--plugins/subject-thread/subject-thread.c2
-rw-r--r--plugins/templates/templates.c66
-rw-r--r--plugins/tnef-attachments/tnef-plugin.c4
-rw-r--r--plugins/vcard-inline/vcard-inline.c2
-rw-r--r--plugins/webdav-account-setup/webdav-contacts-source.c2
-rw-r--r--po/es.po2026
-rw-r--r--po/he.po12295
-rw-r--r--po/ta.po8361
-rw-r--r--po/th.po14
-rw-r--r--shell/e-config-upgrade.c2
-rw-r--r--shell/e-config-upgrade.h2
-rw-r--r--shell/e-shell-backend.c2
-rw-r--r--shell/e-shell-backend.h2
-rw-r--r--shell/e-shell-common.h2
-rw-r--r--shell/e-shell-content.c4
-rw-r--r--shell/e-shell-content.h2
-rw-r--r--shell/e-shell-importer.c6
-rw-r--r--shell/e-shell-importer.h2
-rw-r--r--shell/e-shell-migrate.c2
-rw-r--r--shell/e-shell-migrate.h2
-rw-r--r--shell/e-shell-nm.c2
-rw-r--r--shell/e-shell-settings.c2
-rw-r--r--shell/e-shell-settings.h2
-rw-r--r--shell/e-shell-sidebar.c4
-rw-r--r--shell/e-shell-sidebar.h2
-rw-r--r--shell/e-shell-switcher.c2
-rw-r--r--shell/e-shell-switcher.h2
-rw-r--r--shell/e-shell-taskbar.c2
-rw-r--r--shell/e-shell-taskbar.h2
-rw-r--r--shell/e-shell-view.c2
-rw-r--r--shell/e-shell-view.h2
-rw-r--r--shell/e-shell-window-actions.c4
-rw-r--r--shell/e-shell-window-actions.h2
-rw-r--r--shell/e-shell-window-private.c2
-rw-r--r--shell/e-shell-window-private.h2
-rw-r--r--shell/e-shell-window.c2
-rw-r--r--shell/e-shell-window.h2
-rw-r--r--shell/e-shell.c2
-rw-r--r--shell/e-shell.h2
-rw-r--r--shell/es-event.c2
-rw-r--r--shell/es-event.h2
-rw-r--r--shell/main.c7
-rw-r--r--shell/test/e-test-shell-backend.c2
-rw-r--r--shell/test/e-test-shell-backend.h2
-rw-r--r--shell/test/e-test-shell-view.c2
-rw-r--r--shell/test/e-test-shell-view.h2
-rw-r--r--shell/test/evolution-module-test.c2
-rw-r--r--smime/gui/ca-trust-dialog.c2
-rw-r--r--smime/gui/ca-trust-dialog.h2
-rw-r--r--smime/gui/cert-trust-dialog.c2
-rw-r--r--smime/gui/cert-trust-dialog.h2
-rw-r--r--smime/gui/certificate-manager.c2
-rw-r--r--smime/gui/certificate-manager.h2
-rw-r--r--smime/gui/certificate-viewer.c2
-rw-r--r--smime/gui/certificate-viewer.h2
-rw-r--r--smime/gui/component.c2
-rw-r--r--smime/gui/component.h2
-rw-r--r--smime/gui/e-cert-selector.c2
-rw-r--r--smime/gui/e-cert-selector.h2
-rw-r--r--smime/lib/e-asn1-object.h2
-rw-r--r--smime/lib/e-cert-db.c4
-rw-r--r--smime/lib/e-cert-db.h2
-rw-r--r--smime/lib/e-cert-trust.h2
-rw-r--r--smime/lib/e-cert.h2
-rw-r--r--smime/lib/e-pkcs12.h2
-rw-r--r--smime/tests/import-cert.c2
-rw-r--r--tools/killev.c2
-rw-r--r--widgets/e-timezone-dialog/e-timezone-dialog.c27
-rw-r--r--widgets/e-timezone-dialog/e-timezone-dialog.h2
-rw-r--r--widgets/menus/gal-define-views-dialog.c6
-rw-r--r--widgets/menus/gal-define-views-dialog.h2
-rw-r--r--widgets/menus/gal-define-views-model.c2
-rw-r--r--widgets/menus/gal-define-views-model.h2
-rw-r--r--widgets/menus/gal-view-collection.c2
-rw-r--r--widgets/menus/gal-view-collection.h2
-rw-r--r--widgets/menus/gal-view-etable.c2
-rw-r--r--widgets/menus/gal-view-etable.h2
-rw-r--r--widgets/menus/gal-view-factory-etable.c2
-rw-r--r--widgets/menus/gal-view-factory-etable.h2
-rw-r--r--widgets/menus/gal-view-factory.c2
-rw-r--r--widgets/menus/gal-view-factory.h2
-rw-r--r--widgets/menus/gal-view-instance-save-as-dialog.c2
-rw-r--r--widgets/menus/gal-view-instance-save-as-dialog.h2
-rw-r--r--widgets/menus/gal-view-instance.c2
-rw-r--r--widgets/menus/gal-view-instance.h2
-rw-r--r--widgets/menus/gal-view-new-dialog.c4
-rw-r--r--widgets/menus/gal-view-new-dialog.h2
-rw-r--r--widgets/menus/gal-view.c2
-rw-r--r--widgets/menus/gal-view.h2
-rw-r--r--widgets/misc/a11y/ea-calendar-cell.c2
-rw-r--r--widgets/misc/a11y/ea-calendar-cell.h2
-rw-r--r--widgets/misc/a11y/ea-calendar-item.c4
-rw-r--r--widgets/misc/a11y/ea-calendar-item.h2
-rw-r--r--widgets/misc/a11y/ea-widgets.c2
-rw-r--r--widgets/misc/a11y/ea-widgets.h2
-rw-r--r--widgets/misc/e-account-combo-box.c2
-rw-r--r--widgets/misc/e-account-combo-box.h2
-rw-r--r--widgets/misc/e-account-manager.c2
-rw-r--r--widgets/misc/e-account-manager.h2
-rw-r--r--widgets/misc/e-account-tree-view.c2
-rw-r--r--widgets/misc/e-account-tree-view.h2
-rw-r--r--widgets/misc/e-activity-proxy.c2
-rw-r--r--widgets/misc/e-activity-proxy.h2
-rw-r--r--widgets/misc/e-activity.c4
-rw-r--r--widgets/misc/e-activity.h2
-rw-r--r--widgets/misc/e-alert-activity.c2
-rw-r--r--widgets/misc/e-alert-activity.h2
-rw-r--r--widgets/misc/e-attachment-button.c2
-rw-r--r--widgets/misc/e-attachment-button.h2
-rw-r--r--widgets/misc/e-attachment-dialog.c2
-rw-r--r--widgets/misc/e-attachment-dialog.h2
-rw-r--r--widgets/misc/e-attachment-handler-image.c2
-rw-r--r--widgets/misc/e-attachment-handler-image.h2
-rw-r--r--widgets/misc/e-attachment-handler.c2
-rw-r--r--widgets/misc/e-attachment-handler.h2
-rw-r--r--widgets/misc/e-attachment-icon-view.c2
-rw-r--r--widgets/misc/e-attachment-icon-view.h2
-rw-r--r--widgets/misc/e-attachment-paned.c2
-rw-r--r--widgets/misc/e-attachment-paned.h2
-rw-r--r--widgets/misc/e-attachment-store.c2
-rw-r--r--widgets/misc/e-attachment-store.h2
-rw-r--r--widgets/misc/e-attachment-tree-view.c2
-rw-r--r--widgets/misc/e-attachment-tree-view.h2
-rw-r--r--widgets/misc/e-attachment-view.c8
-rw-r--r--widgets/misc/e-attachment-view.h2
-rw-r--r--widgets/misc/e-attachment.c2
-rw-r--r--widgets/misc/e-attachment.h2
-rw-r--r--widgets/misc/e-calendar-item.c8
-rw-r--r--widgets/misc/e-calendar-item.h11
-rw-r--r--widgets/misc/e-calendar.c2
-rw-r--r--widgets/misc/e-calendar.h2
-rw-r--r--widgets/misc/e-canvas-background.c2
-rw-r--r--widgets/misc/e-canvas-background.h2
-rw-r--r--widgets/misc/e-canvas-utils.c2
-rw-r--r--widgets/misc/e-canvas-utils.h2
-rw-r--r--widgets/misc/e-canvas-vbox.c4
-rw-r--r--widgets/misc/e-canvas-vbox.h2
-rw-r--r--widgets/misc/e-canvas.c4
-rw-r--r--widgets/misc/e-canvas.h2
-rw-r--r--widgets/misc/e-cell-renderer-combo.c2
-rw-r--r--widgets/misc/e-cell-renderer-combo.h2
-rw-r--r--widgets/misc/e-charset-picker.c10
-rw-r--r--widgets/misc/e-charset-picker.h2
-rw-r--r--widgets/misc/e-colors.c2
-rw-r--r--widgets/misc/e-colors.h2
-rw-r--r--widgets/misc/e-combo-cell-editable.c2
-rw-r--r--widgets/misc/e-combo-cell-editable.h2
-rw-r--r--widgets/misc/e-cursors.c10
-rw-r--r--widgets/misc/e-cursors.h2
-rw-r--r--widgets/misc/e-dateedit.c6
-rw-r--r--widgets/misc/e-file-activity.c2
-rw-r--r--widgets/misc/e-file-activity.h2
-rw-r--r--widgets/misc/e-filter-bar.c9
-rw-r--r--widgets/misc/e-filter-bar.h14
-rw-r--r--widgets/misc/e-gui-utils.c2
-rw-r--r--widgets/misc/e-gui-utils.h2
-rw-r--r--widgets/misc/e-icon-entry.h2
-rw-r--r--widgets/misc/e-image-chooser.c4
-rw-r--r--widgets/misc/e-image-chooser.h2
-rw-r--r--widgets/misc/e-map.c2
-rw-r--r--widgets/misc/e-map.h2
-rw-r--r--widgets/misc/e-menu-tool-button.c2
-rw-r--r--widgets/misc/e-menu-tool-button.h2
-rw-r--r--widgets/misc/e-online-button.c2
-rw-r--r--widgets/misc/e-online-button.h2
-rw-r--r--widgets/misc/e-pilot-settings.c2
-rw-r--r--widgets/misc/e-pilot-settings.h2
-rw-r--r--widgets/misc/e-popup-action.c2
-rw-r--r--widgets/misc/e-popup-action.h2
-rw-r--r--widgets/misc/e-popup-menu.c2
-rw-r--r--widgets/misc/e-popup-menu.h70
-rw-r--r--widgets/misc/e-preferences-window.c2
-rw-r--r--widgets/misc/e-preferences-window.h2
-rw-r--r--widgets/misc/e-printable.c2
-rw-r--r--widgets/misc/e-printable.h2
-rw-r--r--widgets/misc/e-search-bar.c23
-rw-r--r--widgets/misc/e-selection-model-array.c2
-rw-r--r--widgets/misc/e-selection-model-array.h2
-rw-r--r--widgets/misc/e-selection-model-simple.c6
-rw-r--r--widgets/misc/e-selection-model-simple.h2
-rw-r--r--widgets/misc/e-selection-model.c2
-rw-r--r--widgets/misc/e-selection-model.h2
-rw-r--r--widgets/misc/e-send-options.c2
-rw-r--r--widgets/misc/e-send-options.h4
-rw-r--r--widgets/misc/e-signature-combo-box.c2
-rw-r--r--widgets/misc/e-signature-combo-box.h2
-rw-r--r--widgets/misc/e-signature-editor.c2
-rw-r--r--widgets/misc/e-signature-editor.h2
-rw-r--r--widgets/misc/e-signature-manager.c2
-rw-r--r--widgets/misc/e-signature-manager.h2
-rw-r--r--widgets/misc/e-signature-preview.c2
-rw-r--r--widgets/misc/e-signature-preview.h2
-rw-r--r--widgets/misc/e-signature-script-dialog.c2
-rw-r--r--widgets/misc/e-signature-script-dialog.h2
-rw-r--r--widgets/misc/e-signature-tree-view.c2
-rw-r--r--widgets/misc/e-signature-tree-view.h2
-rw-r--r--widgets/misc/e-spinner.c6
-rw-r--r--widgets/misc/e-timeout-activity.c2
-rw-r--r--widgets/misc/e-timeout-activity.h2
-rw-r--r--widgets/misc/e-url-entry.c2
-rw-r--r--widgets/misc/e-url-entry.h2
-rw-r--r--widgets/misc/pixmaps/cursor_cross.xpm2
-rw-r--r--widgets/misc/pixmaps/cursor_hand_closed.xpm2
-rw-r--r--widgets/misc/pixmaps/cursor_hand_open.xpm2
-rw-r--r--widgets/misc/pixmaps/cursor_zoom_in.xpm2
-rw-r--r--widgets/misc/pixmaps/cursor_zoom_out.xpm2
-rw-r--r--widgets/misc/test-calendar.c4
-rw-r--r--widgets/misc/test-dateedit.c20
-rw-r--r--widgets/misc/test-preferences-window.c2
-rw-r--r--widgets/table/a11y/gal-a11y-e-cell-popup.c2
-rw-r--r--widgets/table/a11y/gal-a11y-e-cell-popup.h2
-rw-r--r--widgets/table/a11y/gal-a11y-e-cell-registry.c2
-rw-r--r--widgets/table/a11y/gal-a11y-e-cell-registry.h2
-rw-r--r--widgets/table/a11y/gal-a11y-e-cell-text.c2
-rw-r--r--widgets/table/a11y/gal-a11y-e-cell-text.h2
-rw-r--r--widgets/table/a11y/gal-a11y-e-cell-toggle.c2
-rw-r--r--widgets/table/a11y/gal-a11y-e-cell-toggle.h2
-rw-r--r--widgets/table/a11y/gal-a11y-e-cell-tree.c2
-rw-r--r--widgets/table/a11y/gal-a11y-e-cell-tree.h2
-rw-r--r--widgets/table/a11y/gal-a11y-e-cell-vbox.c2
-rw-r--r--widgets/table/a11y/gal-a11y-e-cell-vbox.h2
-rw-r--r--widgets/table/a11y/gal-a11y-e-cell.c2
-rw-r--r--widgets/table/a11y/gal-a11y-e-cell.h2
-rw-r--r--widgets/table/a11y/gal-a11y-e-table-click-to-add-factory.c2
-rw-r--r--widgets/table/a11y/gal-a11y-e-table-click-to-add-factory.h2
-rw-r--r--widgets/table/a11y/gal-a11y-e-table-click-to-add.c2
-rw-r--r--widgets/table/a11y/gal-a11y-e-table-click-to-add.h2
-rw-r--r--widgets/table/a11y/gal-a11y-e-table-column-header.c2
-rw-r--r--widgets/table/a11y/gal-a11y-e-table-column-header.h2
-rw-r--r--widgets/table/a11y/gal-a11y-e-table-factory.c2
-rw-r--r--widgets/table/a11y/gal-a11y-e-table-factory.h2
-rw-r--r--widgets/table/a11y/gal-a11y-e-table-item-factory.c2
-rw-r--r--widgets/table/a11y/gal-a11y-e-table-item-factory.h2
-rw-r--r--widgets/table/a11y/gal-a11y-e-table-item.c2
-rw-r--r--widgets/table/a11y/gal-a11y-e-table-item.h2
-rw-r--r--widgets/table/a11y/gal-a11y-e-table.c2
-rw-r--r--widgets/table/a11y/gal-a11y-e-table.h2
-rw-r--r--widgets/table/a11y/gal-a11y-e-tree-factory.c2
-rw-r--r--widgets/table/a11y/gal-a11y-e-tree-factory.h2
-rw-r--r--widgets/table/a11y/gal-a11y-e-tree.c2
-rw-r--r--widgets/table/a11y/gal-a11y-e-tree.h2
-rw-r--r--widgets/table/add-col.xpm2
-rw-r--r--widgets/table/e-cell-checkbox.c2
-rw-r--r--widgets/table/e-cell-checkbox.h2
-rw-r--r--widgets/table/e-cell-combo.c4
-rw-r--r--widgets/table/e-cell-combo.h2
-rw-r--r--widgets/table/e-cell-date-edit.c6
-rw-r--r--widgets/table/e-cell-date-edit.h2
-rw-r--r--widgets/table/e-cell-date.c4
-rw-r--r--widgets/table/e-cell-date.h2
-rw-r--r--widgets/table/e-cell-hbox.c2
-rw-r--r--widgets/table/e-cell-hbox.h2
-rw-r--r--widgets/table/e-cell-number.c2
-rw-r--r--widgets/table/e-cell-number.h2
-rw-r--r--widgets/table/e-cell-percent.c2
-rw-r--r--widgets/table/e-cell-percent.h2
-rw-r--r--widgets/table/e-cell-pixbuf.c6
-rw-r--r--widgets/table/e-cell-pixbuf.h2
-rw-r--r--widgets/table/e-cell-popup.c4
-rw-r--r--widgets/table/e-cell-popup.h6
-rw-r--r--widgets/table/e-cell-size.c2
-rw-r--r--widgets/table/e-cell-size.h2
-rw-r--r--widgets/table/e-cell-text.c8
-rw-r--r--widgets/table/e-cell-text.h2
-rw-r--r--widgets/table/e-cell-toggle.c10
-rw-r--r--widgets/table/e-cell-toggle.h2
-rw-r--r--widgets/table/e-cell-vbox.c2
-rw-r--r--widgets/table/e-cell-vbox.h2
-rw-r--r--widgets/table/e-cell.c10
-rw-r--r--widgets/table/e-cell.h2
-rw-r--r--widgets/table/e-table-click-to-add.c2
-rw-r--r--widgets/table/e-table-click-to-add.h2
-rw-r--r--widgets/table/e-table-col-dnd.h2
-rw-r--r--widgets/table/e-table-col.c2
-rw-r--r--widgets/table/e-table-col.h2
-rw-r--r--widgets/table/e-table-column-specification.c2
-rw-r--r--widgets/table/e-table-column-specification.h2
-rw-r--r--widgets/table/e-table-column.c2
-rw-r--r--widgets/table/e-table-config-field.c2
-rw-r--r--widgets/table/e-table-config-field.h2
-rw-r--r--widgets/table/e-table-config.c7
-rw-r--r--widgets/table/e-table-config.h2
-rw-r--r--widgets/table/e-table-defines.h2
-rw-r--r--widgets/table/e-table-example-2.c2
-rw-r--r--widgets/table/e-table-extras.c18
-rw-r--r--widgets/table/e-table-extras.h18
-rw-r--r--widgets/table/e-table-field-chooser-dialog.c4
-rw-r--r--widgets/table/e-table-field-chooser-dialog.h2
-rw-r--r--widgets/table/e-table-field-chooser-item.c4
-rw-r--r--widgets/table/e-table-field-chooser-item.h2
-rw-r--r--widgets/table/e-table-field-chooser.c4
-rw-r--r--widgets/table/e-table-field-chooser.h2
-rw-r--r--widgets/table/e-table-group-container.c2
-rw-r--r--widgets/table/e-table-group-container.h2
-rw-r--r--widgets/table/e-table-group-leaf.c2
-rw-r--r--widgets/table/e-table-group-leaf.h2
-rw-r--r--widgets/table/e-table-group.c2
-rw-r--r--widgets/table/e-table-group.h2
-rw-r--r--widgets/table/e-table-header-item.c30
-rw-r--r--widgets/table/e-table-header-item.h2
-rw-r--r--widgets/table/e-table-header-utils.c2
-rw-r--r--widgets/table/e-table-header-utils.h2
-rw-r--r--widgets/table/e-table-header.c2
-rw-r--r--widgets/table/e-table-header.h2
-rw-r--r--widgets/table/e-table-item.c26
-rw-r--r--widgets/table/e-table-item.h2
-rw-r--r--widgets/table/e-table-memory-callbacks.c2
-rw-r--r--widgets/table/e-table-memory-callbacks.h2
-rw-r--r--widgets/table/e-table-memory-store.c2
-rw-r--r--widgets/table/e-table-memory-store.h2
-rw-r--r--widgets/table/e-table-memory.c2
-rw-r--r--widgets/table/e-table-memory.h2
-rw-r--r--widgets/table/e-table-model.c6
-rw-r--r--widgets/table/e-table-model.h4
-rw-r--r--widgets/table/e-table-one.c2
-rw-r--r--widgets/table/e-table-one.h2
-rw-r--r--widgets/table/e-table-scrolled.c2
-rw-r--r--widgets/table/e-table-scrolled.h2
-rw-r--r--widgets/table/e-table-search.c2
-rw-r--r--widgets/table/e-table-search.h2
-rw-r--r--widgets/table/e-table-selection-model.c8
-rw-r--r--widgets/table/e-table-selection-model.h4
-rw-r--r--widgets/table/e-table-simple.c2
-rw-r--r--widgets/table/e-table-simple.h2
-rw-r--r--widgets/table/e-table-sort-info.c2
-rw-r--r--widgets/table/e-table-sort-info.h2
-rw-r--r--widgets/table/e-table-sorted-variable.c2
-rw-r--r--widgets/table/e-table-sorted-variable.h2
-rw-r--r--widgets/table/e-table-sorted.c2
-rw-r--r--widgets/table/e-table-sorted.h2
-rw-r--r--widgets/table/e-table-sorter.c2
-rw-r--r--widgets/table/e-table-sorter.h2
-rw-r--r--widgets/table/e-table-sorting-utils.c2
-rw-r--r--widgets/table/e-table-sorting-utils.h2
-rw-r--r--widgets/table/e-table-specification.c4
-rw-r--r--widgets/table/e-table-specification.h2
-rw-r--r--widgets/table/e-table-state.c2
-rw-r--r--widgets/table/e-table-state.h2
-rw-r--r--widgets/table/e-table-subset-variable.c2
-rw-r--r--widgets/table/e-table-subset-variable.h2
-rw-r--r--widgets/table/e-table-subset.c2
-rw-r--r--widgets/table/e-table-subset.h2
-rw-r--r--widgets/table/e-table-tooltip.h2
-rw-r--r--widgets/table/e-table-utils.c2
-rw-r--r--widgets/table/e-table-utils.h2
-rw-r--r--widgets/table/e-table-without.c2
-rw-r--r--widgets/table/e-table-without.h2
-rw-r--r--widgets/table/e-table.c2
-rw-r--r--widgets/table/e-table.h2
-rw-r--r--widgets/table/e-tree-memory-callbacks.c2
-rw-r--r--widgets/table/e-tree-memory-callbacks.h2
-rw-r--r--widgets/table/e-tree-memory.c2
-rw-r--r--widgets/table/e-tree-memory.h2
-rw-r--r--widgets/table/e-tree-model.c2
-rw-r--r--widgets/table/e-tree-model.h2
-rw-r--r--widgets/table/e-tree-scrolled.c2
-rw-r--r--widgets/table/e-tree-scrolled.h2
-rw-r--r--widgets/table/e-tree-selection-model.c2
-rw-r--r--widgets/table/e-tree-selection-model.h2
-rw-r--r--widgets/table/e-tree-simple.c2
-rw-r--r--widgets/table/e-tree-simple.h2
-rw-r--r--widgets/table/e-tree-sorted-variable.c2
-rw-r--r--widgets/table/e-tree-sorted-variable.h2
-rw-r--r--widgets/table/e-tree-sorted.c2
-rw-r--r--widgets/table/e-tree-sorted.h2
-rw-r--r--widgets/table/e-tree-table-adapter.c3
-rw-r--r--widgets/table/e-tree-table-adapter.h2
-rw-r--r--widgets/table/e-tree.c4
-rw-r--r--widgets/table/e-tree.h2
-rw-r--r--widgets/table/remove-col.xpm2
-rw-r--r--widgets/table/tree-expanded.xpm2
-rw-r--r--widgets/table/tree-unexpanded.xpm2
-rw-r--r--widgets/text/a11y/gal-a11y-e-text-factory.c2
-rw-r--r--widgets/text/a11y/gal-a11y-e-text-factory.h2
-rw-r--r--widgets/text/a11y/gal-a11y-e-text.c2
-rw-r--r--widgets/text/a11y/gal-a11y-e-text.h2
-rw-r--r--widgets/text/e-reflow-model.c2
-rw-r--r--widgets/text/e-reflow-model.h2
-rw-r--r--widgets/text/e-reflow.c2
-rw-r--r--widgets/text/e-reflow.h2
-rw-r--r--widgets/text/e-text-model-repos.c2
-rw-r--r--widgets/text/e-text-model-repos.h2
-rw-r--r--widgets/text/e-text-model.c4
-rw-r--r--widgets/text/e-text-model.h2
-rw-r--r--widgets/text/e-text.c20
-rw-r--r--widgets/text/e-text.h2
1239 files changed, 17613 insertions, 16597 deletions
diff --git a/NEWS b/NEWS
index e80530d6ca..66fde4fbf2 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,57 @@
+Evolution 2.27.2 2009-05-25
+---------------------------
+
+Bug Fixed:
+
+ #274117 – Difficult to post a new message to newsgroups
+ (Matthew Barnes)
+ #440919 – Evolution can't attach "zero length" files (Matthew Barnes)
+ #458491 – Remove useless "Call To..." popup menu option
+ (Matthew Barnes)
+ #523216 – User-oriented plugin descriptions (Matthew Barnes)
+ #524497 – Wrong "From" value if multiple accounts configured
+ (Jeff Cai)
+ #559366 – Evolution: Cannot scroll the Calendar view using the
+ arrow keys (Marcel Stimberg)
+ #571496 – Migrate from deprecated gnome_execute to
+ g_spawn/xdg-terminal (Adam Petaccia)
+ #578176 – "Send message to contact" does not honor "always BCC"
+ (Matthew Barnes)
+ #578478 – Composer shows not all "From" information (Matthew Barnes)
+ #579779 – Evolution crashes when updating a repeated (ej, yearly)
+ event for al event instances (Milan Crha)
+ #580163 – alarm notify window does not resize correctly
+ (Ritesh Khadgaray)
+ #580900 – Kill libgnomeui/gnome-dateedit (Adam Petaccia)
+ #580925 – Better search bar for word searches (Matthew Barnes)
+ #581424 – Personal folder tree appears besides Public folder when
+ you go to Folder > Subscription (Johnny Jacob)
+ #581454 – Move nautilus-sendto integration to Evolution
+ (Matthew Barnes)
+ #582144 – Evolution not showing proper attachment filename
+ (Matthew Barnes)
+ #582168 – Remove duplicated shebang and comment from autogen.sh
+ (Damien Lespiau)
+ #582585 – Crash when deleting multiple attachments from composed
+ mail (Matthew Barnes)
+ #582626 – Time zone "select" button is broken (Milan Crha)
+ #582744 – CC field autofill doesn't work for replies (Matthew Barnes)
+ #583360 – Evolution won't set "UTC" as a "second zone" on Calendar
+ and Tasks preferences (Milan Crha)
+ #498712 – (bnc) deleting meetings sometimes does not work properly
+ (Chenthill Palanisamy)
+ #499107 – (bnc) delete all the recurring instances from the folder
+ (Chenthill Palanisamy)
+
+Updated Translations:
+
+ Marios Zindilis (el)
+ Jorge Gonzalez (es)
+ Ivar Smolin (et)
+ Manoj Kumar Giri (or)
+ Kjartan Maraas (nb)
+ Theppitak Karoonboonyanan (th)
+
Evolution 2.27.1 2009-05-04
----------------------------
diff --git a/a11y/ea-cell-table.c b/a11y/ea-cell-table.c
index 89724ffac0..8c0b9ee253 100644
--- a/a11y/ea-cell-table.c
+++ b/a11y/ea-cell-table.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/a11y/ea-cell-table.h b/a11y/ea-cell-table.h
index 6844abe9da..f8674ec42a 100644
--- a/a11y/ea-cell-table.h
+++ b/a11y/ea-cell-table.h
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/a11y/ea-factory.h b/a11y/ea-factory.h
index c7805c1ad3..dcf6a1382f 100644
--- a/a11y/ea-factory.h
+++ b/a11y/ea-factory.h
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/a11y/gal-a11y-factory.h b/a11y/gal-a11y-factory.h
index 884c94f31e..1ef8292eba 100644
--- a/a11y/gal-a11y-factory.h
+++ b/a11y/gal-a11y-factory.h
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/a11y/gal-a11y-util.c b/a11y/gal-a11y-util.c
index c06b4efd6c..ec2a5061f8 100644
--- a/a11y/gal-a11y-util.c
+++ b/a11y/gal-a11y-util.c
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/a11y/gal-a11y-util.h b/a11y/gal-a11y-util.h
index 8354df9ac5..dedad9e049 100644
--- a/a11y/gal-a11y-util.h
+++ b/a11y/gal-a11y-util.h
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/acinclude.m4 b/acinclude.m4
index 094f96963b..fa7fc5c5de 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -577,3 +577,65 @@ AC_SUBST(LTCXXCOMPILE)
# end dolt
])
+dnl as-compiler-flag.m4 0.1.0
+
+dnl autostars m4 macro for detection of compiler flags
+
+dnl David Schleef <ds@schleef.org>
+
+dnl $Id: as-compiler-flag.m4,v 1.1 2005/12/15 23:35:19 ds Exp $
+
+dnl AS_COMPILER_FLAG(CFLAGS, ACTION-IF-ACCEPTED, [ACTION-IF-NOT-ACCEPTED])
+dnl Tries to compile with the given CFLAGS.
+dnl Runs ACTION-IF-ACCEPTED if the compiler can compile with the flags,
+dnl and ACTION-IF-NOT-ACCEPTED otherwise.
+
+AC_DEFUN([AS_COMPILER_FLAG],
+[
+ AC_MSG_CHECKING([to see if compiler understands $1])
+
+ save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $1"
+
+ AC_TRY_COMPILE([ ], [], [flag_ok=yes], [flag_ok=no])
+ CFLAGS="$save_CFLAGS"
+
+ if test "X$flag_ok" = Xyes ; then
+ m4_ifvaln([$2],[$2])
+ true
+ else
+ m4_ifvaln([$3],[$3])
+ true
+ fi
+ AC_MSG_RESULT([$flag_ok])
+])
+
+dnl AS_COMPILER_FLAGS(VAR, FLAGS)
+dnl Tries to compile with the given CFLAGS.
+
+AC_DEFUN([AS_COMPILER_FLAGS],
+[
+ list=$2
+ flags_supported=""
+ flags_unsupported=""
+ AC_MSG_CHECKING([for supported compiler flags])
+ for each in $list
+ do
+ save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $each"
+ AC_TRY_COMPILE([ ], [], [flag_ok=yes], [flag_ok=no])
+ CFLAGS="$save_CFLAGS"
+
+ if test "X$flag_ok" = Xyes ; then
+ flags_supported="$flags_supported $each"
+ else
+ flags_unsupported="$flags_unsupported $each"
+ fi
+ done
+ AC_MSG_RESULT([$flags_supported])
+ if test "X$flags_unsupported" != X ; then
+ AC_MSG_WARN([unsupported compiler flags: $flags_unsupported])
+ fi
+ $1="$$1 $flags_supported"
+])
+
diff --git a/addressbook/conduit/address-conduit.c b/addressbook/conduit/address-conduit.c
index a28c3c5f99..8dd03b3e75 100644
--- a/addressbook/conduit/address-conduit.c
+++ b/addressbook/conduit/address-conduit.c
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
@@ -717,7 +717,7 @@ e_addr_context_destroy (EAddrConduitContext *ctxt)
}
/* Debug routines */
-static char *
+static const gchar *
print_local (EAddrLocalRecord *local)
{
static char buff[ 4096 ];
@@ -1531,12 +1531,12 @@ addressbook_authenticate (EBook *book,
gpointer data)
{
gchar *auth;
- gchar *user;
+ const gchar *user;
gchar *passwd;
gchar *str_uri;
gchar *pass_key;
gchar *auth_domain;
- gchar *component_name;
+ const gchar *component_name;
EUri *e_uri;
ESource *source = (ESource *)data;
@@ -1546,9 +1546,9 @@ addressbook_authenticate (EBook *book,
component_name = auth_domain ? auth_domain : "Addressbook";
if (auth && !strcmp ("plain/password", auth))
- user = (gchar *)e_source_get_property (source, "user");
+ user = e_source_get_property (source, "user");
else
- user = (gchar *)e_source_get_property (source, "email_addr");
+ user = e_source_get_property (source, "email_addr");
if (!user)
user = "";
diff --git a/addressbook/gui/component/addressbook-config.c b/addressbook/gui/component/addressbook-config.c
index 07bc2f98d5..c786a40a13 100644
--- a/addressbook/gui/component/addressbook-config.c
+++ b/addressbook/gui/component/addressbook-config.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
@@ -131,7 +131,7 @@ struct _AddressbookSourceDialog {
#ifdef HAVE_LDAP
-static char *
+static const gchar *
ldap_unparse_auth (AddressbookLDAPAuthType auth_type)
{
switch (auth_type) {
@@ -160,7 +160,7 @@ ldap_parse_auth (const char *auth)
return ADDRESSBOOK_LDAP_AUTH_NONE;
}
-static char *
+static const gchar *
ldap_unparse_scope (AddressbookLDAPScopeType scope_type)
{
switch (scope_type) {
@@ -175,7 +175,7 @@ ldap_unparse_scope (AddressbookLDAPScopeType scope_type)
}
}
-static char *
+static const gchar *
ldap_unparse_ssl (AddressbookLDAPSSLType ssl_type)
{
switch (ssl_type) {
@@ -303,7 +303,7 @@ addressbook_ldap_auth (GtkWidget *window, LDAP *ldap)
static int
addressbook_root_dse_query (AddressbookSourceDialog *dialog, LDAP *ldap,
- char **attrs, LDAPMessage **resp)
+ const gchar **attrs, LDAPMessage **resp)
{
int ldap_error;
struct timeval timeout;
@@ -314,7 +314,7 @@ addressbook_root_dse_query (AddressbookSourceDialog *dialog, LDAP *ldap,
ldap_error = ldap_search_ext_s (ldap,
LDAP_ROOT_DSE, LDAP_SCOPE_BASE,
"(objectclass=*)",
- attrs, 0, NULL, NULL, &timeout, LDAP_NO_LIMIT, resp);
+ (gchar **) attrs, 0, NULL, NULL, &timeout, LDAP_NO_LIMIT, resp);
if (LDAP_SUCCESS != ldap_error)
e_error_run (GTK_WINDOW (dialog->window), "addressbook:ldap-search-base", NULL);
@@ -353,7 +353,7 @@ static gboolean
do_ldap_root_dse_query (AddressbookSourceDialog *sdialog, GtkListStore *model, ESource *source)
{
LDAP *ldap;
- char *attrs[2];
+ const gchar *attrs[2];
int ldap_error;
char **values;
LDAPMessage *resp;
@@ -1013,29 +1013,29 @@ eabc_details_limit(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, st
#endif
static EConfigItem eabc_items[] = {
- { E_CONFIG_BOOK, "", },
- { E_CONFIG_PAGE, "00.general", N_("General") },
- { E_CONFIG_SECTION, "00.general/10.display", N_("Address Book") },
- { E_CONFIG_ITEM, "00.general/10.display/10.name", "hbox122", eabc_general_name },
- { E_CONFIG_ITEM, "00.general/10.display/20.offline", NULL, eabc_general_offline },
+ { E_CONFIG_BOOK, (gchar *) (gchar *) "", },
+ { E_CONFIG_PAGE, (gchar *) "00.general", (gchar *) N_("General") },
+ { E_CONFIG_SECTION, (gchar *) "00.general/10.display", (gchar *) N_("Address Book") },
+ { E_CONFIG_ITEM, (gchar *) "00.general/10.display/10.name", (gchar *) "hbox122", eabc_general_name },
+ { E_CONFIG_ITEM, (gchar *) "00.general/10.display/20.offline", NULL, eabc_general_offline },
#ifdef HAVE_LDAP
- { E_CONFIG_SECTION, "00.general/20.server", N_("Server Information") },
- { E_CONFIG_ITEM, "00.general/20.server/00.host", "table31", eabc_general_host },
- { E_CONFIG_SECTION, "00.general/30.auth", N_("Authentication") },
- { E_CONFIG_ITEM, "00.general/30.auth/00.auth", "table32", eabc_general_auth },
-
- { E_CONFIG_PAGE, "10.details", N_("Details") },
- { E_CONFIG_SECTION, "10.details/00.search", N_("Searching") },
- { E_CONFIG_ITEM, "10.details/00.search/00.search", "table33", eabc_details_search },
- { E_CONFIG_SECTION, "10.details/10.limit", N_("Downloading") },
- { E_CONFIG_ITEM, "10.details/10.limit/00.limit", "table34", eabc_details_limit },
+ { E_CONFIG_SECTION, (gchar *) "00.general/20.server", (gchar *) N_("Server Information") },
+ { E_CONFIG_ITEM, (gchar *) "00.general/20.server/00.host", (gchar *) "table31", eabc_general_host },
+ { E_CONFIG_SECTION, (gchar *) "00.general/30.auth", (gchar *) N_("Authentication") },
+ { E_CONFIG_ITEM, (gchar *) "00.general/30.auth/00.auth", (gchar *) "table32", eabc_general_auth },
+
+ { E_CONFIG_PAGE, (gchar *) "10.details", (gchar *) N_("Details") },
+ { E_CONFIG_SECTION, (gchar *) "10.details/00.search", (gchar *) N_("Searching") },
+ { E_CONFIG_ITEM, (gchar *) "10.details/00.search/00.search", (gchar *) "table33", eabc_details_search },
+ { E_CONFIG_SECTION, (gchar *) "10.details/10.limit", (gchar *) N_("Downloading") },
+ { E_CONFIG_ITEM, (gchar *) "10.details/10.limit/00.limit", (gchar *) "table34", eabc_details_limit },
#endif
{ 0 },
};
/* items needed for the 'new addressbook' window */
static EConfigItem eabc_new_items[] = {
- { E_CONFIG_ITEM, "00.general/10.display/00.type", NULL, eabc_general_type },
+ { E_CONFIG_ITEM, (gchar *) "00.general/10.display/00.type", NULL, eabc_general_type },
{ 0 },
};
diff --git a/addressbook/gui/component/addressbook-config.h b/addressbook/gui/component/addressbook-config.h
index 92d16c795c..2814e8c839 100644
--- a/addressbook/gui/component/addressbook-config.h
+++ b/addressbook/gui/component/addressbook-config.h
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/addressbook/gui/component/autocompletion-config.c b/addressbook/gui/component/autocompletion-config.c
index 3341f26147..548c0cbd7e 100644
--- a/addressbook/gui/component/autocompletion-config.c
+++ b/addressbook/gui/component/autocompletion-config.c
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/addressbook/gui/component/autocompletion-config.h b/addressbook/gui/component/autocompletion-config.h
index f546a9d497..5769bdce9d 100644
--- a/addressbook/gui/component/autocompletion-config.h
+++ b/addressbook/gui/component/autocompletion-config.h
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/addressbook/gui/component/e-book-shell-backend.c b/addressbook/gui/component/e-book-shell-backend.c
index fd86d57e2a..68af7ed03b 100644
--- a/addressbook/gui/component/e-book-shell-backend.c
+++ b/addressbook/gui/component/e-book-shell-backend.c
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/addressbook/gui/component/e-book-shell-backend.h b/addressbook/gui/component/e-book-shell-backend.h
index c3fde1c2a1..c61e43b814 100644
--- a/addressbook/gui/component/e-book-shell-backend.h
+++ b/addressbook/gui/component/e-book-shell-backend.h
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/addressbook/gui/component/e-book-shell-content.c b/addressbook/gui/component/e-book-shell-content.c
index 7f7b9483bb..cce03b1575 100644
--- a/addressbook/gui/component/e-book-shell-content.c
+++ b/addressbook/gui/component/e-book-shell-content.c
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/addressbook/gui/component/e-book-shell-content.h b/addressbook/gui/component/e-book-shell-content.h
index a8f8271959..ac5ab10e8b 100644
--- a/addressbook/gui/component/e-book-shell-content.h
+++ b/addressbook/gui/component/e-book-shell-content.h
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/addressbook/gui/component/e-book-shell-migrate.c b/addressbook/gui/component/e-book-shell-migrate.c
index 08ade1f6f3..2c9aa6afb0 100644
--- a/addressbook/gui/component/e-book-shell-migrate.c
+++ b/addressbook/gui/component/e-book-shell-migrate.c
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/addressbook/gui/component/e-book-shell-migrate.h b/addressbook/gui/component/e-book-shell-migrate.h
index f631ef6a50..cb6128910a 100644
--- a/addressbook/gui/component/e-book-shell-migrate.h
+++ b/addressbook/gui/component/e-book-shell-migrate.h
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/addressbook/gui/component/e-book-shell-sidebar.c b/addressbook/gui/component/e-book-shell-sidebar.c
index 2a784e3b1d..fc283e28d7 100644
--- a/addressbook/gui/component/e-book-shell-sidebar.c
+++ b/addressbook/gui/component/e-book-shell-sidebar.c
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/addressbook/gui/component/e-book-shell-sidebar.h b/addressbook/gui/component/e-book-shell-sidebar.h
index e2523f586b..716523f971 100644
--- a/addressbook/gui/component/e-book-shell-sidebar.h
+++ b/addressbook/gui/component/e-book-shell-sidebar.h
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/addressbook/gui/component/e-book-shell-view-actions.c b/addressbook/gui/component/e-book-shell-view-actions.c
index 918ff57e9f..35d0e8f8c8 100644
--- a/addressbook/gui/component/e-book-shell-view-actions.c
+++ b/addressbook/gui/component/e-book-shell-view-actions.c
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/addressbook/gui/component/e-book-shell-view-actions.h b/addressbook/gui/component/e-book-shell-view-actions.h
index 503855dda6..8e3d31f7bf 100644
--- a/addressbook/gui/component/e-book-shell-view-actions.h
+++ b/addressbook/gui/component/e-book-shell-view-actions.h
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/addressbook/gui/component/e-book-shell-view-private.c b/addressbook/gui/component/e-book-shell-view-private.c
index cdb8c8fbe4..ec3562e87a 100644
--- a/addressbook/gui/component/e-book-shell-view-private.c
+++ b/addressbook/gui/component/e-book-shell-view-private.c
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/addressbook/gui/component/e-book-shell-view-private.h b/addressbook/gui/component/e-book-shell-view-private.h
index 628c1c2b09..b4701aea81 100644
--- a/addressbook/gui/component/e-book-shell-view-private.h
+++ b/addressbook/gui/component/e-book-shell-view-private.h
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/addressbook/gui/component/e-book-shell-view.c b/addressbook/gui/component/e-book-shell-view.c
index 44c06be9a3..ea48bb534c 100644
--- a/addressbook/gui/component/e-book-shell-view.c
+++ b/addressbook/gui/component/e-book-shell-view.c
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/addressbook/gui/component/e-book-shell-view.h b/addressbook/gui/component/e-book-shell-view.h
index 3cefba8179..33a0c8a75d 100644
--- a/addressbook/gui/component/e-book-shell-view.h
+++ b/addressbook/gui/component/e-book-shell-view.h
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/addressbook/gui/component/eab-composer-util.c b/addressbook/gui/component/eab-composer-util.c
index 943225b011..46d28b0790 100644
--- a/addressbook/gui/component/eab-composer-util.c
+++ b/addressbook/gui/component/eab-composer-util.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
diff --git a/addressbook/gui/component/eab-composer-util.h b/addressbook/gui/component/eab-composer-util.h
index ffee76b2b7..4aec23074d 100644
--- a/addressbook/gui/component/eab-composer-util.h
+++ b/addressbook/gui/component/eab-composer-util.h
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
diff --git a/addressbook/gui/component/evolution-module-addressbook.c b/addressbook/gui/component/evolution-module-addressbook.c
index 2d3e18e097..3089133e43 100644
--- a/addressbook/gui/component/evolution-module-addressbook.c
+++ b/addressbook/gui/component/evolution-module-addressbook.c
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/addressbook/gui/contact-editor/e-contact-editor-fullname.c b/addressbook/gui/contact-editor/e-contact-editor-fullname.c
index bbe9ece7ba..3897d605e3 100644
--- a/addressbook/gui/contact-editor/e-contact-editor-fullname.c
+++ b/addressbook/gui/contact-editor/e-contact-editor-fullname.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
@@ -190,7 +190,7 @@ e_contact_editor_fullname_set_property (GObject *object, guint prop_id,
break;
case PROP_EDITABLE: {
int i;
- char *widget_names[] = {
+ const gchar *widget_names[] = {
"comboentry-title",
"comboentry-suffix",
"entry-first",
@@ -250,7 +250,9 @@ e_contact_editor_fullname_get_property (GObject *object, guint prop_id,
}
static void
-fill_in_field(EContactEditorFullname *editor, char *field, char *string)
+fill_in_field (EContactEditorFullname *editor,
+ const gchar *field,
+ const gchar *string)
{
GtkWidget *widget = glade_xml_get_widget (editor->gui, field);
GtkEntry *entry = NULL;
@@ -282,7 +284,8 @@ fill_in_info(EContactEditorFullname *editor)
}
static char *
-extract_field(EContactEditorFullname *editor, char *field)
+extract_field (EContactEditorFullname *editor,
+ const gchar *field)
{
GtkWidget *widget = glade_xml_get_widget(editor->gui, field);
GtkEntry *entry = NULL;
diff --git a/addressbook/gui/contact-editor/e-contact-editor-fullname.h b/addressbook/gui/contact-editor/e-contact-editor-fullname.h
index 81b7182397..6ccd89ed9e 100644
--- a/addressbook/gui/contact-editor/e-contact-editor-fullname.h
+++ b/addressbook/gui/contact-editor/e-contact-editor-fullname.h
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
index d13e378151..03272d4444 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ b/addressbook/gui/contact-editor/e-contact-editor.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
@@ -163,8 +163,8 @@ static const gchar *address_name [] = {
};
static struct {
- EContactField field;
- gchar *pretty_name;
+ EContactField field;
+ const gchar *pretty_name;
}
im_service [] =
{
@@ -182,8 +182,8 @@ im_service [] =
static const gint im_service_default [] = { 0, 2, 4, 5 };
static struct {
- gchar *name;
- gchar *pretty_name;
+ const gchar *name;
+ const gchar *pretty_name;
}
common_location [] =
{
@@ -2083,7 +2083,7 @@ sensitize_address (EContactEditor *editor)
}
typedef struct {
- char *widget_name;
+ const gchar *widget_name;
gint field_id; /* EContactField or -1 */
gboolean process_data; /* If we should extract/fill in contents */
gboolean desensitize_for_read_only;
@@ -3288,7 +3288,7 @@ show_help_cb (GtkWidget *widget, gpointer data)
}
static GList *
-add_to_tab_order(GList *list, GladeXML *gui, char *name)
+add_to_tab_order(GList *list, GladeXML *gui, const gchar *name)
{
GtkWidget *widget = glade_xml_get_widget(gui, name);
return g_list_prepend(list, widget);
diff --git a/addressbook/gui/contact-editor/e-contact-editor.h b/addressbook/gui/contact-editor/e-contact-editor.h
index d216fe0435..041fcde479 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.h
+++ b/addressbook/gui/contact-editor/e-contact-editor.h
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/addressbook/gui/contact-editor/e-contact-quick-add.c b/addressbook/gui/contact-editor/e-contact-quick-add.c
index d30559e34f..8aa2825fc8 100644
--- a/addressbook/gui/contact-editor/e-contact-quick-add.c
+++ b/addressbook/gui/contact-editor/e-contact-quick-add.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
@@ -250,8 +250,8 @@ clicked_cb (GtkWidget *w, gint button, gpointer closure)
email = tmp;
}
- e_contact_set (qa->contact, E_CONTACT_FULL_NAME, (char *) name ? name : "");
- e_contact_set (qa->contact, E_CONTACT_EMAIL_1, (char *) email ? email : "");
+ e_contact_set (qa->contact, E_CONTACT_FULL_NAME, (gpointer) (name ? name : ""));
+ e_contact_set (qa->contact, E_CONTACT_EMAIL_1, (gpointer) (email ? email : ""));
g_free (name);
g_free (email);
diff --git a/addressbook/gui/contact-editor/e-contact-quick-add.h b/addressbook/gui/contact-editor/e-contact-quick-add.h
index 0aaabdc69c..e58722b4a2 100644
--- a/addressbook/gui/contact-editor/e-contact-quick-add.h
+++ b/addressbook/gui/contact-editor/e-contact-quick-add.h
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/addressbook/gui/contact-editor/eab-editor.c b/addressbook/gui/contact-editor/eab-editor.c
index d45fb688ea..b5a4683540 100644
--- a/addressbook/gui/contact-editor/eab-editor.c
+++ b/addressbook/gui/contact-editor/eab-editor.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/addressbook/gui/contact-editor/eab-editor.h b/addressbook/gui/contact-editor/eab-editor.h
index 4f108f509f..9dcb5e19d0 100644
--- a/addressbook/gui/contact-editor/eab-editor.h
+++ b/addressbook/gui/contact-editor/eab-editor.h
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/addressbook/gui/contact-editor/test-editor.c b/addressbook/gui/contact-editor/test-editor.c
index 356311eb8f..f5d133283f 100644
--- a/addressbook/gui/contact-editor/test-editor.c
+++ b/addressbook/gui/contact-editor/test-editor.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/addressbook/gui/contact-list-editor/e-contact-list-editor.c b/addressbook/gui/contact-list-editor/e-contact-list-editor.c
index 9e07381e4e..002cb08bbf 100644
--- a/addressbook/gui/contact-list-editor/e-contact-list-editor.c
+++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
@@ -128,7 +128,7 @@ enum {
};
static GtkTargetEntry targets[] = {
- { VCARD_TYPE, 0, TARGET_TYPE_VCARD },
+ { (gchar *) VCARD_TYPE, 0, TARGET_TYPE_VCARD },
};
static gpointer parent_class;
@@ -250,9 +250,9 @@ contact_list_editor_cancel_load (EContactListEditor *editor)
priv->load_book = NULL;
}
-static gboolean
+static gboolean
contact_list_editor_contact_exists (EContactListModel *model,
- const gchar *email)
+ const gchar *email)
{
const gchar *tag = "addressbook:ask-list-add-exists";
@@ -637,7 +637,7 @@ contact_list_editor_email_entry_updated_cb (GtkWidget *widget,
email = g_strdup (e_destination_get_address (destination));
store = e_name_selector_entry_peek_destination_store (entry);
e_destination_store_remove_destination (store, destination);
- gtk_entry_set_text (GTK_ENTRY (WIDGET (EMAIL_ENTRY)), "");
+ gtk_entry_set_text (GTK_ENTRY (WIDGET (EMAIL_ENTRY)), "");
if (email && *email) {
e_contact_list_model_add_email (model, email);
@@ -1192,7 +1192,7 @@ contact_list_editor_class_init (EContactListEditorClass *class)
g_object_class_install_property (
object_class,
- PROP_BOOK,
+ PROP_BOOK,
g_param_spec_object (
"book",
_("Book"),
@@ -1202,7 +1202,7 @@ contact_list_editor_class_init (EContactListEditorClass *class)
g_object_class_install_property (
object_class,
- PROP_CONTACT,
+ PROP_CONTACT,
g_param_spec_object (
"contact",
_("Contact"),
@@ -1212,7 +1212,7 @@ contact_list_editor_class_init (EContactListEditorClass *class)
g_object_class_install_property (
object_class,
- PROP_IS_NEW_LIST,
+ PROP_IS_NEW_LIST,
g_param_spec_boolean (
"is_new_list",
_("Is New List"),
@@ -1222,7 +1222,7 @@ contact_list_editor_class_init (EContactListEditorClass *class)
g_object_class_install_property (
object_class,
- PROP_EDITABLE,
+ PROP_EDITABLE,
g_param_spec_boolean (
"editable",
_("Editable"),
diff --git a/addressbook/gui/contact-list-editor/e-contact-list-editor.h b/addressbook/gui/contact-list-editor/e-contact-list-editor.h
index 13b6864a9a..5b67fe0126 100644
--- a/addressbook/gui/contact-list-editor/e-contact-list-editor.h
+++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.h
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/addressbook/gui/contact-list-editor/e-contact-list-model.c b/addressbook/gui/contact-list-editor/e-contact-list-model.c
index f381e6754e..d43e895570 100644
--- a/addressbook/gui/contact-list-editor/e-contact-list-model.c
+++ b/addressbook/gui/contact-list-editor/e-contact-list-model.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/addressbook/gui/contact-list-editor/e-contact-list-model.h b/addressbook/gui/contact-list-editor/e-contact-list-model.h
index f4fde83a4b..1f7c35a7be 100644
--- a/addressbook/gui/contact-list-editor/e-contact-list-model.h
+++ b/addressbook/gui/contact-list-editor/e-contact-list-model.h
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
diff --git a/addressbook/gui/merging/eab-contact-compare.c b/addressbook/gui/merging/eab-contact-compare.c
index b5597abb29..6a3132f5a5 100644
--- a/addressbook/gui/merging/eab-contact-compare.c
+++ b/addressbook/gui/merging/eab-contact-compare.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
@@ -46,7 +46,7 @@ combine_comparisons (EABContactMatchType prev,
sucky way like this. But it can be fixed later. */
/* This is very Anglocentric. */
-static gchar *name_synonyms[][2] = {
+static const gchar *name_synonyms[][2] = {
{ "jon", "john" }, /* Ah, the hacker's perogative */
{ "joseph", "joe" },
{ "robert", "bob" },
diff --git a/addressbook/gui/merging/eab-contact-compare.h b/addressbook/gui/merging/eab-contact-compare.h
index ff8bfc1a85..d08461940b 100644
--- a/addressbook/gui/merging/eab-contact-compare.h
+++ b/addressbook/gui/merging/eab-contact-compare.h
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/addressbook/gui/merging/eab-contact-merging.c b/addressbook/gui/merging/eab-contact-merging.c
index 2a97169459..5a6ac2cdac 100644
--- a/addressbook/gui/merging/eab-contact-merging.c
+++ b/addressbook/gui/merging/eab-contact-merging.c
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/addressbook/gui/merging/eab-contact-merging.h b/addressbook/gui/merging/eab-contact-merging.h
index 4228fc1028..81528c6325 100644
--- a/addressbook/gui/merging/eab-contact-merging.h
+++ b/addressbook/gui/merging/eab-contact-merging.h
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/addressbook/gui/widgets/a11y/ea-addressbook-view.c b/addressbook/gui/widgets/a11y/ea-addressbook-view.c
index eff7eb4044..4150e10ff4 100644
--- a/addressbook/gui/widgets/a11y/ea-addressbook-view.c
+++ b/addressbook/gui/widgets/a11y/ea-addressbook-view.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/addressbook/gui/widgets/a11y/ea-addressbook-view.h b/addressbook/gui/widgets/a11y/ea-addressbook-view.h
index 86782ad737..f223f24a0c 100644
--- a/addressbook/gui/widgets/a11y/ea-addressbook-view.h
+++ b/addressbook/gui/widgets/a11y/ea-addressbook-view.h
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/addressbook/gui/widgets/a11y/ea-addressbook.c b/addressbook/gui/widgets/a11y/ea-addressbook.c
index 087c33a3c0..14fc4c1ca3 100644
--- a/addressbook/gui/widgets/a11y/ea-addressbook.c
+++ b/addressbook/gui/widgets/a11y/ea-addressbook.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/addressbook/gui/widgets/a11y/ea-addressbook.h b/addressbook/gui/widgets/a11y/ea-addressbook.h
index 337f467760..97b691dc18 100644
--- a/addressbook/gui/widgets/a11y/ea-addressbook.h
+++ b/addressbook/gui/widgets/a11y/ea-addressbook.h
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/addressbook/gui/widgets/a11y/ea-minicard-view.c b/addressbook/gui/widgets/a11y/ea-minicard-view.c
index aed11ed2ac..052db4d1b1 100644
--- a/addressbook/gui/widgets/a11y/ea-minicard-view.c
+++ b/addressbook/gui/widgets/a11y/ea-minicard-view.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/addressbook/gui/widgets/a11y/ea-minicard-view.h b/addressbook/gui/widgets/a11y/ea-minicard-view.h
index 922941cb7b..f20ef4487b 100644
--- a/addressbook/gui/widgets/a11y/ea-minicard-view.h
+++ b/addressbook/gui/widgets/a11y/ea-minicard-view.h
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/addressbook/gui/widgets/a11y/ea-minicard.c b/addressbook/gui/widgets/a11y/ea-minicard.c
index 258fcbd4bc..d77d591fcc 100644
--- a/addressbook/gui/widgets/a11y/ea-minicard.c
+++ b/addressbook/gui/widgets/a11y/ea-minicard.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/addressbook/gui/widgets/a11y/ea-minicard.h b/addressbook/gui/widgets/a11y/ea-minicard.h
index 9c0c8a2b56..15f89e19c3 100644
--- a/addressbook/gui/widgets/a11y/ea-minicard.h
+++ b/addressbook/gui/widgets/a11y/ea-minicard.h
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/addressbook/gui/widgets/e-addressbook-model.c b/addressbook/gui/widgets/e-addressbook-model.c
index 772e72e3af..b016d4f9db 100644
--- a/addressbook/gui/widgets/e-addressbook-model.c
+++ b/addressbook/gui/widgets/e-addressbook-model.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/addressbook/gui/widgets/e-addressbook-model.h b/addressbook/gui/widgets/e-addressbook-model.h
index 1a7be828f6..87f1ac5175 100644
--- a/addressbook/gui/widgets/e-addressbook-model.h
+++ b/addressbook/gui/widgets/e-addressbook-model.h
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
index 1f9f44bf30..a867042de0 100644
--- a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
+++ b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*/
diff --git a/addressbook/gui/widgets/e-addressbook-reflow-adapter.h b/addressbook/gui/widgets/e-addressbook-reflow-adapter.h
index bd2ba3397b..b5feda6c4b 100644
--- a/addressbook/gui/widgets/e-addressbook-reflow-adapter.h
+++ b/addressbook/gui/widgets/e-addressbook-reflow-adapter.h
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/addressbook/gui/widgets/e-addressbook-selector.c b/addressbook/gui/widgets/e-addressbook-selector.c
index e7bec99ba2..21347e2529 100644
--- a/addressbook/gui/widgets/e-addressbook-selector.c
+++ b/addressbook/gui/widgets/e-addressbook-selector.c
@@ -59,8 +59,8 @@ enum {
};
static GtkTargetEntry drag_types[] = {
- { "text/x-vcard", 0, DND_TARGET_TYPE_VCARD },
- { "text/x-source-vcard", 0, DND_TARGET_TYPE_SOURCE_VCARD }
+ { (gchar *) "text/x-vcard", 0, DND_TARGET_TYPE_VCARD },
+ { (gchar *) "text/x-source-vcard", 0, DND_TARGET_TYPE_SOURCE_VCARD }
};
static gpointer parent_class;
diff --git a/addressbook/gui/widgets/e-addressbook-table-adapter.c b/addressbook/gui/widgets/e-addressbook-table-adapter.c
index 356aabdf8f..c970b6f32d 100644
--- a/addressbook/gui/widgets/e-addressbook-table-adapter.c
+++ b/addressbook/gui/widgets/e-addressbook-table-adapter.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/addressbook/gui/widgets/e-addressbook-table-adapter.h b/addressbook/gui/widgets/e-addressbook-table-adapter.h
index 338c87948c..d892894570 100644
--- a/addressbook/gui/widgets/e-addressbook-table-adapter.h
+++ b/addressbook/gui/widgets/e-addressbook-table-adapter.h
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c
index 8ee3c14e0b..e889d9b0c2 100644
--- a/addressbook/gui/widgets/e-addressbook-view.c
+++ b/addressbook/gui/widgets/e-addressbook-view.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
@@ -109,8 +109,8 @@ enum {
};
static GtkTargetEntry drag_types[] = {
- { "text/x-source-vcard", 0, DND_TARGET_TYPE_SOURCE_VCARD },
- { "text/x-vcard", 0, DND_TARGET_TYPE_VCARD }
+ { (gchar *) "text/x-source-vcard", 0, DND_TARGET_TYPE_SOURCE_VCARD },
+ { (gchar *) "text/x-vcard", 0, DND_TARGET_TYPE_VCARD }
};
static gpointer parent_class;
diff --git a/addressbook/gui/widgets/e-addressbook-view.h b/addressbook/gui/widgets/e-addressbook-view.h
index 4e4e7c8178..ab168ec8b7 100644
--- a/addressbook/gui/widgets/e-addressbook-view.h
+++ b/addressbook/gui/widgets/e-addressbook-view.h
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/addressbook/gui/widgets/e-minicard-label.c b/addressbook/gui/widgets/e-minicard-label.c
index 696d42dcd9..a6090291bd 100644
--- a/addressbook/gui/widgets/e-minicard-label.c
+++ b/addressbook/gui/widgets/e-minicard-label.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/addressbook/gui/widgets/e-minicard-label.h b/addressbook/gui/widgets/e-minicard-label.h
index 3d41e4cb87..f6b0607ca6 100644
--- a/addressbook/gui/widgets/e-minicard-label.h
+++ b/addressbook/gui/widgets/e-minicard-label.h
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/addressbook/gui/widgets/e-minicard-view-widget.c b/addressbook/gui/widgets/e-minicard-view-widget.c
index 3ad49cf2b3..ac1f35caa7 100644
--- a/addressbook/gui/widgets/e-minicard-view-widget.c
+++ b/addressbook/gui/widgets/e-minicard-view-widget.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/addressbook/gui/widgets/e-minicard-view-widget.h b/addressbook/gui/widgets/e-minicard-view-widget.h
index 917d1b588a..82962218fa 100644
--- a/addressbook/gui/widgets/e-minicard-view-widget.h
+++ b/addressbook/gui/widgets/e-minicard-view-widget.h
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/addressbook/gui/widgets/e-minicard-view.c b/addressbook/gui/widgets/e-minicard-view.c
index c6faa4aed7..e60d32cf10 100644
--- a/addressbook/gui/widgets/e-minicard-view.c
+++ b/addressbook/gui/widgets/e-minicard-view.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
@@ -72,8 +72,8 @@ enum DndTargetType {
#define VCARD_LIST_TYPE "text/x-vcard"
#define SOURCE_VCARD_LIST_TYPE "text/x-source-vcard"
static GtkTargetEntry drag_types[] = {
- { SOURCE_VCARD_LIST_TYPE, 0, DND_TARGET_TYPE_SOURCE_VCARD_LIST },
- { VCARD_LIST_TYPE, 0, DND_TARGET_TYPE_VCARD_LIST }
+ { (gchar *) SOURCE_VCARD_LIST_TYPE, 0, DND_TARGET_TYPE_SOURCE_VCARD_LIST },
+ { (gchar *) VCARD_LIST_TYPE, 0, DND_TARGET_TYPE_VCARD_LIST }
};
static gint num_drag_types = sizeof(drag_types) / sizeof(drag_types[0]);
diff --git a/addressbook/gui/widgets/e-minicard-view.h b/addressbook/gui/widgets/e-minicard-view.h
index 657d0a9b74..7a21914e86 100644
--- a/addressbook/gui/widgets/e-minicard-view.h
+++ b/addressbook/gui/widgets/e-minicard-view.h
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c
index a7cb37459a..3f89b8fdc6 100644
--- a/addressbook/gui/widgets/e-minicard.c
+++ b/addressbook/gui/widgets/e-minicard.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
@@ -91,8 +91,8 @@ enum {
};
static struct {
- gchar *name;
- gchar *pretty_name;
+ const gchar *name;
+ const gchar *pretty_name;
}
common_location [] =
{
@@ -742,7 +742,7 @@ add_field (EMinicard *e_minicard, EContactField field, gdouble left_width)
EMinicardField *minicard_field;
char *name;
char *string;
- gboolean is_rtl = (gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL);
+ gboolean is_rtl = (gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL);
group = GNOME_CANVAS_GROUP( e_minicard );
@@ -811,7 +811,7 @@ add_email_field (EMinicard *e_minicard, GList *email_list, gdouble left_width, i
char *name;
GList *l, *le;
int count =0;
- gboolean is_rtl = (gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL);
+ gboolean is_rtl = (gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL);
GList *emails = e_contact_get (e_minicard->contact, E_CONTACT_EMAIL);
group = GNOME_CANVAS_GROUP( e_minicard );
diff --git a/addressbook/gui/widgets/e-minicard.h b/addressbook/gui/widgets/e-minicard.h
index 98a4629ad9..520cc55cac 100644
--- a/addressbook/gui/widgets/e-minicard.h
+++ b/addressbook/gui/widgets/e-minicard.h
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/addressbook/gui/widgets/eab-config.c b/addressbook/gui/widgets/eab-config.c
index bb8eb63dd0..32ae07862f 100644
--- a/addressbook/gui/widgets/eab-config.c
+++ b/addressbook/gui/widgets/eab-config.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/addressbook/gui/widgets/eab-config.h b/addressbook/gui/widgets/eab-config.h
index 6e593f1fb8..330df5141b 100644
--- a/addressbook/gui/widgets/eab-config.h
+++ b/addressbook/gui/widgets/eab-config.h
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/addressbook/gui/widgets/eab-contact-display.c b/addressbook/gui/widgets/eab-contact-display.c
index 87718933b3..fe87f3c72a 100644
--- a/addressbook/gui/widgets/eab-contact-display.c
+++ b/addressbook/gui/widgets/eab-contact-display.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
@@ -68,8 +68,8 @@ enum {
};
static struct {
- gchar *name;
- gchar *pretty_name;
+ const gchar *name;
+ const gchar *pretty_name;
}
common_location [] =
{
@@ -401,7 +401,7 @@ accum_name_value (GString *gstr, const char *label, const char *str, const char
g_string_append_printf (gstr, "<td valign=\"top\" width=\"" IMAGE_COL_WIDTH "\">");
if (icon)
g_string_append_printf (gstr, "<img width=\"16\" height=\"16\" src=\"evo-icon:%s\"></td></tr>", icon);
- else
+ else
g_string_append_printf (gstr, "</td></tr>");
} else {
g_string_append_printf (gstr, "<tr><td valign=\"top\" width=\"" IMAGE_COL_WIDTH "\">");
@@ -521,7 +521,8 @@ render_contact (GtkHTMLStream *html_stream, EContact *contact)
#ifdef HANDLE_MAILTO_INTERNALLY
int email_num = 0;
#endif
- char *nl, *nick=NULL;
+ const gchar *nl;
+ char *nick=NULL;
gtk_html_stream_printf (html_stream, "<table border=\"0\">");
@@ -541,7 +542,7 @@ render_contact (GtkHTMLStream *html_stream, EContact *contact)
if (!eab_parse_qp_email (l->data, &name, &mail))
mail = e_text_to_html (l->data, 0);
- g_string_append_printf (accum, "%s%s%s<a href=\"internal-mailto:%d\">%s</a>%s <font color=" HEADER_COLOR ">(%s)</font>",
+ g_string_append_printf (accum, "%s%s%s<a href=\"internal-mailto:%d\">%s</a>%s <font color=" HEADER_COLOR ">(%s)</font>",
nl,
name ? name : "",
name ? " &lt;" : "",
diff --git a/addressbook/gui/widgets/eab-contact-display.h b/addressbook/gui/widgets/eab-contact-display.h
index 096a910f2f..a671b378fc 100644
--- a/addressbook/gui/widgets/eab-contact-display.h
+++ b/addressbook/gui/widgets/eab-contact-display.h
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/addressbook/gui/widgets/eab-gui-util.c b/addressbook/gui/widgets/eab-gui-util.c
index 4ea2136ee6..d5ec322c3d 100644
--- a/addressbook/gui/widgets/eab-gui-util.c
+++ b/addressbook/gui/widgets/eab-gui-util.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
@@ -79,7 +79,7 @@ eab_error_dialog (const char *msg, EBookStatus status)
{
const char *status_str;
- if (status < 0 || status >= G_N_ELEMENTS (status_to_string))
+ if (status >= G_N_ELEMENTS (status_to_string))
status_str = "Other error";
else
status_str = status_to_string [status];
diff --git a/addressbook/gui/widgets/eab-gui-util.h b/addressbook/gui/widgets/eab-gui-util.h
index 8d878cff14..82fc172321 100644
--- a/addressbook/gui/widgets/eab-gui-util.h
+++ b/addressbook/gui/widgets/eab-gui-util.h
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/addressbook/gui/widgets/gal-view-factory-minicard.c b/addressbook/gui/widgets/gal-view-factory-minicard.c
index ccec1bf092..0240dddb60 100644
--- a/addressbook/gui/widgets/gal-view-factory-minicard.c
+++ b/addressbook/gui/widgets/gal-view-factory-minicard.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/addressbook/gui/widgets/gal-view-factory-minicard.h b/addressbook/gui/widgets/gal-view-factory-minicard.h
index d1cf2de444..0aa6dc5ba9 100644
--- a/addressbook/gui/widgets/gal-view-factory-minicard.h
+++ b/addressbook/gui/widgets/gal-view-factory-minicard.h
@@ -13,7 +13,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/addressbook/gui/widgets/gal-view-minicard.c b/addressbook/gui/widgets/gal-view-minicard.c
index cb2f52f4ff..0ebc928bad 100644
--- a/addressbook/gui/widgets/gal-view-minicard.c
+++ b/addressbook/gui/widgets/gal-view-minicard.c
@@ -13,7 +13,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/addressbook/gui/widgets/gal-view-minicard.h b/addressbook/gui/widgets/gal-view-minicard.h
index 6e1a0ca68e..c7a8c912d4 100644
--- a/addressbook/gui/widgets/gal-view-minicard.h
+++ b/addressbook/gui/widgets/gal-view-minicard.h
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/addressbook/importers/evolution-addressbook-importers.h b/addressbook/importers/evolution-addressbook-importers.h
index 94b0e3b023..747fe4281d 100644
--- a/addressbook/importers/evolution-addressbook-importers.h
+++ b/addressbook/importers/evolution-addressbook-importers.h
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/addressbook/importers/evolution-csv-importer.c b/addressbook/importers/evolution-csv-importer.c
index c699662b5c..164f9f5fe2 100644
--- a/addressbook/importers/evolution-csv-importer.c
+++ b/addressbook/importers/evolution-csv-importer.c
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
@@ -68,7 +68,7 @@ static char delimiter;
static void csv_import_done(CSVImporter *gci);
typedef struct {
- char *csv_attribute;
+ const gchar *csv_attribute;
EContactField contact_field;
#define FLAG_HOME_ADDRESS 0x01
#define FLAG_WORK_ADDRESS 0x02
@@ -704,7 +704,7 @@ csv_getwidget(EImport *ei, EImportTarget *target, EImportImporter *im)
return vbox;
}
-static char *supported_extensions[4] = {
+static const gchar *supported_extensions[4] = {
".csv", ".tab" , ".txt", NULL
};
diff --git a/addressbook/importers/evolution-ldif-importer.c b/addressbook/importers/evolution-ldif-importer.c
index 2f7b2cced9..75f30a2359 100644
--- a/addressbook/importers/evolution-ldif-importer.c
+++ b/addressbook/importers/evolution-ldif-importer.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*/
@@ -73,7 +73,7 @@ static void ldif_import_done(LDIFImporter *gci);
static struct {
- char *ldif_attribute;
+ const gchar *ldif_attribute;
EContactField contact_field;
#define FLAG_HOME_ADDRESS 0x01
#define FLAG_WORK_ADDRESS 0x02
@@ -556,7 +556,7 @@ ldif_getwidget(EImport *ei, EImportTarget *target, EImportImporter *im)
return vbox;
}
-static char *supported_extensions[2] = {
+static const gchar *supported_extensions[2] = {
".ldif", NULL
};
diff --git a/addressbook/importers/evolution-vcard-importer.c b/addressbook/importers/evolution-vcard-importer.c
index bd526e37cc..1ec623d098 100644
--- a/addressbook/importers/evolution-vcard-importer.c
+++ b/addressbook/importers/evolution-vcard-importer.c
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/addressbook/printing/Makefile.am b/addressbook/printing/Makefile.am
index 59c5c519cd..f3090d6a09 100644
--- a/addressbook/printing/Makefile.am
+++ b/addressbook/printing/Makefile.am
@@ -7,8 +7,6 @@ ecps_DATA = \
INCLUDES = \
-DG_LOG_DOMAIN=\"addressbook-printing\" \
-I$(top_srcdir)/addressbook \
- -I$(top_srcdir)/addressbook/backend \
- -I$(top_builddir)/addressbook/backend \
-I$(top_srcdir) \
-DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
-DEVOLUTION_ECPSDIR=\""$(ecpsdir)"\" \
diff --git a/addressbook/printing/e-contact-print-types.h b/addressbook/printing/e-contact-print-types.h
index 15d64e71e0..e21f3b7b16 100644
--- a/addressbook/printing/e-contact-print-types.h
+++ b/addressbook/printing/e-contact-print-types.h
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/addressbook/printing/e-contact-print.c b/addressbook/printing/e-contact-print.c
index 0ba9dbb71a..cc3affeb2c 100644
--- a/addressbook/printing/e-contact-print.c
+++ b/addressbook/printing/e-contact-print.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/addressbook/printing/e-contact-print.h b/addressbook/printing/e-contact-print.h
index c9cc40847e..1604693471 100644
--- a/addressbook/printing/e-contact-print.h
+++ b/addressbook/printing/e-contact-print.h
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/addressbook/printing/test-print.c b/addressbook/printing/test-print.c
index 3c02834de3..c38d2129a0 100644
--- a/addressbook/printing/test-print.c
+++ b/addressbook/printing/test-print.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
@@ -36,10 +36,10 @@ main (int argc, char *argv[])
glade_init ();
- shown_fields = g_list_append (shown_fields, "First field");
- shown_fields = g_list_append (shown_fields, "Second field");
- shown_fields = g_list_append (shown_fields, "Third field");
- shown_fields = g_list_append (shown_fields, "Fourth field");
+ shown_fields = g_list_append (shown_fields, (gpointer) "First field");
+ shown_fields = g_list_append (shown_fields, (gpointer) "Second field");
+ shown_fields = g_list_append (shown_fields, (gpointer) "Third field");
+ shown_fields = g_list_append (shown_fields, (gpointer) "Fourth field");
/* does nothing */
e_contact_print (NULL, NULL, NULL, GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG);
diff --git a/addressbook/tools/evolution-addressbook-export-list-cards.c b/addressbook/tools/evolution-addressbook-export-list-cards.c
index 417214691b..72fa8a07e3 100644
--- a/addressbook/tools/evolution-addressbook-export-list-cards.c
+++ b/addressbook/tools/evolution-addressbook-export-list-cards.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
@@ -146,7 +146,7 @@ struct _EContactCSVFieldData
{
gint csv_field;
gint contact_field;
- gchar *csv_name;
+ const gchar *csv_name;
EContactCSVDataType data_type;
};
@@ -245,7 +245,6 @@ gchar *escape_string (gchar * orig);
int output_n_cards_file (FILE * outputfile, GList *contacts, int size, int begin_no, CARD_FORMAT format);
static void fork_to_background (void);
void set_pre_defined_field (GSList ** pre_defined_fields);
-guint action_list_cards_init (ActionContext * p_actctx);
/* function declarations*/
diff --git a/addressbook/tools/evolution-addressbook-export-list-folders.c b/addressbook/tools/evolution-addressbook-export-list-folders.c
index 86affe41ff..e93748861d 100644
--- a/addressbook/tools/evolution-addressbook-export-list-folders.c
+++ b/addressbook/tools/evolution-addressbook-export-list-folders.c
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/addressbook/tools/evolution-addressbook-export.c b/addressbook/tools/evolution-addressbook-export.c
index bfcaca980c..1a7f86142b 100644
--- a/addressbook/tools/evolution-addressbook-export.c
+++ b/addressbook/tools/evolution-addressbook-export.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/addressbook/tools/evolution-addressbook-export.h b/addressbook/tools/evolution-addressbook-export.h
index 210dc2c1d5..815f524300 100644
--- a/addressbook/tools/evolution-addressbook-export.h
+++ b/addressbook/tools/evolution-addressbook-export.h
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/addressbook/util/Makefile.am b/addressbook/util/Makefile.am
index b1361e068f..cc78518f40 100644
--- a/addressbook/util/Makefile.am
+++ b/addressbook/util/Makefile.am
@@ -5,7 +5,6 @@ INCLUDES = \
-DLIBDIR=\"$(libdir)\" \
-DG_LOG_DOMAIN=\"EBook\" \
-I$(top_srcdir) \
- -I$(top_srcdir)/camel \
-I$(top_builddir)/shell \
-I$(top_srcdir)/shell \
$(EVOLUTION_ADDRESSBOOK_CFLAGS)
diff --git a/addressbook/util/addressbook.c b/addressbook/util/addressbook.c
index c8285d8171..f36012ab94 100644
--- a/addressbook/util/addressbook.c
+++ b/addressbook/util/addressbook.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
@@ -200,7 +200,7 @@ addressbook_authenticate (EBook *book, gboolean previous_failure, ESource *sourc
char *prompt;
char *password_prompt;
gboolean remember;
- char *failed_auth;
+ const gchar *failed_auth;
guint32 flags = E_PASSWORDS_REMEMBER_FOREVER|E_PASSWORDS_SECRET|E_PASSWORDS_ONLINE;
if (previous_failure) {
diff --git a/addressbook/util/addressbook.h b/addressbook/util/addressbook.h
index 2e25448717..7bc92ee344 100644
--- a/addressbook/util/addressbook.h
+++ b/addressbook/util/addressbook.h
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/addressbook/util/eab-book-util.c b/addressbook/util/eab-book-util.c
index af1324bf64..8d08a3e88f 100644
--- a/addressbook/util/eab-book-util.c
+++ b/addressbook/util/eab-book-util.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/addressbook/util/eab-book-util.h b/addressbook/util/eab-book-util.h
index 2051c77ad0..cb59dc9085 100644
--- a/addressbook/util/eab-book-util.h
+++ b/addressbook/util/eab-book-util.h
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/art/broken-image-16.xpm b/art/broken-image-16.xpm
index e96ee1aab0..b20b942bc5 100644
--- a/art/broken-image-16.xpm
+++ b/art/broken-image-16.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * broken_image_16_xpm[] = {
+static const gchar *broken_image_16_xpm[] = {
"16 16 42 1",
" c None",
". c #000000",
diff --git a/art/broken-image-24.xpm b/art/broken-image-24.xpm
index ba6cc6854e..e6c31277a9 100644
--- a/art/broken-image-24.xpm
+++ b/art/broken-image-24.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * broken_image_24_xpm[] = {
+static const gchar *broken_image_24_xpm[] = {
"24 24 142 2",
" c None",
". c #000000",
diff --git a/art/empty.xpm b/art/empty.xpm
index aca06618b1..b6d9e9bada 100644
--- a/art/empty.xpm
+++ b/art/empty.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * empty_xpm[] = {
+static const gchar *empty_xpm[] = {
"16 16 2 1",
" c None",
". c #FFFFFF",
diff --git a/art/jump.xpm b/art/jump.xpm
index 7c289e738f..1254a53a1b 100644
--- a/art/jump.xpm
+++ b/art/jump.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * jump_xpm[] = {
+static const gchar *jump_xpm[] = {
"16 8 3 1",
" c None",
". c #000000",
@@ -13,7 +13,7 @@ static char * jump_xpm[] = {
".++++++++++++++.",
"................"};
-static char * jump_xpm_focused[] = {
+static const gchar *jump_xpm_focused[] = {
"16 8 3 1",
" c None",
". c #0000FF",
diff --git a/calendar/common/authentication.c b/calendar/common/authentication.c
index 85bde3d6fd..a33177874f 100644
--- a/calendar/common/authentication.c
+++ b/calendar/common/authentication.c
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
@@ -72,7 +72,7 @@ build_pass_key (ECal *ecal)
return euri_str;
}
-void
+void
auth_cal_forget_password (ECal *ecal)
{
ESource *source = NULL;
diff --git a/calendar/common/authentication.h b/calendar/common/authentication.h
index 147b67e831..696a36d2ff 100644
--- a/calendar/common/authentication.h
+++ b/calendar/common/authentication.h
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/conduits/calendar/calendar-conduit.c b/calendar/conduits/calendar/calendar-conduit.c
index b9b6b3449c..5aef1aeb53 100644
--- a/calendar/conduits/calendar/calendar-conduit.c
+++ b/calendar/conduits/calendar/calendar-conduit.c
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
@@ -187,7 +187,7 @@ calconduit_save_configuration (ECalConduitCfg *c)
g_snprintf (prefix, 255, "e-calendar-conduit/Pilot_%u", c->pilot_id);
e_pilot_set_sync_source (c->source_list, c->source);
-
+
e_pilot_setup_set_bool (prefix, "secret", c->secret);
e_pilot_setup_set_bool (prefix, "multi_day_split", c->multi_day_split);
e_pilot_setup_set_string (prefix, "last_uri", c->last_uri ? c->last_uri : "");
diff --git a/calendar/conduits/common/libecalendar-common-conduit.c b/calendar/conduits/common/libecalendar-common-conduit.c
index 59f411da69..cdb4a10d2d 100644
--- a/calendar/conduits/common/libecalendar-common-conduit.c
+++ b/calendar/conduits/common/libecalendar-common-conduit.c
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/conduits/common/libecalendar-common-conduit.h b/calendar/conduits/common/libecalendar-common-conduit.h
index 0641ec3e88..aab5a58b56 100644
--- a/calendar/conduits/common/libecalendar-common-conduit.h
+++ b/calendar/conduits/common/libecalendar-common-conduit.h
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/calendar/conduits/memo/memo-conduit.c b/calendar/conduits/memo/memo-conduit.c
index 4d599a6924..61e5c852e3 100644
--- a/calendar/conduits/memo/memo-conduit.c
+++ b/calendar/conduits/memo/memo-conduit.c
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/conduits/todo/todo-conduit.c b/calendar/conduits/todo/todo-conduit.c
index 7639291504..3a684e0751 100644
--- a/calendar/conduits/todo/todo-conduit.c
+++ b/calendar/conduits/todo/todo-conduit.c
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/a11y/ea-cal-view-event.c b/calendar/gui/a11y/ea-cal-view-event.c
index 49cf525511..e0c0f8fdac 100644
--- a/calendar/gui/a11y/ea-cal-view-event.c
+++ b/calendar/gui/a11y/ea-cal-view-event.c
@@ -10,11 +10,11 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
- * Bolian Yin <bolian.yin@sun.com>
+ * Bolian Yin <bolian.yin@sun.com>
*
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
@@ -247,7 +247,10 @@ ea_cal_view_event_get_name (AtkObject *accessible)
GObject *g_obj;
ECalendarViewEvent *event;
gchar *name_string;
- gchar *alarm_string, *recur_string, *meeting_string, *summary_string;
+ const gchar *alarm_string;
+ const gchar *recur_string;
+ const gchar *meeting_string;
+ gchar *summary_string;
const char *summary;
diff --git a/calendar/gui/a11y/ea-cal-view-event.h b/calendar/gui/a11y/ea-cal-view-event.h
index c5000095f6..fccf023a82 100644
--- a/calendar/gui/a11y/ea-cal-view-event.h
+++ b/calendar/gui/a11y/ea-cal-view-event.h
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/a11y/ea-cal-view.c b/calendar/gui/a11y/ea-cal-view.c
index e184b919b9..7e337ac16b 100644
--- a/calendar/gui/a11y/ea-cal-view.c
+++ b/calendar/gui/a11y/ea-cal-view.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/a11y/ea-cal-view.h b/calendar/gui/a11y/ea-cal-view.h
index e8ebb9eb37..9aa026ef6d 100644
--- a/calendar/gui/a11y/ea-cal-view.h
+++ b/calendar/gui/a11y/ea-cal-view.h
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/a11y/ea-calendar-helpers.c b/calendar/gui/a11y/ea-calendar-helpers.c
index cc9474c0bc..f07cdfa086 100644
--- a/calendar/gui/a11y/ea-calendar-helpers.c
+++ b/calendar/gui/a11y/ea-calendar-helpers.c
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/a11y/ea-calendar-helpers.h b/calendar/gui/a11y/ea-calendar-helpers.h
index 3c980f2911..a4045cd7af 100644
--- a/calendar/gui/a11y/ea-calendar-helpers.h
+++ b/calendar/gui/a11y/ea-calendar-helpers.h
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/a11y/ea-calendar.c b/calendar/gui/a11y/ea-calendar.c
index 3cf41f3512..2662f42283 100644
--- a/calendar/gui/a11y/ea-calendar.c
+++ b/calendar/gui/a11y/ea-calendar.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/a11y/ea-calendar.h b/calendar/gui/a11y/ea-calendar.h
index 36ef7d5ea0..b2238ffdbc 100644
--- a/calendar/gui/a11y/ea-calendar.h
+++ b/calendar/gui/a11y/ea-calendar.h
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/a11y/ea-day-view-cell.c b/calendar/gui/a11y/ea-day-view-cell.c
index 4698a3ddf4..3555723b13 100644
--- a/calendar/gui/a11y/ea-day-view-cell.c
+++ b/calendar/gui/a11y/ea-day-view-cell.c
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/a11y/ea-day-view-cell.h b/calendar/gui/a11y/ea-day-view-cell.h
index ca674e2451..e0394c639b 100644
--- a/calendar/gui/a11y/ea-day-view-cell.h
+++ b/calendar/gui/a11y/ea-day-view-cell.h
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/a11y/ea-day-view-main-item.c b/calendar/gui/a11y/ea-day-view-main-item.c
index 55602e5d92..783710dc61 100644
--- a/calendar/gui/a11y/ea-day-view-main-item.c
+++ b/calendar/gui/a11y/ea-day-view-main-item.c
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
@@ -543,7 +543,7 @@ ea_day_view_main_item_get_row_label (EaDayViewMainItem *ea_main_item,
GObject *g_obj;
EDayViewMainItem *main_item;
EDayView *day_view;
- gchar *suffix;
+ const gchar *suffix;
gint hour, minute, suffix_width;
g_return_val_if_fail (ea_main_item, 0);
diff --git a/calendar/gui/a11y/ea-day-view-main-item.h b/calendar/gui/a11y/ea-day-view-main-item.h
index 79b166f39a..0ee7b5e0d1 100644
--- a/calendar/gui/a11y/ea-day-view-main-item.h
+++ b/calendar/gui/a11y/ea-day-view-main-item.h
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/a11y/ea-day-view.c b/calendar/gui/a11y/ea-day-view.c
index b43ddbe56f..107f983bb0 100644
--- a/calendar/gui/a11y/ea-day-view.c
+++ b/calendar/gui/a11y/ea-day-view.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/a11y/ea-day-view.h b/calendar/gui/a11y/ea-day-view.h
index 5c4773d048..011064a764 100644
--- a/calendar/gui/a11y/ea-day-view.h
+++ b/calendar/gui/a11y/ea-day-view.h
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/a11y/ea-gnome-calendar.c b/calendar/gui/a11y/ea-gnome-calendar.c
index b6eee2699c..4d6e752b8e 100644
--- a/calendar/gui/a11y/ea-gnome-calendar.c
+++ b/calendar/gui/a11y/ea-gnome-calendar.c
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/a11y/ea-gnome-calendar.h b/calendar/gui/a11y/ea-gnome-calendar.h
index 50c43072af..56e695a684 100644
--- a/calendar/gui/a11y/ea-gnome-calendar.h
+++ b/calendar/gui/a11y/ea-gnome-calendar.h
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/a11y/ea-jump-button.c b/calendar/gui/a11y/ea-jump-button.c
index cfe8e32cbb..7888196b8d 100644
--- a/calendar/gui/a11y/ea-jump-button.c
+++ b/calendar/gui/a11y/ea-jump-button.c
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
@@ -208,7 +208,7 @@ static G_CONST_RETURN gchar*
jump_button_get_keybinding (AtkAction *action,
gint i)
{
- gchar *return_value = NULL;
+ const gchar *return_value = NULL;
switch (i)
{
diff --git a/calendar/gui/a11y/ea-jump-button.h b/calendar/gui/a11y/ea-jump-button.h
index 4fbd92022f..cb2bea315d 100644
--- a/calendar/gui/a11y/ea-jump-button.h
+++ b/calendar/gui/a11y/ea-jump-button.h
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/a11y/ea-week-view-cell.c b/calendar/gui/a11y/ea-week-view-cell.c
index 3ec553b5ba..b45cf66e94 100644
--- a/calendar/gui/a11y/ea-week-view-cell.c
+++ b/calendar/gui/a11y/ea-week-view-cell.c
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/a11y/ea-week-view-cell.h b/calendar/gui/a11y/ea-week-view-cell.h
index b09d7d1789..4cd2971b80 100644
--- a/calendar/gui/a11y/ea-week-view-cell.h
+++ b/calendar/gui/a11y/ea-week-view-cell.h
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/a11y/ea-week-view-main-item.c b/calendar/gui/a11y/ea-week-view-main-item.c
index 5bfb73306b..ae507df235 100644
--- a/calendar/gui/a11y/ea-week-view-main-item.c
+++ b/calendar/gui/a11y/ea-week-view-main-item.c
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/a11y/ea-week-view-main-item.h b/calendar/gui/a11y/ea-week-view-main-item.h
index 12687d26c0..2093de10bd 100644
--- a/calendar/gui/a11y/ea-week-view-main-item.h
+++ b/calendar/gui/a11y/ea-week-view-main-item.h
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/a11y/ea-week-view.c b/calendar/gui/a11y/ea-week-view.c
index 6cf234c864..1d88e40c46 100644
--- a/calendar/gui/a11y/ea-week-view.c
+++ b/calendar/gui/a11y/ea-week-view.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/a11y/ea-week-view.h b/calendar/gui/a11y/ea-week-view.h
index b24fe72103..5a83276059 100644
--- a/calendar/gui/a11y/ea-week-view.h
+++ b/calendar/gui/a11y/ea-week-view.h
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/alarm-notify/alarm-notify-dialog.c b/calendar/gui/alarm-notify/alarm-notify-dialog.c
index 7f54b6bf2d..089bf37552 100644
--- a/calendar/gui/alarm-notify/alarm-notify-dialog.c
+++ b/calendar/gui/alarm-notify/alarm-notify-dialog.c
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/alarm-notify/alarm-notify-dialog.h b/calendar/gui/alarm-notify/alarm-notify-dialog.h
index 7a94793eaa..17f9b3a61c 100644
--- a/calendar/gui/alarm-notify/alarm-notify-dialog.h
+++ b/calendar/gui/alarm-notify/alarm-notify-dialog.h
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/alarm-notify/alarm-notify.c b/calendar/gui/alarm-notify/alarm-notify.c
index 38a3b49e9f..4085815bce 100644
--- a/calendar/gui/alarm-notify/alarm-notify.c
+++ b/calendar/gui/alarm-notify/alarm-notify.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
@@ -352,7 +352,7 @@ alarm_notify_add_calendar (AlarmNotify *an, ECalSourceType source_type, ESource
priv = an->priv;
str_uri = e_source_get_uri (source);
e_uri = e_uri_new (str_uri);
- if (e_source_get_property (source, "auth-type"))
+ if (e_source_get_property (source, "auth-type"))
pass_key = e_uri_to_string (e_uri, FALSE);
else
pass_key = g_strdup (str_uri);
diff --git a/calendar/gui/alarm-notify/alarm-notify.h b/calendar/gui/alarm-notify/alarm-notify.h
index 7fea501de9..a548716295 100644
--- a/calendar/gui/alarm-notify/alarm-notify.h
+++ b/calendar/gui/alarm-notify/alarm-notify.h
@@ -13,7 +13,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c
index 91554a56c1..51aad370d6 100644
--- a/calendar/gui/alarm-notify/alarm-queue.c
+++ b/calendar/gui/alarm-notify/alarm-queue.c
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
@@ -150,7 +150,6 @@ static void popup_notification (time_t trigger, CompQueuedAlarms *cqa,
static void query_objects_changed_cb (ECal *client, GList *objects, gpointer data);
static void query_objects_removed_cb (ECal *client, GList *objects, gpointer data);
-static void remove_client_alarms (ClientAlarms *ca);
static void update_cqa (CompQueuedAlarms *cqa, ECalComponent *comp);
static void update_qa (ECalComponentAlarms *alarms, QueuedAlarm *qa);
static void tray_list_remove_cqa (CompQueuedAlarms *cqa);
@@ -922,8 +921,8 @@ edit_component (ECal *client, ECalComponent *comp)
/* Get the factory */
CORBA_exception_init (&ev);
- factory = bonobo_activation_activate_from_id ("OAFIID:GNOME_Evolution_Calendar_CompEditorFactory:" BASE_VERSION,
- 0, NULL, &ev);
+ factory = bonobo_activation_activate_from_id (
+ (Bonobo_ActivationID) "OAFIID:GNOME_Evolution_Calendar_CompEditorFactory:" BASE_VERSION, 0, NULL, &ev);
if (BONOBO_EX (&ev)) {
e_error_run (NULL, "editor-error", bonobo_exception_get_text (&ev), NULL);
diff --git a/calendar/gui/alarm-notify/alarm-queue.h b/calendar/gui/alarm-notify/alarm-queue.h
index 69fbafec02..9a2e11c472 100644
--- a/calendar/gui/alarm-notify/alarm-queue.h
+++ b/calendar/gui/alarm-notify/alarm-queue.h
@@ -13,7 +13,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/alarm-notify/alarm.c b/calendar/gui/alarm-notify/alarm.c
index 5dca49ae25..f2ab4bb23d 100644
--- a/calendar/gui/alarm-notify/alarm.c
+++ b/calendar/gui/alarm-notify/alarm.c
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/alarm-notify/alarm.h b/calendar/gui/alarm-notify/alarm.h
index bbedf392c7..7a14db5d03 100644
--- a/calendar/gui/alarm-notify/alarm.h
+++ b/calendar/gui/alarm-notify/alarm.h
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/alarm-notify/config-data.c b/calendar/gui/alarm-notify/config-data.c
index 5a05cfd341..dba9099520 100644
--- a/calendar/gui/alarm-notify/config-data.c
+++ b/calendar/gui/alarm-notify/config-data.c
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/alarm-notify/config-data.h b/calendar/gui/alarm-notify/config-data.h
index 9dd6f0221c..63e6c7205e 100644
--- a/calendar/gui/alarm-notify/config-data.h
+++ b/calendar/gui/alarm-notify/config-data.h
@@ -13,7 +13,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/alarm-notify/notify-main.c b/calendar/gui/alarm-notify/notify-main.c
index 3504b0db77..a625bec0fa 100644
--- a/calendar/gui/alarm-notify/notify-main.c
+++ b/calendar/gui/alarm-notify/notify-main.c
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/alarm-notify/util.c b/calendar/gui/alarm-notify/util.c
index 6a734a8660..640a8f5f99 100644
--- a/calendar/gui/alarm-notify/util.c
+++ b/calendar/gui/alarm-notify/util.c
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/alarm-notify/util.h b/calendar/gui/alarm-notify/util.h
index c53f047953..b7b715ca9b 100644
--- a/calendar/gui/alarm-notify/util.h
+++ b/calendar/gui/alarm-notify/util.h
@@ -13,7 +13,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/cal-search-bar.c b/calendar/gui/cal-search-bar.c
index b8fe5a45fd..40359d14dc 100644
--- a/calendar/gui/cal-search-bar.c
+++ b/calendar/gui/cal-search-bar.c
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
@@ -408,7 +408,7 @@ static void
notify_e_cal_view_contains (CalSearchBar *cal_search, const char *field, const char *view)
{
char *text = NULL;
- char *sexp = " ";
+ char *sexp;
text = e_search_bar_get_text (E_SEARCH_BAR (cal_search));
diff --git a/calendar/gui/cal-search-bar.h b/calendar/gui/cal-search-bar.h
index 64e1b40b0c..26f3998c89 100644
--- a/calendar/gui/cal-search-bar.h
+++ b/calendar/gui/cal-search-bar.h
@@ -13,7 +13,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/calendar-commands.c b/calendar/gui/calendar-commands.c
index e4b72d2299..9f00044a4b 100644
--- a/calendar/gui/calendar-commands.c
+++ b/calendar/gui/calendar-commands.c
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
@@ -187,7 +187,7 @@ purge_cmd (BonoboUIComponent *uic, gpointer data, const gchar *path)
}
struct _sensitize_item {
- char *command;
+ const gchar *command;
guint32 enable;
};
diff --git a/calendar/gui/calendar-commands.h b/calendar/gui/calendar-commands.h
index cfe2d24232..b1c093fb9e 100644
--- a/calendar/gui/calendar-commands.h
+++ b/calendar/gui/calendar-commands.h
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c
index 2aaaaf2e6e..eef60cfdb6 100644
--- a/calendar/gui/calendar-component.c
+++ b/calendar/gui/calendar-component.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
@@ -66,7 +66,7 @@
#define CREATE_ALLDAY_EVENT_ID "allday-event"
#define CREATE_CALENDAR_ID "calendar"
#define CALENDAR_ERROR_LEVEL_KEY "/apps/evolution/calendar/display/error_level"
-#define CALENDAR_ERROR_TIME_OUT_KEY "/apps/evolution/calendar/display/error_timeout"
+#define CALENDAR_ERROR_TIME_OUT_KEY "/apps/evolution/calendar/display/error_timeout"
static BonoboObjectClass *parent_class = NULL;
@@ -196,8 +196,9 @@ update_task_memo_selection (CalendarComponentView *component_view, ECalSourceTyp
ESource *source;
source = e_source_list_peek_source_by_uid (source_list, uid);
- if (source && !gnome_calendar_add_source (component_view->calendar, type, source))
+ if (source && !gnome_calendar_add_source (component_view->calendar, type, source)) {
/* FIXME do something */;
+ }
}
if (type == E_CAL_SOURCE_TYPE_TODO)
@@ -709,8 +710,6 @@ calendar_component_init (CalendarComponent *component)
component->priv = priv;
- if (!e_cal_get_sources (&priv->task_source_list, E_CAL_SOURCE_TYPE_TODO, NULL))
- ;
- if (!e_cal_get_sources (&priv->memo_source_list, E_CAL_SOURCE_TYPE_JOURNAL, NULL))
- ;
+ e_cal_get_sources (&priv->task_source_list, E_CAL_SOURCE_TYPE_TODO, NULL);
+ e_cal_get_sources (&priv->memo_source_list, E_CAL_SOURCE_TYPE_JOURNAL, NULL);
}
diff --git a/calendar/gui/calendar-component.h b/calendar/gui/calendar-component.h
index 5fbba8758e..1106d8ec62 100644
--- a/calendar/gui/calendar-component.h
+++ b/calendar/gui/calendar-component.h
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/calendar-config-keys.h b/calendar/gui/calendar-config-keys.h
index 4e7ec7c254..b4e95c2bd7 100644
--- a/calendar/gui/calendar-config-keys.h
+++ b/calendar/gui/calendar-config-keys.h
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/calendar-config.c b/calendar/gui/calendar-config.c
index 3341d7c51b..14ebc801a3 100644
--- a/calendar/gui/calendar-config.c
+++ b/calendar/gui/calendar-config.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/calendar-config.h b/calendar/gui/calendar-config.h
index 09a9a7d53b..08febaf0d3 100644
--- a/calendar/gui/calendar-config.h
+++ b/calendar/gui/calendar-config.h
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/calendar-view-factory.c b/calendar/gui/calendar-view-factory.c
index b3f88dd43f..9eec42fb13 100644
--- a/calendar/gui/calendar-view-factory.c
+++ b/calendar/gui/calendar-view-factory.c
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/calendar-view-factory.h b/calendar/gui/calendar-view-factory.h
index 2f5b6f86de..c0b90f2bd9 100644
--- a/calendar/gui/calendar-view-factory.h
+++ b/calendar/gui/calendar-view-factory.h
@@ -13,7 +13,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/calendar-view.c b/calendar/gui/calendar-view.c
index 331181e4cd..5415affdf2 100644
--- a/calendar/gui/calendar-view.c
+++ b/calendar/gui/calendar-view.c
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/calendar-view.h b/calendar/gui/calendar-view.h
index 53c4ca6a39..51e3235c34 100644
--- a/calendar/gui/calendar-view.h
+++ b/calendar/gui/calendar-view.h
@@ -13,7 +13,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/comp-util.c b/calendar/gui/comp-util.c
index 53fdacefb9..153dc089ec 100644
--- a/calendar/gui/comp-util.c
+++ b/calendar/gui/comp-util.c
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
@@ -641,7 +641,7 @@ update_objects (ECal *client, icalcomponent *icalcomp)
icalcomponent_kind kind;
kind = icalcomponent_isa (icalcomp);
- if (kind == ICAL_VTODO_COMPONENT ||
+ if (kind == ICAL_VTODO_COMPONENT ||
kind == ICAL_VEVENT_COMPONENT ||
kind == ICAL_VJOURNAL_COMPONENT)
return update_single_object (client, icalcomp, kind == ICAL_VJOURNAL_COMPONENT);
@@ -803,7 +803,7 @@ comp_util_sanitize_recurrence_master (ECalComponent *comp, ECal *client)
ECalComponent *master = NULL;
icalcomponent *icalcomp = NULL;
ECalComponentRange rid;
- ECalComponentDateTime sdt;
+ ECalComponentDateTime sdt;
const char *uid;
/* Get the master component */
@@ -839,7 +839,7 @@ comp_util_sanitize_recurrence_master (ECalComponent *comp, ECal *client)
e_cal_component_set_dtstart (comp, &sdt);
e_cal_component_set_dtend (comp, &edt);
-
+
e_cal_component_get_sequence (master, &sequence);
e_cal_component_set_sequence (comp, sequence);
diff --git a/calendar/gui/comp-util.h b/calendar/gui/comp-util.h
index b93384f40a..3faf9f49a8 100644
--- a/calendar/gui/comp-util.h
+++ b/calendar/gui/comp-util.h
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/dialogs/alarm-dialog.c b/calendar/gui/dialogs/alarm-dialog.c
index 3881c85106..73bfde30cc 100644
--- a/calendar/gui/dialogs/alarm-dialog.c
+++ b/calendar/gui/dialogs/alarm-dialog.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/dialogs/alarm-dialog.h b/calendar/gui/dialogs/alarm-dialog.h
index 0cdee744c9..b5560f9ff4 100644
--- a/calendar/gui/dialogs/alarm-dialog.h
+++ b/calendar/gui/dialogs/alarm-dialog.h
@@ -13,7 +13,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/dialogs/alarm-list-dialog.c b/calendar/gui/dialogs/alarm-list-dialog.c
index 07395a4782..8520b3727b 100644
--- a/calendar/gui/dialogs/alarm-list-dialog.c
+++ b/calendar/gui/dialogs/alarm-list-dialog.c
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/dialogs/alarm-list-dialog.h b/calendar/gui/dialogs/alarm-list-dialog.h
index 6a55f03000..7d58fcb0af 100644
--- a/calendar/gui/dialogs/alarm-list-dialog.h
+++ b/calendar/gui/dialogs/alarm-list-dialog.h
@@ -13,7 +13,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/dialogs/cal-attachment-select-file.c b/calendar/gui/dialogs/cal-attachment-select-file.c
index 5de8ea669b..9c502153d3 100644
--- a/calendar/gui/dialogs/cal-attachment-select-file.c
+++ b/calendar/gui/dialogs/cal-attachment-select-file.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/dialogs/cal-attachment-select-file.h b/calendar/gui/dialogs/cal-attachment-select-file.h
index 3c39fed125..0f965e6c9b 100644
--- a/calendar/gui/dialogs/cal-attachment-select-file.h
+++ b/calendar/gui/dialogs/cal-attachment-select-file.h
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/dialogs/cal-prefs-dialog.c b/calendar/gui/dialogs/cal-prefs-dialog.c
index cdef86eb5a..097c91907f 100644
--- a/calendar/gui/dialogs/cal-prefs-dialog.c
+++ b/calendar/gui/dialogs/cal-prefs-dialog.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
@@ -730,17 +730,17 @@ show_config (CalendarPrefsDialog *prefs)
/* plugin meta-data */
static ECalConfigItem eccp_items[] = {
- { E_CONFIG_BOOK, "", "toplevel-notebook", eccp_widget_glade },
- { E_CONFIG_PAGE, "00.general", "general", eccp_widget_glade },
- { E_CONFIG_SECTION_TABLE, "00.general/00.time", "time", eccp_widget_glade },
- { E_CONFIG_SECTION_TABLE, "00.general/10.workWeek", "workWeek", eccp_widget_glade },
- { E_CONFIG_SECTION, "00.general/20.alerts", "alerts", eccp_widget_glade },
- { E_CONFIG_PAGE, "10.display", "display", eccp_widget_glade },
- { E_CONFIG_SECTION, "10.display/00.general", "displayGeneral", eccp_widget_glade },
- { E_CONFIG_SECTION, "10.display/10.taskList", "taskList", eccp_widget_glade },
- { E_CONFIG_PAGE, "15.alarms", "alarms", eccp_widget_glade },
- { E_CONFIG_PAGE, "20.freeBusy", "freebusy", eccp_widget_glade },
- { E_CONFIG_SECTION, "20.freeBusy/00.defaultServer", "defaultFBServer", eccp_widget_glade },
+ { E_CONFIG_BOOK, (gchar *) "", (gchar *) "toplevel-notebook", eccp_widget_glade },
+ { E_CONFIG_PAGE, (gchar *) "00.general", (gchar *) "general", eccp_widget_glade },
+ { E_CONFIG_SECTION_TABLE, (gchar *) "00.general/00.time", (gchar *) "time", eccp_widget_glade },
+ { E_CONFIG_SECTION_TABLE, (gchar *) "00.general/10.workWeek", (gchar *) "workWeek", eccp_widget_glade },
+ { E_CONFIG_SECTION, (gchar *) "00.general/20.alerts", (gchar *) "alerts", eccp_widget_glade },
+ { E_CONFIG_PAGE, (gchar *) "10.display", (gchar *) "display", eccp_widget_glade },
+ { E_CONFIG_SECTION, (gchar *) "10.display/00.general", (gchar *) "displayGeneral", eccp_widget_glade },
+ { E_CONFIG_SECTION, (gchar *) "10.display/10.taskList", (gchar *) "taskList", eccp_widget_glade },
+ { E_CONFIG_PAGE, (gchar *) "15.alarms", (gchar *) "alarms", eccp_widget_glade },
+ { E_CONFIG_PAGE, (gchar *) "20.freeBusy", (gchar *) "freebusy", eccp_widget_glade },
+ { E_CONFIG_SECTION, (gchar *) "20.freeBusy/00.defaultServer", (gchar *) "defaultFBServer", eccp_widget_glade },
};
static void
diff --git a/calendar/gui/dialogs/cal-prefs-dialog.h b/calendar/gui/dialogs/cal-prefs-dialog.h
index ba1bf607ea..397cb35cfa 100644
--- a/calendar/gui/dialogs/cal-prefs-dialog.h
+++ b/calendar/gui/dialogs/cal-prefs-dialog.h
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/dialogs/calendar-setup.c b/calendar/gui/dialogs/calendar-setup.c
index b182f9cc78..95820b8247 100644
--- a/calendar/gui/dialogs/calendar-setup.c
+++ b/calendar/gui/dialogs/calendar-setup.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
@@ -258,7 +258,7 @@ eccp_general_offline (EConfig *ec, EConfigItem *item, struct _GtkWidget *parent,
GtkWidget *offline_setting = NULL;
const char *offline_sync;
int row;
- const char *base_uri = e_source_group_peek_base_uri (sdialog->source_group);
+ const char *base_uri = e_source_group_peek_base_uri (sdialog->source_group);
gboolean is_local = base_uri && (g_str_has_prefix (base_uri, "file://") || g_str_has_prefix (base_uri, "contacts://"));
offline_sync = e_source_get_property (sdialog->source, "offline_sync");
if (old)
@@ -363,35 +363,35 @@ eccp_get_source_color (EConfig *ec, EConfigItem *item, struct _GtkWidget *parent
}
static ECalConfigItem eccp_items[] = {
- { E_CONFIG_BOOK, "", NULL },
- { E_CONFIG_PAGE, "00.general", N_("General") },
- { E_CONFIG_SECTION_TABLE, "00.general/00.source", N_("Calendar") },
- { E_CONFIG_ITEM_TABLE, "00.general/00.source/00.type", NULL, eccp_get_source_type },
- { E_CONFIG_ITEM_TABLE, "00.general/00.source/10.name", NULL, eccp_get_source_name },
- { E_CONFIG_ITEM_TABLE, "00.general/00.source/20.color", NULL, eccp_get_source_color },
- { E_CONFIG_ITEM_TABLE, "00.general/00.source/30.offline", NULL, eccp_general_offline },
+ { E_CONFIG_BOOK, (gchar *) "", NULL },
+ { E_CONFIG_PAGE, (gchar *) "00.general", (gchar *) N_("General") },
+ { E_CONFIG_SECTION_TABLE, (gchar *) "00.general/00.source", (gchar *) N_("Calendar") },
+ { E_CONFIG_ITEM_TABLE, (gchar *) "00.general/00.source/00.type", NULL, eccp_get_source_type },
+ { E_CONFIG_ITEM_TABLE, (gchar *) "00.general/00.source/10.name", NULL, eccp_get_source_name },
+ { E_CONFIG_ITEM_TABLE, (gchar *) "00.general/00.source/20.color", NULL, eccp_get_source_color },
+ { E_CONFIG_ITEM_TABLE, (gchar *) "00.general/00.source/30.offline", NULL, eccp_general_offline },
{ 0 },
};
static ECalConfigItem ectp_items[] = {
- { E_CONFIG_BOOK, "", NULL },
- { E_CONFIG_PAGE, "00.general", N_("General") },
- { E_CONFIG_SECTION_TABLE, "00.general/00.source", N_("Task List") },
- { E_CONFIG_ITEM_TABLE, "00.general/00.source/00.type", NULL, eccp_get_source_type },
- { E_CONFIG_ITEM_TABLE, "00.general/00.source/10.name", NULL, eccp_get_source_name },
- { E_CONFIG_ITEM_TABLE, "00.general/00.source/20.color", NULL, eccp_get_source_color },
- { E_CONFIG_ITEM_TABLE, "00.general/00.source/30.offline", NULL, eccp_general_offline },
+ { E_CONFIG_BOOK, (gchar *) "", NULL },
+ { E_CONFIG_PAGE, (gchar *) "00.general", (gchar *) N_("General") },
+ { E_CONFIG_SECTION_TABLE, (gchar *) "00.general/00.source", (gchar *) N_("Task List") },
+ { E_CONFIG_ITEM_TABLE, (gchar *) "00.general/00.source/00.type", NULL, eccp_get_source_type },
+ { E_CONFIG_ITEM_TABLE, (gchar *) "00.general/00.source/10.name", NULL, eccp_get_source_name },
+ { E_CONFIG_ITEM_TABLE, (gchar *) "00.general/00.source/20.color", NULL, eccp_get_source_color },
+ { E_CONFIG_ITEM_TABLE, (gchar *) "00.general/00.source/30.offline", NULL, eccp_general_offline },
{ 0 },
};
static ECalConfigItem ecmp_items[] = {
- { E_CONFIG_BOOK, "", NULL },
- { E_CONFIG_PAGE, "00.general", N_("General") },
- { E_CONFIG_SECTION_TABLE, "00.general/00.source", N_("Memo List") },
- { E_CONFIG_ITEM_TABLE, "00.general/00.source/00.type", NULL, eccp_get_source_type },
- { E_CONFIG_ITEM_TABLE, "00.general/00.source/10.name", NULL, eccp_get_source_name },
- { E_CONFIG_ITEM_TABLE, "00.general/00.source/20.color", NULL, eccp_get_source_color },
- { E_CONFIG_ITEM_TABLE, "00.general/00.source/30.offline", NULL, eccp_general_offline },
+ { E_CONFIG_BOOK, (gchar *) "", NULL },
+ { E_CONFIG_PAGE, (gchar *) "00.general", (gchar *) N_("General") },
+ { E_CONFIG_SECTION_TABLE, (gchar *) "00.general/00.source", (gchar *) N_("Memo List") },
+ { E_CONFIG_ITEM_TABLE, (gchar *) "00.general/00.source/00.type", NULL, eccp_get_source_type },
+ { E_CONFIG_ITEM_TABLE, (gchar *) "00.general/00.source/10.name", NULL, eccp_get_source_name },
+ { E_CONFIG_ITEM_TABLE, (gchar *) "00.general/00.source/20.color", NULL, eccp_get_source_color },
+ { E_CONFIG_ITEM_TABLE, (gchar *) "00.general/00.source/30.offline", NULL, eccp_general_offline },
{ 0 },
};
diff --git a/calendar/gui/dialogs/calendar-setup.h b/calendar/gui/dialogs/calendar-setup.h
index 3898467595..4ec9980532 100644
--- a/calendar/gui/dialogs/calendar-setup.h
+++ b/calendar/gui/dialogs/calendar-setup.h
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/dialogs/cancel-comp.c b/calendar/gui/dialogs/cancel-comp.c
index 2548d5ba2d..cddd4f8d8d 100644
--- a/calendar/gui/dialogs/cancel-comp.c
+++ b/calendar/gui/dialogs/cancel-comp.c
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/dialogs/cancel-comp.h b/calendar/gui/dialogs/cancel-comp.h
index 3566a7548e..5f1261f1f5 100644
--- a/calendar/gui/dialogs/cancel-comp.h
+++ b/calendar/gui/dialogs/cancel-comp.h
@@ -13,7 +13,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/dialogs/changed-comp.c b/calendar/gui/dialogs/changed-comp.c
index 9a0665d763..d1abc1724d 100644
--- a/calendar/gui/dialogs/changed-comp.c
+++ b/calendar/gui/dialogs/changed-comp.c
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/dialogs/changed-comp.h b/calendar/gui/dialogs/changed-comp.h
index 7a8bcb30f5..6bb20210dd 100644
--- a/calendar/gui/dialogs/changed-comp.h
+++ b/calendar/gui/dialogs/changed-comp.h
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/dialogs/comp-editor-page.c b/calendar/gui/dialogs/comp-editor-page.c
index a86465d5d7..93b9cd9304 100644
--- a/calendar/gui/dialogs/comp-editor-page.c
+++ b/calendar/gui/dialogs/comp-editor-page.c
@@ -13,7 +13,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/dialogs/comp-editor-page.h b/calendar/gui/dialogs/comp-editor-page.h
index f8b9db23f3..819ea74ccc 100644
--- a/calendar/gui/dialogs/comp-editor-page.h
+++ b/calendar/gui/dialogs/comp-editor-page.h
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/dialogs/comp-editor-util.c b/calendar/gui/dialogs/comp-editor-util.c
index 6547731776..4666058b51 100644
--- a/calendar/gui/dialogs/comp-editor-util.c
+++ b/calendar/gui/dialogs/comp-editor-util.c
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
@@ -112,8 +112,12 @@ comp_editor_free_dates (CompEditorPageDates *dates)
/* dtstart is only passed in if tt is the dtend. */
static void
-write_label_piece (struct icaltimetype *tt, char *buffer, int size,
- char *stext, char *etext, struct icaltimetype *dtstart)
+write_label_piece (struct icaltimetype *tt,
+ gchar *buffer,
+ gint size,
+ gchar *stext,
+ const gchar *etext,
+ struct icaltimetype *dtstart)
{
struct tm tmp_tm = { 0 };
struct icaltimetype tt_copy = *tt;
diff --git a/calendar/gui/dialogs/comp-editor-util.h b/calendar/gui/dialogs/comp-editor-util.h
index 565feeaea5..5516fe4cc4 100644
--- a/calendar/gui/dialogs/comp-editor-util.h
+++ b/calendar/gui/dialogs/comp-editor-util.h
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index 049f90a1ff..06fd724680 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
@@ -253,7 +253,7 @@ get_attachment_list (CompEditor *editor)
* calendar source */
utf8_safe_fname = camel_file_util_safe_filename (camel_mime_part_get_filename (mime_part));
- /* It is absolutely fine to get a NULL from the filename of
+ /* It is absolutely fine to get a NULL from the filename of
* mime part. We assume that it is named "Attachment"
* in mailer. I'll do that with a ticker */
if (!utf8_safe_fname)
@@ -842,7 +842,7 @@ action_save_cb (GtkAction *action,
delegate = flags & COMP_EDITOR_DELEGATE;
if (delegate && !remove_event_dialog (priv->client, priv->comp, GTK_WINDOW (editor))) {
- const char *uid = NULL;
+ const char *uid = NULL;
GError *error = NULL;
e_cal_component_get_uid (priv->comp, &uid);
@@ -2547,7 +2547,7 @@ real_send_comp (CompEditor *editor, ECalComponentItipMethod method, gboolean str
set_attendees_for_delegation (send_comp, address, method);
}
- if (!e_cal_component_has_attachments (priv->comp)
+ if (!e_cal_component_has_attachments (priv->comp)
|| e_cal_get_static_capability (priv->client, CAL_STATIC_CAPABILITY_CREATE_MESSAGES)) {
if (itip_send_comp (method, send_comp, priv->client,
NULL, NULL, users, strip_alarms)) {
diff --git a/calendar/gui/dialogs/comp-editor.h b/calendar/gui/dialogs/comp-editor.h
index a6231d55b5..278501b9ba 100644
--- a/calendar/gui/dialogs/comp-editor.h
+++ b/calendar/gui/dialogs/comp-editor.h
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/dialogs/copy-source-dialog.c b/calendar/gui/dialogs/copy-source-dialog.c
index 5bb970433b..92444678be 100644
--- a/calendar/gui/dialogs/copy-source-dialog.c
+++ b/calendar/gui/dialogs/copy-source-dialog.c
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/dialogs/copy-source-dialog.h b/calendar/gui/dialogs/copy-source-dialog.h
index ba3169a1b8..4c6f5b19c8 100644
--- a/calendar/gui/dialogs/copy-source-dialog.h
+++ b/calendar/gui/dialogs/copy-source-dialog.h
@@ -13,7 +13,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/dialogs/delete-comp.c b/calendar/gui/dialogs/delete-comp.c
index e5ae1e6cdc..ae371aabb2 100644
--- a/calendar/gui/dialogs/delete-comp.c
+++ b/calendar/gui/dialogs/delete-comp.c
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/dialogs/delete-comp.h b/calendar/gui/dialogs/delete-comp.h
index bb4b5983d9..c619e28b98 100644
--- a/calendar/gui/dialogs/delete-comp.h
+++ b/calendar/gui/dialogs/delete-comp.h
@@ -13,7 +13,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/dialogs/delete-error.c b/calendar/gui/dialogs/delete-error.c
index b151ef8068..f8df587aa4 100644
--- a/calendar/gui/dialogs/delete-error.c
+++ b/calendar/gui/dialogs/delete-error.c
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/dialogs/delete-error.h b/calendar/gui/dialogs/delete-error.h
index cb0a7d9294..dab620541f 100644
--- a/calendar/gui/dialogs/delete-error.h
+++ b/calendar/gui/dialogs/delete-error.h
@@ -13,7 +13,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/dialogs/e-delegate-dialog.c b/calendar/gui/dialogs/e-delegate-dialog.c
index 31c4631ca9..8e060832df 100644
--- a/calendar/gui/dialogs/e-delegate-dialog.c
+++ b/calendar/gui/dialogs/e-delegate-dialog.c
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/dialogs/e-delegate-dialog.h b/calendar/gui/dialogs/e-delegate-dialog.h
index 553b7c1576..e4f474781a 100644
--- a/calendar/gui/dialogs/e-delegate-dialog.h
+++ b/calendar/gui/dialogs/e-delegate-dialog.h
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/dialogs/e-send-options-utils.c b/calendar/gui/dialogs/e-send-options-utils.c
index 52f73aed02..fd6bf245c2 100644
--- a/calendar/gui/dialogs/e-send-options-utils.c
+++ b/calendar/gui/dialogs/e-send-options-utils.c
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
@@ -28,7 +28,7 @@
#include <string.h>
void
-e_sendoptions_utils_set_default_data (ESendOptionsDialog *sod, ESource *source, char * type)
+e_sendoptions_utils_set_default_data (ESendOptionsDialog *sod, ESource *source, const gchar *type)
{
ESendOptionsGeneral *gopts = NULL;
ESendOptionsStatusTracking *sopts;
diff --git a/calendar/gui/dialogs/e-send-options-utils.h b/calendar/gui/dialogs/e-send-options-utils.h
index cae3131c00..01cf3ed2e9 100644
--- a/calendar/gui/dialogs/e-send-options-utils.h
+++ b/calendar/gui/dialogs/e-send-options-utils.h
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
@@ -29,6 +29,6 @@
#include <libecal/e-cal-component.h>
#include <libedataserver/e-source-list.h>
-void e_sendoptions_utils_set_default_data (ESendOptionsDialog *sod, ESource *source, char* type);
+void e_sendoptions_utils_set_default_data (ESendOptionsDialog *sod, ESource *source, const gchar *type);
void e_sendoptions_utils_fill_component (ESendOptionsDialog *sod, ECalComponent *comp);
#endif
diff --git a/calendar/gui/dialogs/event-editor.c b/calendar/gui/dialogs/event-editor.c
index 830bbeb0ad..987c716b6f 100644
--- a/calendar/gui/dialogs/event-editor.c
+++ b/calendar/gui/dialogs/event-editor.c
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/dialogs/event-editor.h b/calendar/gui/dialogs/event-editor.h
index c2dde76673..abb8f0e659 100644
--- a/calendar/gui/dialogs/event-editor.h
+++ b/calendar/gui/dialogs/event-editor.h
@@ -1,5 +1,5 @@
/*
- * Evolution calendar - Event editor dialog
+ * Evolution calendar - Event editor dialog
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c
index ec2f26a045..fa1faa2f79 100644
--- a/calendar/gui/dialogs/event-page.c
+++ b/calendar/gui/dialogs/event-page.c
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
@@ -1588,20 +1588,20 @@ void update_end_time_combo (EventPage *epage)
gtk_spin_button_set_value (GTK_SPIN_BUTTON (priv->minute_selector), minutes);
}
-void
-static hour_sel_changed (GtkSpinButton *widget, EventPage *epage)
+static void
+hour_sel_changed (GtkSpinButton *widget, EventPage *epage)
{
hour_minute_changed (epage);
}
-void
-static minute_sel_changed (GtkSpinButton *widget, EventPage *epage)
+static void
+minute_sel_changed (GtkSpinButton *widget, EventPage *epage)
{
hour_minute_changed (epage);
}
-void
-static hour_minute_changed ( EventPage *epage)
+static void
+hour_minute_changed (EventPage *epage)
{
EventPagePrivate *priv;
gint for_hours, for_minutes;
@@ -1888,8 +1888,8 @@ enum {
};
static EPopupItem context_menu_items[] = {
- { E_POPUP_ITEM, "10.delete", N_("_Remove"), popup_delete_cb, NULL, GTK_STOCK_REMOVE, ATTENDEE_CAN_DELETE },
- { E_POPUP_ITEM, "15.add", N_("_Add "), popup_add_cb, NULL, GTK_STOCK_ADD, ATTENDEE_CAN_ADD },
+ { E_POPUP_ITEM, (gchar *) "10.delete", (gchar *) N_("_Remove"), popup_delete_cb, NULL, (gchar *) GTK_STOCK_REMOVE, ATTENDEE_CAN_DELETE },
+ { E_POPUP_ITEM, (gchar *) "15.add", (gchar *) N_("_Add "), popup_add_cb, NULL, (gchar *) GTK_STOCK_ADD, ATTENDEE_CAN_ADD },
};
static void
@@ -3294,7 +3294,7 @@ event_page_add_attendee (EventPage *epage, EMeetingAttendee *attendee)
g_return_if_fail (epage != NULL);
g_return_if_fail (IS_EVENT_PAGE (epage));
-
+
priv = epage->priv;
e_meeting_store_add_attendee (priv->model, attendee);
@@ -3313,7 +3313,7 @@ event_page_remove_all_attendees (EventPage *epage)
g_return_if_fail (epage != NULL);
g_return_if_fail (IS_EVENT_PAGE (epage));
-
+
priv = epage->priv;
e_meeting_store_remove_all_attendees (priv->model);
diff --git a/calendar/gui/dialogs/event-page.h b/calendar/gui/dialogs/event-page.h
index 63c0bd2306..5bd377c075 100644
--- a/calendar/gui/dialogs/event-page.h
+++ b/calendar/gui/dialogs/event-page.h
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/dialogs/memo-editor.c b/calendar/gui/dialogs/memo-editor.c
index 8de23430c9..bda54e55eb 100644
--- a/calendar/gui/dialogs/memo-editor.c
+++ b/calendar/gui/dialogs/memo-editor.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/dialogs/memo-editor.h b/calendar/gui/dialogs/memo-editor.h
index 34db230121..cd4bc194ac 100644
--- a/calendar/gui/dialogs/memo-editor.h
+++ b/calendar/gui/dialogs/memo-editor.h
@@ -13,7 +13,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/dialogs/memo-page.c b/calendar/gui/dialogs/memo-page.c
index a15c1b1f88..f8ce1bece2 100644
--- a/calendar/gui/dialogs/memo-page.c
+++ b/calendar/gui/dialogs/memo-page.c
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/dialogs/memo-page.h b/calendar/gui/dialogs/memo-page.h
index cfe4cb0a17..115d8aafb7 100644
--- a/calendar/gui/dialogs/memo-page.h
+++ b/calendar/gui/dialogs/memo-page.h
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/dialogs/recur-comp.c b/calendar/gui/dialogs/recur-comp.c
index e57c0c8aa7..8d8dabbaf2 100644
--- a/calendar/gui/dialogs/recur-comp.c
+++ b/calendar/gui/dialogs/recur-comp.c
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/dialogs/recur-comp.h b/calendar/gui/dialogs/recur-comp.h
index e4666772f7..47236ef8cd 100644
--- a/calendar/gui/dialogs/recur-comp.h
+++ b/calendar/gui/dialogs/recur-comp.h
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/dialogs/recurrence-page.c b/calendar/gui/dialogs/recurrence-page.c
index c85a0ae0f2..f89993154f 100644
--- a/calendar/gui/dialogs/recurrence-page.c
+++ b/calendar/gui/dialogs/recurrence-page.c
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/dialogs/recurrence-page.h b/calendar/gui/dialogs/recurrence-page.h
index f3bff613ee..1dce00d2c9 100644
--- a/calendar/gui/dialogs/recurrence-page.h
+++ b/calendar/gui/dialogs/recurrence-page.h
@@ -13,7 +13,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/dialogs/save-comp.c b/calendar/gui/dialogs/save-comp.c
index cb178e0dce..3f47312d22 100644
--- a/calendar/gui/dialogs/save-comp.c
+++ b/calendar/gui/dialogs/save-comp.c
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/dialogs/save-comp.h b/calendar/gui/dialogs/save-comp.h
index 123a4a8587..5105e4af7f 100644
--- a/calendar/gui/dialogs/save-comp.h
+++ b/calendar/gui/dialogs/save-comp.h
@@ -1,7 +1,7 @@
/*
*
* Evolution calendar - Delete calendar component dialog
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
@@ -13,7 +13,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/dialogs/schedule-page.c b/calendar/gui/dialogs/schedule-page.c
index e1137be3a0..4baa22ab8a 100644
--- a/calendar/gui/dialogs/schedule-page.c
+++ b/calendar/gui/dialogs/schedule-page.c
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/dialogs/schedule-page.h b/calendar/gui/dialogs/schedule-page.h
index 8ffbb43c71..71eec02763 100644
--- a/calendar/gui/dialogs/schedule-page.h
+++ b/calendar/gui/dialogs/schedule-page.h
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/dialogs/select-source-dialog.c b/calendar/gui/dialogs/select-source-dialog.c
index e9fc7d0d9f..f73af156b0 100644
--- a/calendar/gui/dialogs/select-source-dialog.c
+++ b/calendar/gui/dialogs/select-source-dialog.c
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/dialogs/select-source-dialog.h b/calendar/gui/dialogs/select-source-dialog.h
index 3ca3cec041..850eddd610 100644
--- a/calendar/gui/dialogs/select-source-dialog.h
+++ b/calendar/gui/dialogs/select-source-dialog.h
@@ -13,7 +13,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/dialogs/send-comp.c b/calendar/gui/dialogs/send-comp.c
index a7d87c47f4..4eca089435 100644
--- a/calendar/gui/dialogs/send-comp.c
+++ b/calendar/gui/dialogs/send-comp.c
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/dialogs/send-comp.h b/calendar/gui/dialogs/send-comp.h
index 21b310947a..63644bd52a 100644
--- a/calendar/gui/dialogs/send-comp.h
+++ b/calendar/gui/dialogs/send-comp.h
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/dialogs/task-details-page.c b/calendar/gui/dialogs/task-details-page.c
index b6cbd3e7dc..95764cde48 100644
--- a/calendar/gui/dialogs/task-details-page.c
+++ b/calendar/gui/dialogs/task-details-page.c
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/dialogs/task-details-page.h b/calendar/gui/dialogs/task-details-page.h
index 9fbfcd4af6..585ab0ba23 100644
--- a/calendar/gui/dialogs/task-details-page.h
+++ b/calendar/gui/dialogs/task-details-page.h
@@ -13,7 +13,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/dialogs/task-editor.c b/calendar/gui/dialogs/task-editor.c
index 9ee3f02a17..8926ac720b 100644
--- a/calendar/gui/dialogs/task-editor.c
+++ b/calendar/gui/dialogs/task-editor.c
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/dialogs/task-editor.h b/calendar/gui/dialogs/task-editor.h
index 64180ec1fb..f026acae0c 100644
--- a/calendar/gui/dialogs/task-editor.h
+++ b/calendar/gui/dialogs/task-editor.h
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c
index bd568e2e6a..a3700f5bf7 100644
--- a/calendar/gui/dialogs/task-page.c
+++ b/calendar/gui/dialogs/task-page.c
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
@@ -1199,8 +1199,8 @@ enum {
};
static EPopupItem context_menu_items[] = {
- { E_POPUP_ITEM, "10.delete", N_("_Remove"), popup_delete_cb, NULL, GTK_STOCK_REMOVE, ATTENDEE_CAN_DELETE },
- { E_POPUP_ITEM, "15.add", N_("_Add "), popup_add_cb, NULL, GTK_STOCK_ADD, ATTENDEE_CAN_ADD },
+ { E_POPUP_ITEM, (gchar *) "10.delete", (gchar *) N_("_Remove"), popup_delete_cb, NULL, (gchar *) GTK_STOCK_REMOVE, ATTENDEE_CAN_DELETE },
+ { E_POPUP_ITEM, (gchar *) "15.add", (gchar *) N_("_Add "), popup_add_cb, NULL, (gchar *) GTK_STOCK_ADD, ATTENDEE_CAN_ADD },
};
static void
@@ -2196,7 +2196,7 @@ task_page_add_attendee (TaskPage *tpage, EMeetingAttendee *attendee)
g_return_if_fail (tpage != NULL);
g_return_if_fail (IS_TASK_PAGE (tpage));
-
+
priv = tpage->priv;
e_meeting_store_add_attendee (priv->model, attendee);
diff --git a/calendar/gui/dialogs/task-page.h b/calendar/gui/dialogs/task-page.h
index 77ec68fa1d..b8a49f8286 100644
--- a/calendar/gui/dialogs/task-page.h
+++ b/calendar/gui/dialogs/task-page.h
@@ -13,7 +13,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/e-alarm-list.c b/calendar/gui/e-alarm-list.c
index 795d0437a0..d60fab913e 100644
--- a/calendar/gui/e-alarm-list.c
+++ b/calendar/gui/e-alarm-list.c
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/e-alarm-list.h b/calendar/gui/e-alarm-list.h
index 6819994af1..6dfb1c6515 100644
--- a/calendar/gui/e-alarm-list.h
+++ b/calendar/gui/e-alarm-list.h
@@ -1,7 +1,7 @@
/*
*
* EAlarmList - list of calendar alarms with GtkTreeModel interface.
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
@@ -13,7 +13,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/e-attachment-handler-calendar.c b/calendar/gui/e-attachment-handler-calendar.c
index 5beb6e07d3..601d1f5e3c 100644
--- a/calendar/gui/e-attachment-handler-calendar.c
+++ b/calendar/gui/e-attachment-handler-calendar.c
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/calendar/gui/e-attachment-handler-calendar.h b/calendar/gui/e-attachment-handler-calendar.h
index b6788611f8..0b0ab737d4 100644
--- a/calendar/gui/e-attachment-handler-calendar.h
+++ b/calendar/gui/e-attachment-handler-calendar.h
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/calendar/gui/e-cal-component-preview.c b/calendar/gui/e-cal-component-preview.c
index dec1150ad1..a34fb77f7a 100644
--- a/calendar/gui/e-cal-component-preview.c
+++ b/calendar/gui/e-cal-component-preview.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/e-cal-component-preview.h b/calendar/gui/e-cal-component-preview.h
index dd04019e44..0397636d3e 100644
--- a/calendar/gui/e-cal-component-preview.h
+++ b/calendar/gui/e-cal-component-preview.h
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/e-cal-config.c b/calendar/gui/e-cal-config.c
index 18ceee76ca..fb1d6c28e7 100644
--- a/calendar/gui/e-cal-config.c
+++ b/calendar/gui/e-cal-config.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/e-cal-config.h b/calendar/gui/e-cal-config.h
index 8f27cbd2f2..15ad617a3d 100644
--- a/calendar/gui/e-cal-config.h
+++ b/calendar/gui/e-cal-config.h
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/e-cal-event.c b/calendar/gui/e-cal-event.c
index 3bccd137f7..d84a9f968b 100644
--- a/calendar/gui/e-cal-event.c
+++ b/calendar/gui/e-cal-event.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/e-cal-event.h b/calendar/gui/e-cal-event.h
index 9c2897c62f..4932157f37 100644
--- a/calendar/gui/e-cal-event.h
+++ b/calendar/gui/e-cal-event.h
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/e-cal-list-view-config.c b/calendar/gui/e-cal-list-view-config.c
index 6c930b1b61..543b5e8eb7 100644
--- a/calendar/gui/e-cal-list-view-config.c
+++ b/calendar/gui/e-cal-list-view-config.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/e-cal-list-view-config.h b/calendar/gui/e-cal-list-view-config.h
index 021262e357..270228bed6 100644
--- a/calendar/gui/e-cal-list-view-config.h
+++ b/calendar/gui/e-cal-list-view-config.h
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/e-cal-list-view.c b/calendar/gui/e-cal-list-view.c
index 2da55bb8d9..a3ece9d66f 100644
--- a/calendar/gui/e-cal-list-view.c
+++ b/calendar/gui/e-cal-list-view.c
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
* Authors:
* Hans Petter Jansson <hpj@ximian.com>
diff --git a/calendar/gui/e-cal-list-view.h b/calendar/gui/e-cal-list-view.h
index 606997c17d..656a58261b 100644
--- a/calendar/gui/e-cal-list-view.h
+++ b/calendar/gui/e-cal-list-view.h
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/e-cal-menu.c b/calendar/gui/e-cal-menu.c
index c6639b2816..b1f5ed91ca 100644
--- a/calendar/gui/e-cal-menu.c
+++ b/calendar/gui/e-cal-menu.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/e-cal-menu.h b/calendar/gui/e-cal-menu.h
index 9c37a6a9ae..5dda63f227 100644
--- a/calendar/gui/e-cal-menu.h
+++ b/calendar/gui/e-cal-menu.h
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/e-cal-model-calendar.c b/calendar/gui/e-cal-model-calendar.c
index 7f5d7b55c6..dac641ab4c 100644
--- a/calendar/gui/e-cal-model-calendar.c
+++ b/calendar/gui/e-cal-model-calendar.c
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
@@ -169,7 +169,7 @@ get_location (ECalModelComponent *comp_data)
if (prop)
return (void *) icalproperty_get_location (prop);
- return "";
+ return (void *) "";
}
static void *
@@ -209,7 +209,7 @@ ecmc_value_at (ETableModel *etm, int col, int row)
comp_data = e_cal_model_get_component_at (E_CAL_MODEL (model), row);
if (!comp_data)
- return "";
+ return (void *) "";
switch (col) {
case E_CAL_MODEL_CALENDAR_FIELD_DTEND :
@@ -220,7 +220,7 @@ ecmc_value_at (ETableModel *etm, int col, int row)
return get_transparency (comp_data);
}
- return "";
+ return (void *) "";
}
static void
diff --git a/calendar/gui/e-cal-model-calendar.h b/calendar/gui/e-cal-model-calendar.h
index ec0cb4c75c..abe536399f 100644
--- a/calendar/gui/e-cal-model-calendar.h
+++ b/calendar/gui/e-cal-model-calendar.h
@@ -13,7 +13,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/e-cal-model-memos.c b/calendar/gui/e-cal-model-memos.c
index 07df7c7460..815d8d7ee6 100644
--- a/calendar/gui/e-cal-model-memos.c
+++ b/calendar/gui/e-cal-model-memos.c
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
@@ -130,9 +130,9 @@ ecmm_value_at (ETableModel *etm, int col, int row)
comp_data = e_cal_model_get_component_at (E_CAL_MODEL (model), row);
if (!comp_data)
- return "";
+ return (void *) "";
- return "";
+ return (void *) "";
}
diff --git a/calendar/gui/e-cal-model-memos.h b/calendar/gui/e-cal-model-memos.h
index d02e51c9f7..f7a5d17091 100644
--- a/calendar/gui/e-cal-model-memos.h
+++ b/calendar/gui/e-cal-model-memos.h
@@ -13,7 +13,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/e-cal-model-tasks.c b/calendar/gui/e-cal-model-tasks.c
index e4d7304c25..d66555a636 100644
--- a/calendar/gui/e-cal-model-tasks.c
+++ b/calendar/gui/e-cal-model-tasks.c
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
@@ -289,7 +289,7 @@ get_due (ECalModelComponent *comp_data)
return comp_data->due;
}
-static char *
+static void *
get_geo (ECalModelComponent *comp_data)
{
icalproperty *prop;
@@ -307,7 +307,7 @@ get_geo (ECalModelComponent *comp_data)
return buf;
}
- return "";
+ return (void *) "";
}
static int
@@ -322,7 +322,7 @@ get_percent (ECalModelComponent *comp_data)
return 0;
}
-static char *
+static void *
get_priority (ECalModelComponent *comp_data)
{
icalproperty *prop;
@@ -331,7 +331,7 @@ get_priority (ECalModelComponent *comp_data)
if (prop)
return e_cal_util_priority_to_string (icalproperty_get_priority (prop));
- return "";
+ return (void *) "";
}
static gboolean
@@ -344,7 +344,7 @@ is_status_canceled (ECalModelComponent *comp_data)
return prop && icalproperty_get_status (prop) == ICAL_STATUS_CANCELLED;
}
-static char *
+static void *
get_status (ECalModelComponent *comp_data)
{
icalproperty *prop;
@@ -353,33 +353,33 @@ get_status (ECalModelComponent *comp_data)
if (prop) {
switch (icalproperty_get_status (prop)) {
case ICAL_STATUS_NONE:
- return "";
+ return (void *) "";
case ICAL_STATUS_NEEDSACTION:
- return _("Not Started");
+ return (void *) _("Not Started");
case ICAL_STATUS_INPROCESS:
- return _("In Progress");
+ return (void *) _("In Progress");
case ICAL_STATUS_COMPLETED:
- return _("Completed");
+ return (void *) _("Completed");
case ICAL_STATUS_CANCELLED:
- return _("Canceled");
+ return (void *) _("Canceled");
default:
- return "";
+ return (void *) "";
}
}
- return "";
+ return (void *) "";
}
-static char *
+static void *
get_url (ECalModelComponent *comp_data)
{
icalproperty *prop;
prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_URL_PROPERTY);
if (prop)
- return (char *) icalproperty_get_url (prop);
+ return (void *) icalproperty_get_url (prop);
- return "";
+ return (void *) "";
}
static gboolean
@@ -499,7 +499,7 @@ ecmt_value_at (ETableModel *etm, int col, int row)
comp_data = e_cal_model_get_component_at (E_CAL_MODEL (model), row);
if (!comp_data)
- return "";
+ return (void *) "";
switch (col) {
case E_CAL_MODEL_TASKS_FIELD_COMPLETED :
@@ -524,7 +524,7 @@ ecmt_value_at (ETableModel *etm, int col, int row)
return get_url (comp_data);
}
- return "";
+ return (void *) "";
}
static void
diff --git a/calendar/gui/e-cal-model-tasks.h b/calendar/gui/e-cal-model-tasks.h
index c71b737724..88b0d071e2 100644
--- a/calendar/gui/e-cal-model-tasks.h
+++ b/calendar/gui/e-cal-model-tasks.h
@@ -13,7 +13,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c
index c437b44dd7..f88418b6a8 100644
--- a/calendar/gui/e-cal-model.c
+++ b/calendar/gui/e-cal-model.c
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
@@ -317,16 +317,16 @@ ecm_row_count (ETableModel *etm)
return priv->objects->len;
}
-static char *
+static void *
get_categories (ECalModelComponent *comp_data)
{
icalproperty *prop;
prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_CATEGORIES_PROPERTY);
if (prop)
- return (char *) icalproperty_get_categories (prop);
+ return (void *) icalproperty_get_categories (prop);
- return "";
+ return (void *) "";
}
static char *
@@ -363,7 +363,7 @@ get_color (ECalModel *model, ECalModelComponent *comp_data)
return e_cal_model_get_color_for_component (model, comp_data);
}
-static char *
+static void *
get_description (ECalModelComponent *comp_data)
{
icalproperty *prop;
@@ -384,7 +384,7 @@ get_description (ECalModelComponent *comp_data)
return str->str;
}
- return "";
+ return (void *) "";
}
static ECellDateEditValue*
@@ -472,16 +472,16 @@ get_datetime_from_utc (ECalModel *model, ECalModelComponent *comp_data, icalprop
return res;
}
-static char *
+static void *
get_summary (ECalModelComponent *comp_data)
{
icalproperty *prop;
prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_SUMMARY_PROPERTY);
if (prop)
- return (char *) icalproperty_get_summary (prop);
+ return (void *) icalproperty_get_summary (prop);
- return "";
+ return (void *) "";
}
static char *
@@ -579,7 +579,7 @@ ecm_value_at (ETableModel *etm, int col, int row)
return get_uid (comp_data);
}
- return "";
+ return (void *) "";
}
static void
@@ -1522,7 +1522,7 @@ e_cal_view_objects_added_cb (ECalView *query, GList *objects, gpointer user_data
GSList *list = NULL;
pos = get_position_in_array (priv->objects, comp_data);
-
+
if (!g_ptr_array_remove (priv->objects, comp_data))
continue;
@@ -1576,7 +1576,7 @@ e_cal_view_objects_modified_cb (ECalView *query, GList *objects, gpointer user_d
/* re-add only the recurrence objects */
for (l = objects; l != NULL; l = g_list_next (l)) {
- if (!e_cal_util_component_is_instance (l->data) && e_cal_util_component_has_recurrences (l->data) && (priv->flags & E_CAL_MODEL_FLAGS_EXPAND_RECURRENCES))
+ if (!e_cal_util_component_is_instance (l->data) && e_cal_util_component_has_recurrences (l->data) && (priv->flags & E_CAL_MODEL_FLAGS_EXPAND_RECURRENCES))
list = g_list_prepend (list, l->data);
else {
int pos;
@@ -1639,7 +1639,7 @@ e_cal_view_objects_modified_cb (ECalView *query, GList *objects, gpointer user_d
e_cal_model_set_instance_times (comp_data, priv->zone);
pos = get_position_in_array (priv->objects, comp_data);
-
+
e_table_model_row_changed (E_TABLE_MODEL (model), pos);
}
}
@@ -1676,7 +1676,7 @@ e_cal_view_objects_removed_cb (ECalView *query, GList *ids, gpointer user_data)
g_slist_free (l);
g_object_unref (comp_data);
-
+
e_table_model_pre_change (E_TABLE_MODEL (model));
e_table_model_row_deleted (E_TABLE_MODEL (model), pos);
}
@@ -1739,15 +1739,15 @@ update_e_cal_view_for_client (ECalModel *model, ECalModelClient *client_data)
if (!client_data->do_query)
return;
-try_again:
+try_again:
if (!e_cal_get_query (client_data->client, priv->full_sexp, &client_data->query, &error)) {
if (error->code == E_CALENDAR_STATUS_BUSY && tries != 10) {
tries++;
/*TODO chose an optimal value */
g_usleep (500);
g_clear_error (&error);
- goto try_again;
- }
+ goto try_again;
+ }
g_warning (G_STRLOC ": Unable to get query, %s", error->message);
@@ -1873,7 +1873,7 @@ remove_client_objects (ECalModel *model, ECalModelClient *client_data)
GSList *l = NULL;
g_ptr_array_remove (model->priv->objects, comp_data);
-
+
l = g_slist_append (l, comp_data);
g_signal_emit (G_OBJECT (model), signals[COMPS_DELETED], 0, l);
@@ -2014,9 +2014,9 @@ redo_queries (ECalModel *model)
slist = get_objects_as_list (model);
g_ptr_array_set_size (priv->objects, 0);
g_signal_emit (G_OBJECT (model), signals[COMPS_DELETED], 0, slist);
-
+
e_table_model_rows_deleted (E_TABLE_MODEL (model), 0, len);
-
+
g_slist_foreach (slist, (GFunc)g_object_unref, NULL);
g_slist_free (slist);
@@ -2342,7 +2342,7 @@ e_cal_model_component_class_init (ECalModelComponentClass *klass)
static void
-e_cal_model_component_finalize (GObject *object)
+e_cal_model_component_finalize (GObject *object)
{
ECalModelComponent *comp_data = E_CAL_MODEL_COMPONENT(object);
@@ -2382,7 +2382,7 @@ e_cal_model_component_finalize (GObject *object)
g_free (comp_data->color);
comp_data->color = NULL;
}
-
+
if (G_OBJECT_CLASS (parent_class)->finalize)
(* G_OBJECT_CLASS (parent_class)->finalize) (object);
}
@@ -2440,7 +2440,7 @@ void
e_cal_model_free_component_data (ECalModelComponent *comp_data)
{
g_return_if_fail (comp_data != NULL);
-
+
g_object_unref (comp_data);
}
diff --git a/calendar/gui/e-cal-model.h b/calendar/gui/e-cal-model.h
index 6ec66a3554..4b266b6a5e 100644
--- a/calendar/gui/e-cal-model.h
+++ b/calendar/gui/e-cal-model.h
@@ -13,7 +13,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
@@ -81,7 +81,7 @@ struct _ECalModelComponent {
icalcomponent *icalcomp;
time_t instance_start;
time_t instance_end;
-
+
/* Private data used by ECalModelCalendar and ECalModelTasks */
/* keep these public to avoid many accessor functions */
ECellDateEditValue *dtstart;
diff --git a/calendar/gui/e-cal-popup.c b/calendar/gui/e-cal-popup.c
index 0292f16c71..76dcb94e19 100644
--- a/calendar/gui/e-cal-popup.c
+++ b/calendar/gui/e-cal-popup.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/e-cal-popup.h b/calendar/gui/e-cal-popup.h
index 185e9877f0..5c68b4829b 100644
--- a/calendar/gui/e-cal-popup.h
+++ b/calendar/gui/e-cal-popup.h
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/e-calendar-table-config.c b/calendar/gui/e-calendar-table-config.c
index 6e43886dbd..8b73056f51 100644
--- a/calendar/gui/e-calendar-table-config.c
+++ b/calendar/gui/e-calendar-table-config.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/e-calendar-table-config.h b/calendar/gui/e-calendar-table-config.h
index 8f2284ab40..36745064d1 100644
--- a/calendar/gui/e-calendar-table-config.h
+++ b/calendar/gui/e-calendar-table-config.h
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/e-calendar-table.c b/calendar/gui/e-calendar-table.c
index c96e763958..6e99cf58eb 100644
--- a/calendar/gui/e-calendar-table.c
+++ b/calendar/gui/e-calendar-table.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/e-calendar-table.h b/calendar/gui/e-calendar-table.h
index 5f83606827..4645be188b 100644
--- a/calendar/gui/e-calendar-table.h
+++ b/calendar/gui/e-calendar-table.h
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c
index cc51599440..975052ba17 100644
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
@@ -103,8 +103,8 @@ enum TargetType{
};
static GtkTargetEntry target_types[] = {
- { "text/x-calendar", 0, TARGET_TYPE_VCALENDAR },
- { "text/calendar", 0, TARGET_TYPE_VCALENDAR }
+ { (gchar *) "text/x-calendar", 0, TARGET_TYPE_VCALENDAR },
+ { (gchar *) "text/calendar", 0, TARGET_TYPE_VCALENDAR }
};
static guint n_target_types = G_N_ELEMENTS (target_types);
@@ -1755,52 +1755,52 @@ on_paste (EPopup *ep, EPopupItem *pitem, void *data)
}
static EPopupItem ecv_main_items [] = {
- { E_POPUP_ITEM, "00.new", N_("New _Appointment..."), on_new_appointment, NULL, "appointment-new", 0, 0 },
- { E_POPUP_ITEM, "10.newallday", N_("New All Day _Event"), on_new_event, NULL, "stock_new-24h-appointment", 0, 0},
- { E_POPUP_ITEM, "20.meeting", N_("New _Meeting"), on_new_meeting, NULL, "stock_new-meeting", 0, 0},
- { E_POPUP_ITEM, "30.task", N_("New _Task"), on_new_task, NULL, "stock_task", 0, 0},
+ { E_POPUP_ITEM, (gchar *) "00.new", (gchar *) N_("New _Appointment..."), on_new_appointment, NULL, (gchar *) "appointment-new", 0, 0 },
+ { E_POPUP_ITEM, (gchar *) "10.newallday", (gchar *) N_("New All Day _Event"), on_new_event, NULL, (gchar *) "stock_new-24h-appointment", 0, 0},
+ { E_POPUP_ITEM, (gchar *) "20.meeting", (gchar *) N_("New _Meeting"), on_new_meeting, NULL, (gchar *) "stock_new-meeting", 0, 0},
+ { E_POPUP_ITEM, (gchar *) "30.task", (gchar *) N_("New _Task"), on_new_task, NULL, (gchar *) "stock_task", 0, 0},
- { E_POPUP_BAR, "40."},
- { E_POPUP_ITEM, "40.print", N_("P_rint..."), on_print, NULL, GTK_STOCK_PRINT, 0, 0 },
+ { E_POPUP_BAR, (gchar *) "40."},
+ { E_POPUP_ITEM, (gchar *) "40.print", (gchar *) N_("P_rint..."), on_print, NULL, (gchar *) GTK_STOCK_PRINT, 0, 0 },
- { E_POPUP_BAR, "50." },
- { E_POPUP_ITEM, "50.paste", N_("_Paste"), on_paste, NULL, GTK_STOCK_PASTE, 0, E_CAL_POPUP_SELECT_EDITABLE },
+ { E_POPUP_BAR, (gchar *) "50." },
+ { E_POPUP_ITEM, (gchar *) "50.paste", (gchar *) N_("_Paste"), on_paste, NULL, (gchar *) GTK_STOCK_PASTE, 0, E_CAL_POPUP_SELECT_EDITABLE },
- { E_POPUP_BAR, "60." },
+ { E_POPUP_BAR, (gchar *) "60." },
/* FIXME: hook in this somehow */
- { E_POPUP_SUBMENU, "60.view", N_("_Current View") },
+ { E_POPUP_SUBMENU, (gchar *) "60.view", (gchar *) N_("_Current View") },
- { E_POPUP_ITEM, "61.today", N_("Select T_oday"), on_goto_today, NULL, "go-today" },
- { E_POPUP_ITEM, "62.todate", N_("_Select Date..."), on_goto_date, NULL, GTK_STOCK_JUMP_TO },
+ { E_POPUP_ITEM, (gchar *) "61.today", (gchar *) N_("Select T_oday"), on_goto_today, NULL, (gchar *) "go-today" },
+ { E_POPUP_ITEM, (gchar *) "62.todate", (gchar *) N_("_Select Date..."), on_goto_date, NULL, (gchar *) GTK_STOCK_JUMP_TO },
};
static EPopupItem ecv_child_items [] = {
- { E_POPUP_ITEM, "00.open", N_("_Open"), on_edit_appointment, NULL, GTK_STOCK_OPEN, 0, E_CAL_POPUP_SELECT_NOTEDITING },
- { E_POPUP_ITEM, "10.saveas", N_("_Save As..."), on_save_as, NULL, GTK_STOCK_SAVE_AS, 0, E_CAL_POPUP_SELECT_NOTEDITING },
- { E_POPUP_ITEM, "20.print", N_("Pri_nt..."), on_print_event, NULL, GTK_STOCK_PRINT, 0, E_CAL_POPUP_SELECT_NOTEDITING },
+ { E_POPUP_ITEM, (gchar *) "00.open", (gchar *) N_("_Open"), on_edit_appointment, NULL, (gchar *) GTK_STOCK_OPEN, 0, E_CAL_POPUP_SELECT_NOTEDITING },
+ { E_POPUP_ITEM, (gchar *) "10.saveas", (gchar *) N_("_Save As..."), on_save_as, NULL, (gchar *) GTK_STOCK_SAVE_AS, 0, E_CAL_POPUP_SELECT_NOTEDITING },
+ { E_POPUP_ITEM, (gchar *) "20.print", (gchar *) N_("Pri_nt..."), on_print_event, NULL, (gchar *) GTK_STOCK_PRINT, 0, E_CAL_POPUP_SELECT_NOTEDITING },
- { E_POPUP_BAR, "30." },
+ { E_POPUP_BAR, (gchar *) "30." },
- { E_POPUP_ITEM, "31.cut", N_("C_ut"), on_cut, NULL, GTK_STOCK_CUT, 0, E_CAL_POPUP_SELECT_NOTEDITING|E_CAL_POPUP_SELECT_EDITABLE|E_CAL_POPUP_SELECT_ORGANIZER },
- { E_POPUP_ITEM, "32.copy", N_("_Copy"), on_copy, NULL, GTK_STOCK_COPY, 0, E_CAL_POPUP_SELECT_NOTEDITING|E_CAL_POPUP_SELECT_ORGANIZER },
- { E_POPUP_ITEM, "33.paste", N_("_Paste"), on_paste, NULL, GTK_STOCK_PASTE, 0, E_CAL_POPUP_SELECT_EDITABLE },
+ { E_POPUP_ITEM, (gchar *) "31.cut", (gchar *) N_("C_ut"), on_cut, NULL, (gchar *) GTK_STOCK_CUT, 0, E_CAL_POPUP_SELECT_NOTEDITING|E_CAL_POPUP_SELECT_EDITABLE|E_CAL_POPUP_SELECT_ORGANIZER },
+ { E_POPUP_ITEM, (gchar *) "32.copy", (gchar *) N_("_Copy"), on_copy, NULL, (gchar *) GTK_STOCK_COPY, 0, E_CAL_POPUP_SELECT_NOTEDITING|E_CAL_POPUP_SELECT_ORGANIZER },
+ { E_POPUP_ITEM, (gchar *) "33.paste", (gchar *) N_("_Paste"), on_paste, NULL, (gchar *) GTK_STOCK_PASTE, 0, E_CAL_POPUP_SELECT_EDITABLE },
- { E_POPUP_BAR, "40." },
+ { E_POPUP_BAR, (gchar *) "40." },
- { E_POPUP_ITEM, "43.copyto", N_("Cop_y to Calendar..."), on_copy_to, NULL, NULL, 0, E_CAL_POPUP_SELECT_NOTEDITING },
- { E_POPUP_ITEM, "44.moveto", N_("Mo_ve to Calendar..."), on_move_to, NULL, NULL, 0, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_EDITABLE },
- { E_POPUP_ITEM, "45.delegate", N_("_Delegate Meeting..."), on_delegate, NULL, NULL, 0, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_EDITABLE | E_CAL_POPUP_SELECT_DELEGATABLE | E_CAL_POPUP_SELECT_MEETING},
- { E_POPUP_ITEM, "46.schedule", N_("_Schedule Meeting..."), on_meeting, NULL, NULL, 0, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_EDITABLE | E_CAL_POPUP_SELECT_NOTMEETING },
- { E_POPUP_ITEM, "47.forward", N_("_Forward as iCalendar..."), on_forward, NULL, "mail-forward", 0, E_CAL_POPUP_SELECT_NOTEDITING },
- { E_POPUP_ITEM, "48.reply", N_("_Reply"), on_reply, NULL, "mail-reply-sender", E_CAL_POPUP_SELECT_MEETING | E_CAL_POPUP_SELECT_NOSAVESCHEDULES, E_CAL_POPUP_SELECT_NOTEDITING },
- { E_POPUP_ITEM, "49.reply-all", N_("Reply to _All"), on_reply_all, NULL, "mail-reply-all", E_CAL_POPUP_SELECT_MEETING | E_CAL_POPUP_SELECT_NOSAVESCHEDULES, E_CAL_POPUP_SELECT_NOTEDITING },
+ { E_POPUP_ITEM, (gchar *) "43.copyto", (gchar *) N_("Cop_y to Calendar..."), on_copy_to, NULL, NULL, 0, E_CAL_POPUP_SELECT_NOTEDITING },
+ { E_POPUP_ITEM, (gchar *) "44.moveto", (gchar *) N_("Mo_ve to Calendar..."), on_move_to, NULL, NULL, 0, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_EDITABLE },
+ { E_POPUP_ITEM, (gchar *) "45.delegate", (gchar *) N_("_Delegate Meeting..."), on_delegate, NULL, NULL, 0, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_EDITABLE | E_CAL_POPUP_SELECT_DELEGATABLE | E_CAL_POPUP_SELECT_MEETING},
+ { E_POPUP_ITEM, (gchar *) "46.schedule", (gchar *) N_("_Schedule Meeting..."), on_meeting, NULL, NULL, 0, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_EDITABLE | E_CAL_POPUP_SELECT_NOTMEETING },
+ { E_POPUP_ITEM, (gchar *) "47.forward", (gchar *) N_("_Forward as iCalendar..."), on_forward, NULL, (gchar *) "mail-forward", 0, E_CAL_POPUP_SELECT_NOTEDITING },
+ { E_POPUP_ITEM, (gchar *) "48.reply", (gchar *) N_("_Reply"), on_reply, NULL, (gchar *) "mail-reply-sender", E_CAL_POPUP_SELECT_MEETING | E_CAL_POPUP_SELECT_NOSAVESCHEDULES, E_CAL_POPUP_SELECT_NOTEDITING },
+ { E_POPUP_ITEM, (gchar *) "49.reply-all", (gchar *) N_("Reply to _All"), on_reply_all, NULL, (gchar *) "mail-reply-all", E_CAL_POPUP_SELECT_MEETING | E_CAL_POPUP_SELECT_NOSAVESCHEDULES, E_CAL_POPUP_SELECT_NOTEDITING },
- { E_POPUP_BAR, "50." },
+ { E_POPUP_BAR, (gchar *) "50." },
- { E_POPUP_ITEM, "51.delete", N_("_Delete"), on_delete_appointment, NULL, GTK_STOCK_DELETE, E_CAL_POPUP_SELECT_NONRECURRING, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_EDITABLE },
- { E_POPUP_ITEM, "52.move", N_("Make this Occurrence _Movable"), on_unrecur_appointment, NULL, NULL, E_CAL_POPUP_SELECT_RECURRING | E_CAL_POPUP_SELECT_INSTANCE, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_EDITABLE },
- { E_POPUP_ITEM, "53.delete", N_("Delete this _Occurrence"), on_delete_occurrence, NULL, GTK_STOCK_DELETE, E_CAL_POPUP_SELECT_RECURRING, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_EDITABLE },
- { E_POPUP_ITEM, "54.delete", N_("Delete _All Occurrences"), on_delete_appointment, NULL, GTK_STOCK_DELETE, E_CAL_POPUP_SELECT_RECURRING, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_EDITABLE },
+ { E_POPUP_ITEM, (gchar *) "51.delete", (gchar *) N_("_Delete"), on_delete_appointment, NULL, (gchar *) GTK_STOCK_DELETE, E_CAL_POPUP_SELECT_NONRECURRING, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_EDITABLE },
+ { E_POPUP_ITEM, (gchar *) "52.move", (gchar *) N_("Make this Occurrence _Movable"), on_unrecur_appointment, NULL, NULL, E_CAL_POPUP_SELECT_RECURRING | E_CAL_POPUP_SELECT_INSTANCE, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_EDITABLE },
+ { E_POPUP_ITEM, (gchar *) "53.delete", (gchar *) N_("Delete this _Occurrence"), on_delete_occurrence, NULL, (gchar *) GTK_STOCK_DELETE, E_CAL_POPUP_SELECT_RECURRING, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_EDITABLE },
+ { E_POPUP_ITEM, (gchar *) "54.delete", (gchar *) N_("Delete _All Occurrences"), on_delete_appointment, NULL, (gchar *) GTK_STOCK_DELETE, E_CAL_POPUP_SELECT_RECURRING, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_EDITABLE },
};
void
@@ -1965,7 +1965,7 @@ e_calendar_view_new_appointment_full (ECalendarView *cal_view, gboolean all_day,
int hours, mins;
if (!time_div) /* Possible if your gconf values aren't so nice */
- time_div = 30;
+ time_div = 30;
if (time_day_begin (now) == time_day_begin (dtstart)) {
/* same day as today */
@@ -2564,11 +2564,11 @@ draw_curved_rectangle (cairo_t *cr, double x0, double y0,
cairo_close_path (cr);
}
-static void
+static void
error_response(GtkWidget *widget, gint response, void *data)
{
- if (response == GTK_RESPONSE_DELETE_EVENT)
+ if (response == GTK_RESPONSE_DELETE_EVENT)
gtk_widget_destroy(widget);
- else if (response == GTK_RESPONSE_OK)
+ else if (response == GTK_RESPONSE_OK)
gtk_widget_destroy(widget);
}
diff --git a/calendar/gui/e-calendar-view.h b/calendar/gui/e-calendar-view.h
index 5116c7c9c9..45a9573f04 100644
--- a/calendar/gui/e-calendar-view.h
+++ b/calendar/gui/e-calendar-view.h
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/e-cell-date-edit-config.c b/calendar/gui/e-cell-date-edit-config.c
index 5be8569bd3..eb6c27420b 100644
--- a/calendar/gui/e-cell-date-edit-config.c
+++ b/calendar/gui/e-cell-date-edit-config.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/e-cell-date-edit-config.h b/calendar/gui/e-cell-date-edit-config.h
index 36259354ed..9917378dd1 100644
--- a/calendar/gui/e-cell-date-edit-config.h
+++ b/calendar/gui/e-cell-date-edit-config.h
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/e-cell-date-edit-text.c b/calendar/gui/e-cell-date-edit-text.c
index b56d070559..8a43c628fc 100644
--- a/calendar/gui/e-cell-date-edit-text.c
+++ b/calendar/gui/e-cell-date-edit-text.c
@@ -13,7 +13,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
* Authors:
* Damon Chaplin <damon@ximian.com>
diff --git a/calendar/gui/e-cell-date-edit-text.h b/calendar/gui/e-cell-date-edit-text.h
index 9bbbfb0fc4..c353ecd278 100644
--- a/calendar/gui/e-cell-date-edit-text.h
+++ b/calendar/gui/e-cell-date-edit-text.h
@@ -13,7 +13,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
* Authors:
* Damon Chaplin <damon@ximian.com>
diff --git a/calendar/gui/e-comp-editor-registry.c b/calendar/gui/e-comp-editor-registry.c
index 31b46372b2..a4bed100b9 100644
--- a/calendar/gui/e-comp-editor-registry.c
+++ b/calendar/gui/e-comp-editor-registry.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/e-comp-editor-registry.h b/calendar/gui/e-comp-editor-registry.h
index 4f1444601c..5c2b4c4bc8 100644
--- a/calendar/gui/e-comp-editor-registry.h
+++ b/calendar/gui/e-comp-editor-registry.h
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/e-date-edit-config.c b/calendar/gui/e-date-edit-config.c
index d6fd6cf675..f93f2cf746 100644
--- a/calendar/gui/e-date-edit-config.c
+++ b/calendar/gui/e-date-edit-config.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/e-date-edit-config.h b/calendar/gui/e-date-edit-config.h
index c31899bb9e..4065ec74e7 100644
--- a/calendar/gui/e-date-edit-config.h
+++ b/calendar/gui/e-date-edit-config.h
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/e-date-time-list.c b/calendar/gui/e-date-time-list.c
index defd013fce..2aaab0df4d 100644
--- a/calendar/gui/e-date-time-list.c
+++ b/calendar/gui/e-date-time-list.c
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/e-date-time-list.h b/calendar/gui/e-date-time-list.h
index b4f6a01a10..fe5e1fdc11 100644
--- a/calendar/gui/e-date-time-list.h
+++ b/calendar/gui/e-date-time-list.h
@@ -13,7 +13,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/e-day-view-config.c b/calendar/gui/e-day-view-config.c
index 44156bf18e..edd02bb7ee 100644
--- a/calendar/gui/e-day-view-config.c
+++ b/calendar/gui/e-day-view-config.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/e-day-view-config.h b/calendar/gui/e-day-view-config.h
index 6ca1f2717e..25d208b432 100644
--- a/calendar/gui/e-day-view-config.h
+++ b/calendar/gui/e-day-view-config.h
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/e-day-view-layout.c b/calendar/gui/e-day-view-layout.c
index 949f4b7ce2..5b5536d391 100644
--- a/calendar/gui/e-day-view-layout.c
+++ b/calendar/gui/e-day-view-layout.c
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/e-day-view-layout.h b/calendar/gui/e-day-view-layout.h
index 4ad1de64bd..f3d431ca20 100644
--- a/calendar/gui/e-day-view-layout.h
+++ b/calendar/gui/e-day-view-layout.h
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/e-day-view-main-item.c b/calendar/gui/e-day-view-main-item.c
index 3718725c08..86b723903f 100644
--- a/calendar/gui/e-day-view-main-item.c
+++ b/calendar/gui/e-day-view-main-item.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
@@ -619,12 +619,15 @@ e_day_view_main_item_draw_day_event (EDayViewMainItem *dvmitem,
gdouble cc = 65535.0;
gdouble date_fraction;
gboolean short_event = FALSE, resize_flag = FALSE;
- gchar *end_resize_time, *end_resize_suffix;
+ const gchar *end_resize_suffix;
+ gchar *end_resize_time;
gint start_hour, start_display_hour, start_minute, start_suffix_width;
gint end_hour, end_display_hour, end_minute, end_suffix_width;
gboolean show_span = FALSE, format_time;
gint offset, interval;
- char *text = NULL, *start_suffix, *end_suffix;
+ const gchar *start_suffix;
+ const gchar *end_suffix;
+ char *text = NULL;
int scroll_flag = 0;
gint row_y;
GConfClient *gconf;
diff --git a/calendar/gui/e-day-view-main-item.h b/calendar/gui/e-day-view-main-item.h
index 650f139eb1..c9ce721341 100644
--- a/calendar/gui/e-day-view-main-item.h
+++ b/calendar/gui/e-day-view-main-item.h
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/e-day-view-time-item.c b/calendar/gui/e-day-view-time-item.c
index dc3c2deba5..f6ded1ec94 100644
--- a/calendar/gui/e-day-view-time-item.c
+++ b/calendar/gui/e-day-view-time-item.c
@@ -13,7 +13,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
* Authors:
* Damon Chaplin <damon@ximian.com>
@@ -284,7 +284,8 @@ edvti_draw_zone (GnomeCanvasItem *canvas_item,
EDayView *day_view;
EDayViewTimeItem *dvtmitem;
GtkStyle *style;
- gchar buffer[64], *suffix, *midnight_day = NULL, *midnight_month = NULL;
+ const gchar *suffix;
+ gchar buffer[64], *midnight_day = NULL, *midnight_month = NULL;
gint hour, display_hour, minute, row;
gint row_y, start_y, large_hour_y_offset, small_font_y_offset;
gint long_line_x1, long_line_x2, short_line_x1;
@@ -780,7 +781,7 @@ e_day_view_time_item_show_popup_menu (EDayViewTimeItem *dvtmitem,
item = gtk_menu_item_new_with_label ("---");
gtk_widget_set_sensitive (item, FALSE);
gtk_menu_shell_append (GTK_MENU_SHELL (submenu), item);
-
+
item = gtk_separator_menu_item_new ();
gtk_menu_shell_append (GTK_MENU_SHELL (submenu), item);
diff --git a/calendar/gui/e-day-view-time-item.h b/calendar/gui/e-day-view-time-item.h
index f3f2f64118..9d7bdcae9f 100644
--- a/calendar/gui/e-day-view-time-item.h
+++ b/calendar/gui/e-day-view-time-item.h
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/e-day-view-top-item.c b/calendar/gui/e-day-view-top-item.c
index 2f9bbf00fb..dd91133243 100644
--- a/calendar/gui/e-day-view-top-item.c
+++ b/calendar/gui/e-day-view-top-item.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
@@ -375,7 +375,7 @@ e_day_view_top_item_draw_long_event (EDayViewTopItem *dvtitem,
gchar buffer[16];
gint hour, display_hour, minute, offset, time_width, time_x;
gint min_end_time_x, suffix_width, max_icon_x;
- gchar *suffix;
+ const gchar *suffix;
gboolean draw_start_triangle, draw_end_triangle;
GdkRectangle clip_rect;
GSList *categories_list, *elem;
@@ -831,7 +831,7 @@ e_day_view_top_item_get_day_label (EDayView *day_view, gint day,
{
struct icaltimetype day_start_tt;
struct tm day_start = { 0 };
- gchar *format;
+ const gchar *format;
day_start_tt = icaltime_from_timet_with_zone (day_view->day_starts[day],
FALSE,
diff --git a/calendar/gui/e-day-view-top-item.h b/calendar/gui/e-day-view-top-item.h
index d45aa4e155..01a7c44842 100644
--- a/calendar/gui/e-day-view-top-item.h
+++ b/calendar/gui/e-day-view-top-item.h
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index 5dd940610b..0d7aa97ca5 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -13,7 +13,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
* Authors:
* Damon Chaplin <damon@ximian.com>
@@ -107,9 +107,9 @@ enum {
TARGET_VCALENDAR
};
static GtkTargetEntry target_table[] = {
- { "application/x-e-calendar-event", 0, TARGET_CALENDAR_EVENT },
- { "text/x-calendar", 0, TARGET_VCALENDAR },
- { "text/calendar", 0, TARGET_VCALENDAR }
+ { (gchar *) "application/x-e-calendar-event", 0, TARGET_CALENDAR_EVENT },
+ { (gchar *) "text/x-calendar", 0, TARGET_VCALENDAR },
+ { (gchar *) "text/calendar", 0, TARGET_VCALENDAR }
};
static guint n_targets = sizeof(target_table) / sizeof(target_table[0]);
@@ -682,10 +682,10 @@ timezone_changed_cb (ECalendarView *cal_view, icaltimezone *old_zone,
g_return_if_fail (E_IS_DAY_VIEW (day_view));
-
+
if (!cal_view->in_focus)
return;
-
+
/* If our time hasn't been set yet, just return. */
if (day_view->lower == 0 && day_view->upper == 0)
return;
@@ -1813,7 +1813,7 @@ set_text_as_bold (EDayViewEvent *event)
for (l = attendees; l; l = l->next) {
ECalComponentAttendee *attendee = l->data;
- if ((g_str_equal (itip_strip_mailto (attendee->value), address))
+ if ((g_str_equal (itip_strip_mailto (attendee->value), address))
|| (attendee->sentby && g_str_equal (itip_strip_mailto (attendee->sentby), address))) {
at = attendee;
break;
@@ -1821,7 +1821,7 @@ set_text_as_bold (EDayViewEvent *event)
}
/* The attendee has not yet accepted the meeting, display the summary as bolded.
- If the attendee is not present, it might have come through a mailing list.
+ If the attendee is not present, it might have come through a mailing list.
In that case, we never show the meeting as bold even if it is unaccepted. */
if (at && (at->status == ICAL_PARTSTAT_NEEDSACTION))
gnome_canvas_item_set (event->canvas_item, "bold", TRUE, NULL);
@@ -1839,9 +1839,9 @@ e_day_view_update_event_label (EDayView *day_view,
gint event_num)
{
EDayViewEvent *event;
- char *text;
gboolean free_text = FALSE, editing_event = FALSE, short_event = FALSE;
const gchar *summary;
+ char *text;
gint interval;
event = &g_array_index (day_view->events[day], EDayViewEvent, event_num);
@@ -1851,7 +1851,7 @@ e_day_view_update_event_label (EDayView *day_view,
return;
summary = icalcomponent_get_summary (event->comp_data->icalcomp);
- text = summary ? (char *) summary : "";
+ text = summary ? (char *) summary : (char *) "";
if (day_view->editing_event_day == day
&& day_view->editing_event_num == event_num)
@@ -3078,10 +3078,10 @@ e_day_view_on_time_canvas_scroll (GtkWidget *widget,
return TRUE;
default:
return FALSE;
- }
-}
-
-static gboolean
+ }
+}
+
+static gboolean
e_day_view_on_long_event_button_press (EDayView *day_view,
gint event_num,
GdkEventButton *event,
@@ -3251,7 +3251,7 @@ e_day_view_on_event_click (EDayView *day_view,
&& (pos == E_CALENDAR_VIEW_POS_TOP_EDGE
|| pos == E_CALENDAR_VIEW_POS_BOTTOM_EDGE)) {
gboolean read_only = FALSE;
-
+
if (event && (!event->is_editable || (e_cal_is_read_only (event->comp_data->client, &read_only, NULL) && read_only))) {
return;
}
@@ -4084,7 +4084,7 @@ e_day_view_finish_resize (EDayView *day_view)
if (day_view->resize_event_num == -1)
return;
-
+
day = day_view->resize_event_day;
event_num = day_view->resize_event_num;
event = &g_array_index (day_view->events[day], EDayViewEvent,
@@ -4140,7 +4140,7 @@ e_day_view_finish_resize (EDayView *day_view)
gtk_widget_queue_draw (day_view->top_canvas);
goto out;
}
-
+
if (mod == CALOBJ_MOD_ALL)
comp_util_sanitize_recurrence_master (comp, client);
@@ -4619,7 +4619,7 @@ e_day_view_reshape_day_events (EDayView *day_view,
if (day_view->last_edited_comp_string == NULL) {
g_free (current_comp_string);
continue;
- }
+ }
if (strncmp (current_comp_string, day_view->last_edited_comp_string,50) == 0) {
e_canvas_item_grab_focus (event->canvas_item, TRUE);
@@ -7553,7 +7553,7 @@ e_day_view_on_top_canvas_drag_data_received (GtkWidget *widget,
g_object_unref (comp);
return;
}
-
+
if (mod == CALOBJ_MOD_ALL)
comp_util_sanitize_recurrence_master (comp, client);
@@ -7856,7 +7856,7 @@ void
e_day_view_convert_time_to_display (EDayView *day_view,
gint hour,
gint *display_hour,
- gchar **suffix,
+ const gchar **suffix,
gint *suffix_width)
{
/* Calculate the actual hour number to display. For 12-hour
diff --git a/calendar/gui/e-day-view.h b/calendar/gui/e-day-view.h
index 1f518198fa..d22201e3f3 100644
--- a/calendar/gui/e-day-view.h
+++ b/calendar/gui/e-day-view.h
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
@@ -595,7 +595,7 @@ void e_day_view_stop_auto_scroll (EDayView *day_view);
void e_day_view_convert_time_to_display (EDayView *day_view,
gint hour,
gint *display_hour,
- gchar **suffix,
+ const gchar **suffix,
gint *suffix_width);
gint e_day_view_get_time_string_width (EDayView *day_view);
diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c
index 94fd234f27..501a3f37a9 100644
--- a/calendar/gui/e-itip-control.c
+++ b/calendar/gui/e-itip-control.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
@@ -741,7 +741,7 @@ static const char *dayname[] = {
N_("Saturday")
};
-static inline char *
+static const char *
get_dayname (struct icalrecurrencetype *r, int i)
{
enum icalrecurrencetype_weekday day;
@@ -882,7 +882,7 @@ write_recurrence_piece (EItipControl *itip, ECalComponent *comp,
dt.value = &r->until;
dt.tzid = icaltimezone_get_tzid ((icaltimezone *)r->until.zone);
- write_label_piece (itip, &dt, buffer,
+ write_label_piece (itip, &dt, buffer,
/* For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'*/
_(", ending on "), NULL, TRUE);
}
diff --git a/calendar/gui/e-itip-control.h b/calendar/gui/e-itip-control.h
index 642eccfe8d..38dce21bf1 100644
--- a/calendar/gui/e-itip-control.h
+++ b/calendar/gui/e-itip-control.h
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/e-meeting-attendee.c b/calendar/gui/e-meeting-attendee.c
index 413c83894a..0b5e147407 100644
--- a/calendar/gui/e-meeting-attendee.c
+++ b/calendar/gui/e-meeting-attendee.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
@@ -812,7 +812,6 @@ e_meeting_attendee_add_busy_period (EMeetingAttendee *ia,
g_return_val_if_fail (ia != NULL, FALSE);
g_return_val_if_fail (E_IS_MEETING_ATTENDEE (ia), FALSE);
- g_return_val_if_fail (busy_type >= 0, FALSE);
g_return_val_if_fail (busy_type < E_MEETING_FREE_BUSY_LAST, FALSE);
priv = ia->priv;
@@ -847,7 +846,7 @@ e_meeting_attendee_add_busy_period (EMeetingAttendee *ia,
/* If the busy_type is FREE, then there is no need to render it in UI */
if (busy_type == E_MEETING_FREE_BUSY_FREE)
- goto done;
+ goto done;
/* If the busy range is not set elsewhere, track it as best we can */
if (!priv->start_busy_range_set) {
diff --git a/calendar/gui/e-meeting-attendee.h b/calendar/gui/e-meeting-attendee.h
index a9f344484d..a259de6619 100644
--- a/calendar/gui/e-meeting-attendee.h
+++ b/calendar/gui/e-meeting-attendee.h
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/e-meeting-list-view.c b/calendar/gui/e-meeting-list-view.c
index aea75d4bd7..c903c97c23 100644
--- a/calendar/gui/e-meeting-list-view.c
+++ b/calendar/gui/e-meeting-list-view.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
@@ -64,11 +64,12 @@ static guint e_meeting_list_view_signals[LAST_SIGNAL] = { 0 };
static void name_selector_dialog_close_cb (ENameSelectorDialog *dialog, gint response, gpointer data);
-static char *sections[] = {N_("Chair Persons"),
- N_("Required Participants"),
- N_("Optional Participants"),
- N_("Resources"),
- NULL};
+static const gchar *sections[] = {N_("Chair Persons"),
+ N_("Required Participants"),
+ N_("Optional Participants"),
+ N_("Resources"),
+ NULL};
+
static icalparameter_role roles[] = {ICAL_ROLE_CHAIR,
ICAL_ROLE_REQPARTICIPANT,
ICAL_ROLE_OPTPARTICIPANT,
diff --git a/calendar/gui/e-meeting-list-view.h b/calendar/gui/e-meeting-list-view.h
index 12deb8a25d..50aad0c966 100644
--- a/calendar/gui/e-meeting-list-view.h
+++ b/calendar/gui/e-meeting-list-view.h
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/e-meeting-store.c b/calendar/gui/e-meeting-store.c
index d320198ec3..5e6270976a 100644
--- a/calendar/gui/e-meeting-store.c
+++ b/calendar/gui/e-meeting-store.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
@@ -1100,7 +1100,7 @@ process_free_busy (EMeetingStoreQueueData *qdata, char *text)
* In the returned newly allocated string.
*/
static gchar *
-replace_string (gchar *string, gchar *from_value, gchar *to_value)
+replace_string (gchar *string, const gchar *from_value, gchar *to_value)
{
gchar *replaced;
gchar **split_uri;
diff --git a/calendar/gui/e-meeting-store.h b/calendar/gui/e-meeting-store.h
index d20c1224f3..8a237fc34b 100644
--- a/calendar/gui/e-meeting-store.h
+++ b/calendar/gui/e-meeting-store.h
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/e-meeting-time-sel-item.c b/calendar/gui/e-meeting-time-sel-item.c
index 6687919a40..ae7eeb7937 100644
--- a/calendar/gui/e-meeting-time-sel-item.c
+++ b/calendar/gui/e-meeting-time-sel-item.c
@@ -15,7 +15,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
* Authors:
* Damon Chaplin <damon@gtk.org>
diff --git a/calendar/gui/e-meeting-time-sel-item.h b/calendar/gui/e-meeting-time-sel-item.h
index addb99e47a..310eb4c3a0 100644
--- a/calendar/gui/e-meeting-time-sel-item.h
+++ b/calendar/gui/e-meeting-time-sel-item.h
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/e-meeting-time-sel.c b/calendar/gui/e-meeting-time-sel.c
index 625d24d600..0fbcfb43ee 100644
--- a/calendar/gui/e-meeting-time-sel.c
+++ b/calendar/gui/e-meeting-time-sel.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/e-meeting-time-sel.h b/calendar/gui/e-meeting-time-sel.h
index deb91c2397..2cc82278f6 100644
--- a/calendar/gui/e-meeting-time-sel.h
+++ b/calendar/gui/e-meeting-time-sel.h
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/e-meeting-types.h b/calendar/gui/e-meeting-types.h
index 4f7d41eabf..bfcdfc5854 100644
--- a/calendar/gui/e-meeting-types.h
+++ b/calendar/gui/e-meeting-types.h
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/e-meeting-utils.c b/calendar/gui/e-meeting-utils.c
index 30fbaf143b..ac11881bf4 100644
--- a/calendar/gui/e-meeting-utils.c
+++ b/calendar/gui/e-meeting-utils.c
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/e-meeting-utils.h b/calendar/gui/e-meeting-utils.h
index d360471b20..c71efec135 100644
--- a/calendar/gui/e-meeting-utils.h
+++ b/calendar/gui/e-meeting-utils.h
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/e-memo-list-selector.c b/calendar/gui/e-memo-list-selector.c
index 9d3408944b..e31a9d4b6e 100644
--- a/calendar/gui/e-memo-list-selector.c
+++ b/calendar/gui/e-memo-list-selector.c
@@ -38,8 +38,8 @@ enum {
};
static GtkTargetEntry drag_types[] = {
- { "text/calendar", 0, DND_TARGET_TYPE_CALENDAR_LIST },
- { "text/x-calendar", 0, DND_TARGET_TYPE_CALENDAR_LIST }
+ { (gchar *) "text/calendar", 0, DND_TARGET_TYPE_CALENDAR_LIST },
+ { (gchar *) "text/x-calendar", 0, DND_TARGET_TYPE_CALENDAR_LIST }
};
static gpointer parent_class;
diff --git a/calendar/gui/e-memo-table-config.c b/calendar/gui/e-memo-table-config.c
index 21e6f036c1..d79dac7073 100644
--- a/calendar/gui/e-memo-table-config.c
+++ b/calendar/gui/e-memo-table-config.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/e-memo-table-config.h b/calendar/gui/e-memo-table-config.h
index 5242b5f7b7..68960d58dc 100644
--- a/calendar/gui/e-memo-table-config.h
+++ b/calendar/gui/e-memo-table-config.h
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/e-memo-table.c b/calendar/gui/e-memo-table.c
index 25e6005f40..7f14d4f794 100644
--- a/calendar/gui/e-memo-table.c
+++ b/calendar/gui/e-memo-table.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
@@ -88,8 +88,8 @@ enum {
};
static GtkTargetEntry target_types[] = {
- { "text/calendar", 0, TARGET_TYPE_VCALENDAR },
- { "text/x-calendar", 0, TARGET_TYPE_VCALENDAR }
+ { (gchar *) "text/calendar", 0, TARGET_TYPE_VCALENDAR },
+ { (gchar *) "text/x-calendar", 0, TARGET_TYPE_VCALENDAR }
};
static guint n_target_types = G_N_ELEMENTS (target_types);
diff --git a/calendar/gui/e-memo-table.h b/calendar/gui/e-memo-table.h
index 421a15352f..f3b02e0c04 100644
--- a/calendar/gui/e-memo-table.h
+++ b/calendar/gui/e-memo-table.h
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/e-memos.c b/calendar/gui/e-memos.c
index 04efd14dd1..cbfc13eb87 100644
--- a/calendar/gui/e-memos.c
+++ b/calendar/gui/e-memos.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/e-memos.h b/calendar/gui/e-memos.h
index b97cc0ac68..7b484830fd 100644
--- a/calendar/gui/e-memos.h
+++ b/calendar/gui/e-memos.h
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/e-mini-calendar-config.c b/calendar/gui/e-mini-calendar-config.c
index dfafc86fe6..ccd9a2078d 100644
--- a/calendar/gui/e-mini-calendar-config.c
+++ b/calendar/gui/e-mini-calendar-config.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/e-mini-calendar-config.h b/calendar/gui/e-mini-calendar-config.h
index 621d682e9d..60c88a1b9c 100644
--- a/calendar/gui/e-mini-calendar-config.h
+++ b/calendar/gui/e-mini-calendar-config.h
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/e-select-names-editable.c b/calendar/gui/e-select-names-editable.c
index dea9dd469d..c177c5231b 100644
--- a/calendar/gui/e-select-names-editable.c
+++ b/calendar/gui/e-select-names-editable.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
@@ -142,7 +142,7 @@ e_select_names_editable_get_emails (ESelectNamesEditable *esne)
for (l = destinations; l != NULL; l = l->next) {
destination = l->data;
- if (e_destination_is_evolution_list (destination)) {
+ if (e_destination_is_evolution_list (destination)) {
const GList *list_dests, *l;
list_dests = e_destination_list_get_dests (destination);
@@ -205,7 +205,7 @@ e_select_names_editable_get_names (ESelectNamesEditable *esne)
return NULL;
for (l = destinations; l != NULL; l = l->next) {
- destination = l->data;
+ destination = l->data;
if (e_destination_is_evolution_list (destination)) {
const GList *list_dests, *l;
@@ -217,7 +217,7 @@ e_select_names_editable_get_names (ESelectNamesEditable *esne)
result = g_list_append (result, g_strdup (e_destination_get_name (destination)));
}
}
-
+
g_list_free (destinations);
return result;
diff --git a/calendar/gui/e-select-names-editable.h b/calendar/gui/e-select-names-editable.h
index da961237e7..58b0ce3290 100644
--- a/calendar/gui/e-select-names-editable.h
+++ b/calendar/gui/e-select-names-editable.h
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/e-select-names-renderer.c b/calendar/gui/e-select-names-renderer.c
index 357eba4c5b..f1aa1ec45d 100644
--- a/calendar/gui/e-select-names-renderer.c
+++ b/calendar/gui/e-select-names-renderer.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
@@ -100,7 +100,7 @@ e_select_names_renderer_start_editing (GtkCellRenderer *cell, GdkEvent *event, G
g_signal_connect (editable, "editing_done", G_CALLBACK (e_select_names_renderer_editing_done), sn_cell);
- /* Removed focus-out-event. focus out event already listen by base class.
+ /* Removed focus-out-event. focus out event already listen by base class.
We don't need to listen for the focus out event any more */
sn_cell->priv->editable = g_object_ref (editable);
diff --git a/calendar/gui/e-select-names-renderer.h b/calendar/gui/e-select-names-renderer.h
index 21deec2cb5..6a2c4be102 100644
--- a/calendar/gui/e-select-names-renderer.h
+++ b/calendar/gui/e-select-names-renderer.h
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/e-task-list-selector.c b/calendar/gui/e-task-list-selector.c
index 910ab3f33f..fa6bd328d9 100644
--- a/calendar/gui/e-task-list-selector.c
+++ b/calendar/gui/e-task-list-selector.c
@@ -38,8 +38,8 @@ enum {
};
static GtkTargetEntry drag_types[] = {
- { "text/calendar", 0, DND_TARGET_TYPE_CALENDAR_LIST },
- { "text/x-calendar", 0, DND_TARGET_TYPE_CALENDAR_LIST }
+ { (gchar *) "text/calendar", 0, DND_TARGET_TYPE_CALENDAR_LIST },
+ { (gchar *) "text/x-calendar", 0, DND_TARGET_TYPE_CALENDAR_LIST }
};
static gpointer parent_class;
diff --git a/calendar/gui/e-tasks.c b/calendar/gui/e-tasks.c
index a314bc67d3..e70e90a29f 100644
--- a/calendar/gui/e-tasks.c
+++ b/calendar/gui/e-tasks.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/e-tasks.h b/calendar/gui/e-tasks.h
index 85444392d1..578da81625 100644
--- a/calendar/gui/e-tasks.h
+++ b/calendar/gui/e-tasks.h
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/e-timezone-entry.c b/calendar/gui/e-timezone-entry.c
index 391079a084..2be6548757 100644
--- a/calendar/gui/e-timezone-entry.c
+++ b/calendar/gui/e-timezone-entry.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/e-timezone-entry.h b/calendar/gui/e-timezone-entry.h
index f4780f0712..6c63fb8444 100644
--- a/calendar/gui/e-timezone-entry.h
+++ b/calendar/gui/e-timezone-entry.h
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/e-week-view-config.c b/calendar/gui/e-week-view-config.c
index 28224fb1db..8a0c0de984 100644
--- a/calendar/gui/e-week-view-config.c
+++ b/calendar/gui/e-week-view-config.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/e-week-view-config.h b/calendar/gui/e-week-view-config.h
index 32f32b0d75..e86e0fa968 100644
--- a/calendar/gui/e-week-view-config.h
+++ b/calendar/gui/e-week-view-config.h
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/e-week-view-event-item.c b/calendar/gui/e-week-view-event-item.c
index dcb3dd96f5..458d8e7e3c 100644
--- a/calendar/gui/e-week-view-event-item.c
+++ b/calendar/gui/e-week-view-event-item.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
@@ -636,7 +636,8 @@ e_week_view_draw_time (EWeekView *week_view,
GdkGC *gc;
gint hour_to_display, suffix_width;
gint time_y_normal_font, time_y_small_font;
- gchar buffer[128], *suffix;
+ const gchar *suffix;
+ gchar buffer[128];
PangoLayout *layout;
PangoFontDescription *small_font_desc;
diff --git a/calendar/gui/e-week-view-event-item.h b/calendar/gui/e-week-view-event-item.h
index 1e56a5d8a5..69d041f046 100644
--- a/calendar/gui/e-week-view-event-item.h
+++ b/calendar/gui/e-week-view-event-item.h
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/e-week-view-layout.c b/calendar/gui/e-week-view-layout.c
index 6599a3f7db..37a2706f2a 100644
--- a/calendar/gui/e-week-view-layout.c
+++ b/calendar/gui/e-week-view-layout.c
@@ -13,7 +13,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
* Authors:
* Damon Chaplin <damon@ximian.com>
diff --git a/calendar/gui/e-week-view-layout.h b/calendar/gui/e-week-view-layout.h
index d531435d11..0acd41d232 100644
--- a/calendar/gui/e-week-view-layout.h
+++ b/calendar/gui/e-week-view-layout.h
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/e-week-view-main-item.c b/calendar/gui/e-week-view-main-item.c
index 82dc43e944..c2095dc90b 100644
--- a/calendar/gui/e-week-view-main-item.c
+++ b/calendar/gui/e-week-view-main-item.c
@@ -13,7 +13,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
* Authors:
* Damon Chaplin <damon@ximian.com>
diff --git a/calendar/gui/e-week-view-main-item.h b/calendar/gui/e-week-view-main-item.h
index 818ba87d0f..34bdfa2e1f 100644
--- a/calendar/gui/e-week-view-main-item.h
+++ b/calendar/gui/e-week-view-main-item.h
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/e-week-view-titles-item.c b/calendar/gui/e-week-view-titles-item.c
index d483473810..e23f2a675f 100644
--- a/calendar/gui/e-week-view-titles-item.c
+++ b/calendar/gui/e-week-view-titles-item.c
@@ -13,7 +13,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
* Authors:
* Damon Chaplin <damon@ximian.com>
diff --git a/calendar/gui/e-week-view-titles-item.h b/calendar/gui/e-week-view-titles-item.h
index 89f33de6ef..0463c95cb0 100644
--- a/calendar/gui/e-week-view-titles-item.h
+++ b/calendar/gui/e-week-view-titles-item.h
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index 90ea61e901..f2082c5f11 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
@@ -368,7 +368,7 @@ static void
model_row_changed_cb (ETableModel *etm, int row, gpointer user_data)
{
EWeekView *week_view = E_WEEK_VIEW (user_data);
-
+
if (!E_CALENDAR_VIEW (week_view)->in_focus) {
return;
}
@@ -1932,7 +1932,7 @@ set_text_as_bold (EWeekViewEvent *event, EWeekViewEventSpan *span)
for (l = attendees; l; l = l->next) {
ECalComponentAttendee *attendee = l->data;
- if ((g_str_equal (itip_strip_mailto (attendee->value), address))
+ if ((g_str_equal (itip_strip_mailto (attendee->value), address))
|| (attendee->sentby && g_str_equal (itip_strip_mailto (attendee->sentby), address))) {
at = attendee;
break;
@@ -1943,7 +1943,7 @@ set_text_as_bold (EWeekViewEvent *event, EWeekViewEventSpan *span)
g_object_unref (comp);
/* The attendee has not yet accepted the meeting, display the summary as bolded.
- If the attendee is not present, it might have come through a mailing list.
+ If the attendee is not present, it might have come through a mailing list.
In that case, we never show the meeting as bold even if it is unaccepted. */
if (at && (at->status == ICAL_PARTSTAT_NEEDSACTION))
gnome_canvas_item_set (span->text_item, "bold", TRUE, NULL);
@@ -3631,7 +3631,7 @@ e_week_view_on_editing_stopped (EWeekView *week_view,
if (!recur_component_dialog (client, comp, &mod, NULL, FALSE)) {
goto out;
}
-
+
if (mod == CALOBJ_MOD_ALL)
comp_util_sanitize_recurrence_master (comp, client);
@@ -3885,16 +3885,16 @@ e_month_view_do_cursor_key_up (EWeekView *week_view)
/* no easy way to calculate new selection_start_day, therefore
* calculate a time_t value and set_selected_time_range */
time_t current;
- if (e_calendar_view_get_selected_time_range(&week_view->cal_view, &current, NULL)) {
- current = time_add_week(current,-1);
+ if (e_calendar_view_get_selected_time_range(&week_view->cal_view, &current, NULL)) {
+ current = time_add_week(current,-1);
e_week_view_scroll_a_step(week_view, E_CAL_VIEW_MOVE_PAGE_UP);
- e_week_view_set_selected_time_range_visible(week_view,current,current);
+ e_week_view_set_selected_time_range_visible(week_view,current,current);
}
} else {
week_view->selection_start_day -= 7;
week_view->selection_end_day = week_view->selection_start_day;
}
-
+
g_signal_emit_by_name (week_view, "selected_time_changed");
gtk_widget_queue_draw (week_view->main_canvas);
}
@@ -3914,13 +3914,13 @@ e_month_view_do_cursor_key_down (EWeekView *week_view)
if (e_calendar_view_get_selected_time_range(&week_view->cal_view, &current, NULL)) {
current = time_add_week(current,1);
e_week_view_scroll_a_step(week_view, E_CAL_VIEW_MOVE_PAGE_DOWN);
- e_week_view_set_selected_time_range_visible(week_view,current,current);
+ e_week_view_set_selected_time_range_visible(week_view,current,current);
}
} else {
week_view->selection_start_day += 7;
week_view->selection_end_day = week_view->selection_start_day;
}
-
+
g_signal_emit_by_name (week_view, "selected_time_changed");
gtk_widget_queue_draw (week_view->main_canvas);
}
@@ -3936,15 +3936,15 @@ e_month_view_do_cursor_key_left (EWeekView *week_view)
* calculate a time_t value and set_selected_time_range */
time_t current;
if (e_calendar_view_get_selected_time_range(&week_view->cal_view, &current, NULL)) {
- current = time_add_day(current,-1);
+ current = time_add_day(current,-1);
e_week_view_scroll_a_step(week_view, E_CAL_VIEW_MOVE_PAGE_UP);
- e_week_view_set_selected_time_range_visible(week_view,current,current);
+ e_week_view_set_selected_time_range_visible(week_view,current,current);
}
} else {
week_view->selection_start_day--;
week_view->selection_end_day = week_view->selection_start_day;
}
-
+
g_signal_emit_by_name (week_view, "selected_time_changed");
gtk_widget_queue_draw (week_view->main_canvas);
}
@@ -3964,13 +3964,13 @@ e_month_view_do_cursor_key_right (EWeekView *week_view)
if (e_calendar_view_get_selected_time_range(&week_view->cal_view, &current, NULL)) {
current = time_add_day(current,1);
e_week_view_scroll_a_step(week_view, E_CAL_VIEW_MOVE_PAGE_DOWN);
- e_week_view_set_selected_time_range_visible(week_view,current,current);
+ e_week_view_set_selected_time_range_visible(week_view,current,current);
}
} else {
week_view->selection_start_day++;
week_view->selection_end_day = week_view->selection_start_day;
}
-
+
g_signal_emit_by_name (week_view, "selected_time_changed");
gtk_widget_queue_draw (week_view->main_canvas);
}
@@ -4393,7 +4393,7 @@ void
e_week_view_convert_time_to_display (EWeekView *week_view,
gint hour,
gint *display_hour,
- gchar **suffix,
+ const gchar **suffix,
gint *suffix_width)
{
/* Calculate the actual hour number to display. For 12-hour
diff --git a/calendar/gui/e-week-view.h b/calendar/gui/e-week-view.h
index 2458efcdd1..0936a1e6dc 100644
--- a/calendar/gui/e-week-view.h
+++ b/calendar/gui/e-week-view.h
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
@@ -433,7 +433,7 @@ void e_week_view_show_popup_menu (EWeekView *week_view,
void e_week_view_convert_time_to_display (EWeekView *week_view,
gint hour,
gint *display_hour,
- gchar **suffix,
+ const gchar **suffix,
gint *suffix_width);
gint e_week_view_get_time_string_width (EWeekView *week_view);
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index 75a3764183..7e0043d12a 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
@@ -711,8 +711,8 @@ struct _date_query_msg {
GnomeCalendar *gcal;
};
-static void
-update_query_async (struct _date_query_msg *msg)
+static void
+update_query_async (struct _date_query_msg *msg)
{
GnomeCalendar *gcal = msg->gcal;
GnomeCalendarPrivate *priv;
@@ -721,7 +721,7 @@ update_query_async (struct _date_query_msg *msg)
GList *l;
priv = gcal->priv;
-
+
/* free the previous queries */
for (l = priv->dn_queries; l != NULL; l = l->next) {
old_query = l->data;
@@ -744,7 +744,7 @@ update_query_async (struct _date_query_msg *msg)
g_slice_free (struct _date_query_msg, msg);
return; /* No time range is set, so don't start a query */
}
-
+
/* create queries for each loaded client */
for (l = priv->clients_list; l != NULL; l = l->next) {
GError *error = NULL;
@@ -754,7 +754,7 @@ update_query_async (struct _date_query_msg *msg)
if (e_cal_get_load_state ((ECal *) l->data) != E_CAL_LOAD_LOADED)
continue;
-try_again:
+try_again:
old_query = NULL;
if (!e_cal_get_query ((ECal *) l->data, real_sexp, &old_query, &error)) {
/* If calendar is busy try again for 3 times. */
@@ -762,11 +762,11 @@ try_again:
tries++;
/*TODO chose an optimal value */
g_usleep (500);
-
+
g_clear_error (&error);
- goto try_again;
- }
-
+ goto try_again;
+ }
+
g_warning (G_STRLOC ": Could not create the query: %s ", error->message);
g_clear_error (&error);
@@ -798,7 +798,7 @@ try_again:
/* Restarts a query for the date navigator in the calendar */
static void
update_query (GnomeCalendar *gcal)
-{
+{
struct _date_query_msg *msg;
e_calendar_item_clear_marks (gcal->priv->date_navigator->calitem);
@@ -1612,7 +1612,7 @@ gnome_calendar_destroy (GtkObject *object)
priv->default_client = NULL;
for (i = 0; i < GNOME_CAL_LAST_VIEW; i++) {
- if (priv->configs[i])
+ if (priv->configs[i])
g_object_unref (priv->configs[i]);
priv->configs[i] = NULL;
}
@@ -2028,7 +2028,7 @@ display_view (GnomeCalendar *gcal, GnomeCalendarViewType view_type, gboolean gra
continue;
E_CALENDAR_VIEW (priv->views [i])->in_focus = FALSE;
}
-
+
if (grab_focus)
focus_current_view (gcal);
@@ -2080,7 +2080,7 @@ display_view_cb (GalViewInstance *view_instance, GalView *view, gpointer data)
display_view (gcal, view_type, TRUE);
-
+
if (!priv->base_view_time)
update_view_times (gcal, time (NULL));
else
@@ -2136,7 +2136,7 @@ add_mclient (ECalModel *model, ECal *client)
message_push ((Message *) msg);
}
-static void
+static void
non_intrusive_error_remove(GtkWidget *w, void *data)
{
g_hash_table_remove(non_intrusive_error_table, data);
@@ -2171,7 +2171,7 @@ add_mclient (ECalModel *model, ECal *client)
message_push ((Message *) msg);
}
-static void
+static void
non_intrusive_error_remove(GtkWidget *w, void *data)
{
g_hash_table_remove(non_intrusive_error_table, data);
@@ -2205,7 +2205,7 @@ client_cal_opened_cb (ECal *ecal, ECalendarStatus status, GnomeCalendar *gcal)
return;
case E_CALENDAR_STATUS_INVALID_SERVER_VERSION:
id = g_strdup ("calendar:server-version");
-
+
if (g_hash_table_lookup(non_intrusive_error_table, id)) {
/* We already have it */
g_message("Error occurred while existing dialog active:\n");
@@ -2307,7 +2307,7 @@ default_client_cal_opened_cb (ECal *ecal, ECalendarStatus status, GnomeCalendar
g_hash_table_remove (priv->clients, e_source_peek_uid (source));
/* FIXME Is there a better way to handle this? */
- if (priv->default_client)
+ if (priv->default_client)
g_object_unref (priv->default_client);
priv->default_client = NULL;
@@ -2377,7 +2377,7 @@ backend_error_cb (ECal *client, const char *message, gpointer data)
g_hash_table_insert (non_intrusive_error_table, id, g_object_ref(dialog));
g_signal_connect(GTK_WIDGET (dialog), "destroy", G_CALLBACK(non_intrusive_error_remove), id);
-
+
g_free (uristr);
}
@@ -2909,7 +2909,7 @@ gnome_calendar_on_date_navigator_selection_changed (ECalendarItem *calitem, Gnom
/* Make the views display things properly */
update_view_times (gcal, new_time);
set_view (gcal, view_type, TRUE);
-
+
gnome_calendar_notify_dates_shown_changed (gcal);
}
diff --git a/calendar/gui/gnome-cal.h b/calendar/gui/gnome-cal.h
index 92fe2cba70..a483260d2c 100644
--- a/calendar/gui/gnome-cal.h
+++ b/calendar/gui/gnome-cal.h
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
@@ -183,8 +183,6 @@ void gnome_calendar_edit_appointment (GnomeCalendar *gcal,
const char* comp_uid,
const char* comp_rid);
-GtkWidget * gnome_calendar_get_tag (GnomeCalendar *gcal);
-
void gnome_calendar_emit_user_created_signal (gpointer instance, GnomeCalendar *gcal, ECal *calendar);
G_END_DECLS
diff --git a/calendar/gui/goto.c b/calendar/gui/goto.c
index 3c0cfc7576..cb4bb12bfd 100644
--- a/calendar/gui/goto.c
+++ b/calendar/gui/goto.c
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/goto.h b/calendar/gui/goto.h
index c1f51632f8..3b774d2e89 100644
--- a/calendar/gui/goto.h
+++ b/calendar/gui/goto.h
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c
index c6aa0214ca..bf270de0af 100644
--- a/calendar/gui/itip-utils.c
+++ b/calendar/gui/itip-utils.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
@@ -39,7 +39,7 @@
#include <composer/e-msg-composer.h>
#include <camel/camel-mime-filter-tohtml.h>
-static gchar *itip_methods[] = {
+static const gchar *itip_methods[] = {
"PUBLISH",
"REQUEST",
"REPLY",
@@ -1370,7 +1370,7 @@ reply_to_calendar_comp (ECalComponentItipMethod method,
GString *body;
char *orig_from = NULL;
- char *description = NULL;
+ const char *description = NULL;
char *subject = NULL;
const char *location = NULL;
char *time = NULL;
@@ -1387,7 +1387,7 @@ reply_to_calendar_comp (ECalComponentItipMethod method,
if (text_list){
ECalComponentText text = *((ECalComponentText *)text_list->data);
if (text.value)
- description = (char *)text.value;
+ description = text.value;
else
description = "";
} else {
diff --git a/calendar/gui/itip-utils.h b/calendar/gui/itip-utils.h
index 9c8ffa1b60..8dce8266ab 100644
--- a/calendar/gui/itip-utils.h
+++ b/calendar/gui/itip-utils.h
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/calendar/gui/memos-component.c b/calendar/gui/memos-component.c
index 5e16d3118b..44bc1350d0 100644
--- a/calendar/gui/memos-component.c
+++ b/calendar/gui/memos-component.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/memos-component.h b/calendar/gui/memos-component.h
index 4841ef4c3e..f1ba3de204 100644
--- a/calendar/gui/memos-component.h
+++ b/calendar/gui/memos-component.h
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/misc.c b/calendar/gui/misc.c
index acae5d8e1e..ab657d8872 100644
--- a/calendar/gui/misc.c
+++ b/calendar/gui/misc.c
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/misc.h b/calendar/gui/misc.h
index 3e0fe04cb4..8c328652bb 100644
--- a/calendar/gui/misc.h
+++ b/calendar/gui/misc.h
@@ -13,7 +13,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/print.c b/calendar/gui/print.c
index 52320eff25..2a5cda4090 100644
--- a/calendar/gui/print.c
+++ b/calendar/gui/print.c
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
@@ -509,7 +509,7 @@ enum datefmt {
DATE_YEAR = 1 << 3
};
-static char *days[] = {
+static const gchar *days[] = {
N_("1st"), N_("2nd"), N_("3rd"), N_("4th"), N_("5th"),
N_("6th"), N_("7th"), N_("8th"), N_("9th"), N_("10th"),
N_("11th"), N_("12th"), N_("13th"), N_("14th"), N_("15th"),
@@ -592,8 +592,9 @@ print_month_small (GtkPrintContext *context, GnomeCalendar *gcal, time_t month,
double cell_top, cell_bottom, cell_left, cell_right, text_right;
/* Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday */
- char *daynames[] = { N_("Su"), N_("Mo"), N_("Tu"), N_("We"),
- N_("Th"), N_("Fr"), N_("Sa") };
+ const gchar *daynames[] =
+ { N_("Su"), N_("Mo"), N_("Tu"), N_("We"),
+ N_("Th"), N_("Fr"), N_("Sa") };
cairo_t *cr;
/* Print the title, e.g. 'June 2001', in the top 16% of the area. */
@@ -1062,22 +1063,23 @@ print_attendees (GtkPrintContext *context, PangoFontDescription *font, cairo_t *
return top;
}
-static char *
+static gchar *
get_summary_with_location (icalcomponent *icalcomp)
{
const gchar *summary, *location;
- char *text;
+ gchar *text;
g_return_val_if_fail (icalcomp != NULL, NULL);
summary = icalcomponent_get_summary (icalcomp);
- text = summary ? (char*) summary : "";
+ if (summary == NULL)
+ summary = "";
location = icalcomponent_get_location (icalcomp);
if (location && *location) {
- text = g_strdup_printf ("%s (%s)", text, location);
+ text = g_strdup_printf ("%s (%s)", summary, location);
} else {
- text = g_strdup (text);
+ text = g_strdup (summary);
}
return text;
@@ -1631,7 +1633,8 @@ print_week_view_background (GtkPrintContext *context,
struct tm tm;
int day, day_x, day_y, day_h;
double x1, x2, y1, y2, font_size, fillcolor;
- char *format_string, buffer[128];
+ const gchar *format_string;
+ gchar buffer[128];
cairo_t *cr;
font_size = get_font_size (font);
@@ -2278,7 +2281,11 @@ print_year_view (GtkPrintContext *context, GnomeCalendar *gcal, time_t date)
#endif
static void
-write_label_piece (time_t t, char *buffer, int size, char *stext, char *etext)
+write_label_piece (time_t t,
+ gchar *buffer,
+ gint size,
+ gchar *stext,
+ const gchar *etext)
{
icaltimezone *zone = calendar_config_get_icaltimezone ();
struct tm *tmp_tm;
diff --git a/calendar/gui/print.h b/calendar/gui/print.h
index 35454f9224..39482b33f2 100644
--- a/calendar/gui/print.h
+++ b/calendar/gui/print.h
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/tag-calendar.c b/calendar/gui/tag-calendar.c
index 9000060183..b57a50d6ce 100644
--- a/calendar/gui/tag-calendar.c
+++ b/calendar/gui/tag-calendar.c
@@ -13,7 +13,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/tag-calendar.h b/calendar/gui/tag-calendar.h
index 847aab12ea..e1d9fcf0b1 100644
--- a/calendar/gui/tag-calendar.h
+++ b/calendar/gui/tag-calendar.h
@@ -13,7 +13,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/tasks-component.c b/calendar/gui/tasks-component.c
index cb7326e7d6..533e071a7c 100644
--- a/calendar/gui/tasks-component.c
+++ b/calendar/gui/tasks-component.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
@@ -260,7 +260,7 @@ edit_task_list_cb (EPopup *ep, EPopupItem *pitem, void *data)
calendar_setup_edit_task_list (GTK_WINDOW (gtk_widget_get_toplevel(ep->target->widget)), selected_source);
}
-static void
+static void
set_offline_availability (EPopup *ep, EPopupItem *pitem, void *data, const char *value)
{
TasksComponentView *component_view = data;
@@ -276,27 +276,27 @@ set_offline_availability (EPopup *ep, EPopupItem *pitem, void *data, const char
static void
mark_no_offline_cb (EPopup *ep, EPopupItem *pitem, void *data)
{
- set_offline_availability (ep, pitem, data, "0");
+ set_offline_availability (ep, pitem, data, "0");
}
static void
mark_offline_cb (EPopup *ep, EPopupItem *pitem, void *data)
{
- set_offline_availability (ep, pitem, data, "1");
+ set_offline_availability (ep, pitem, data, "1");
}
static EPopupItem etc_source_popups[] = {
- { E_POPUP_ITEM, "10.new", N_("_New Task List"), new_task_list_cb, NULL, "stock_todo", 0, 0 },
- { E_POPUP_ITEM, "15.copy", N_("_Copy..."), copy_task_list_cb, NULL, "edit-copy", 0, E_CAL_POPUP_SOURCE_PRIMARY },
- { E_POPUP_ITEM, "18.rename", N_("_Rename..."), rename_task_list_cb, NULL, NULL, 0, E_CAL_POPUP_SOURCE_PRIMARY },
+ { E_POPUP_ITEM, (gchar *) "10.new", (gchar *) N_("_New Task List"), new_task_list_cb, NULL, (gchar *) "stock_todo", 0, 0 },
+ { E_POPUP_ITEM, (gchar *) "15.copy", (gchar *) N_("_Copy..."), copy_task_list_cb, NULL, (gchar *) "edit-copy", 0, E_CAL_POPUP_SOURCE_PRIMARY },
+ { E_POPUP_ITEM, (gchar *) "18.rename", (gchar *) N_("_Rename..."), rename_task_list_cb, NULL, NULL, 0, E_CAL_POPUP_SOURCE_PRIMARY },
- { E_POPUP_BAR, "20.bar" },
- { E_POPUP_ITEM, "20.delete", N_("_Delete"), delete_task_list_cb, NULL, "edit-delete", 0, E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY },
- { E_POPUP_ITEM, "30.mark_tasks_offline", N_("_Make available for offline use"), mark_offline_cb, NULL, "stock_disconnect", E_CAL_POPUP_SOURCE_OFFLINE, E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY|E_CAL_POPUP_SOURCE_OFFLINE },
- { E_POPUP_ITEM, "40.mark_tasks_no_offline", N_("_Do not make available for offline use"), mark_no_offline_cb, NULL, "stock_connect", E_CAL_POPUP_SOURCE_NO_OFFLINE, E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY|E_CAL_POPUP_SOURCE_NO_OFFLINE },
+ { E_POPUP_BAR, (gchar *) "20.bar" },
+ { E_POPUP_ITEM, (gchar *) "20.delete", (gchar *) N_("_Delete"), delete_task_list_cb, NULL, (gchar *) "edit-delete", 0, E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY },
+ { E_POPUP_ITEM, (gchar *) "30.mark_tasks_offline", (gchar *) N_("_Make available for offline use"), mark_offline_cb, NULL, (gchar *) "stock_disconnect", E_CAL_POPUP_SOURCE_OFFLINE, E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY|E_CAL_POPUP_SOURCE_OFFLINE },
+ { E_POPUP_ITEM, (gchar *) "40.mark_tasks_no_offline", (gchar *) N_("_Do not make available for offline use"), mark_no_offline_cb, NULL, (gchar *) "stock_connect", E_CAL_POPUP_SOURCE_NO_OFFLINE, E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY|E_CAL_POPUP_SOURCE_NO_OFFLINE },
- { E_POPUP_BAR, "99.bar" },
- { E_POPUP_ITEM, "99.properties", N_("_Properties"), edit_task_list_cb, NULL, "document-properties", 0, E_CAL_POPUP_SOURCE_PRIMARY },
+ { E_POPUP_BAR, (gchar *) "99.bar" },
+ { E_POPUP_ITEM, (gchar *) "99.properties", (gchar *) N_("_Properties"), edit_task_list_cb, NULL, (gchar *) "document-properties", 0, E_CAL_POPUP_SOURCE_PRIMARY },
};
static void
diff --git a/calendar/gui/tasks-component.h b/calendar/gui/tasks-component.h
index fc96c5a2a8..aae49fc287 100644
--- a/calendar/gui/tasks-component.h
+++ b/calendar/gui/tasks-component.h
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/tasks-control.c b/calendar/gui/tasks-control.c
index 62a283f370..1be68ac35e 100644
--- a/calendar/gui/tasks-control.c
+++ b/calendar/gui/tasks-control.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
@@ -71,7 +71,7 @@ static void tasks_control_forward_cmd (BonoboUIComponent *uic,
const char *path);
struct _tasks_sensitize_item {
- char *command;
+ const gchar *command;
guint32 enable;
};
@@ -306,7 +306,7 @@ confirm_purge (ETasks *tasks)
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_WARNING,
GTK_BUTTONS_YES_NO,
- "%s",
+ "%s",
_("This operation will permanently erase all tasks marked as completed. If you continue, you will not be able to recover these tasks.\n\nReally erase these tasks?"));
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_NO);
diff --git a/calendar/gui/tasks-control.h b/calendar/gui/tasks-control.h
index a41783fe9a..9dd3a3946d 100644
--- a/calendar/gui/tasks-control.h
+++ b/calendar/gui/tasks-control.h
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/calendar/gui/weekday-picker.c b/calendar/gui/weekday-picker.c
index 613e62c1ca..56a7386d4b 100644
--- a/calendar/gui/weekday-picker.c
+++ b/calendar/gui/weekday-picker.c