~ubuntu-branches/ubuntu/precise/empathy/precise-proposed-201205180810 : revision 148

1

commit 2808af945a56884d7d5859d79033005bc35481e3

2

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

3

Date: Tue Feb 1 14:51:06 2011 +0000

4

5

Fix distcheck

6

7

extensions/Makefile.am | 3 +++

8

1 files changed, 3 insertions(+), 0 deletions(-)

9

10

commit b2e345182e9b50e3742af6acc9aefdf73d986188

11

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

12

Date: Thu Mar 24 16:06:12 2011 +0100

13

14

prepare 2.34.0

15

16

NEWS | 37 +++++++++++++++++++++++++++++++++++++

17

configure.ac | 6 +++---

18

2 files changed, 40 insertions(+), 3 deletions(-)

19

20

commit 2195753a72fcdcfc0e3a51de67a00fe04a00ecb5

21

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

22

Date: Thu Mar 24 10:41:14 2011 +0100

23

24

Calendar widget should be disabled if no contact selected (#645582)

25

26

libempathy-gtk/empathy-log-window.c | 9 +++++++++

27

libempathy-gtk/empathy-log-window.ui | 1 +

28

2 files changed, 10 insertions(+), 0 deletions(-)

29

30

commit 66303ff03c1d7801fbf7fee7ca8fa4c2a3f6639a

31

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

32

Date: Thu Mar 24 14:20:37 2011 +0000

33

34

Include yell before anything else

35

36

Since we want to build against our copy of yell. Otherwise if

37

you have yell installed in /usr, it'll be picked from there as

38

we get -I/usr/include/telepathy-1.0 and telepathy-yell is installed

39

as telepathy-yell/telepathy-yell.h in that directory.

40

41

src/Makefile.am | 2 +-

42

1 files changed, 1 insertions(+), 1 deletions(-)

43

44

commit f8cf443194192cce76a780a04d7736fea8a87c77

1

commit cedddaf2017b184abd2146f7cdb46c285ef5ee0c

2

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

3

Date: Mon May 9 16:40:08 2011 +0200

4

5

prepare 3.1.1

6

7

NEWS | 88

8

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

9

configure.ac | 6 ++--

10

2 files changed, 91 insertions(+), 3 deletions(-)

11

12

commit ab93e6903be924419add3dc703bf5da9bfca63b3

13

Merge: 0b5aebd 72785d7

14

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

15

Date: Mon May 9 16:21:38 2011 +0200

16

17

Merge remote-tracking branch

18

'glassrose/save-chatrooms.xml-only-when-needed'

19

20

commit 72785d7ab576618ccc2847b8d51d1f4c9ff19241

21

Author: Chandni Verma <chandniverma2112@gmail.com>

22

Date: Sun May 8 00:44:43 2011 +0530

23

24

Save changes to chatrooms.xml configuration file only when needed.

25

26

Changes will be written to the file only when changes are made to a

27

chatroom property that is listed in the file.

28

29

Fixes room-list flicker:

30

https://bugzilla.gnome.org/show_bug.cgi?id=642087

31

32

libempathy/empathy-chatroom-manager.c | 11 ++++++++++-

33

1 files changed, 10 insertions(+), 1 deletions(-)

34

35

commit 0b5aebd734f0a4759d2c8c5438830c372638fb70

36

Author: Fran Diéguez <fran.dieguez@mabishu.com>

37

Date: Mon May 9 12:59:27 2011 +0200

38

39

Updated Galician translations

40

41

po/gl.po | 698

42

++++++++++++++++++++++++++++++++++++--------------------------

43

1 files changed, 408 insertions(+), 290 deletions(-)

44

45

commit 514c6109204c180fa7fc79581058f6dc8156a99e

46

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

47

Date: Mon May 9 10:18:41 2011 +0200

48

49

add translators comment explaining the insufficient balance error

50

(#649735)

51

52

libempathy-gtk/empathy-chat.c | 2 ++

53

1 files changed, 2 insertions(+), 0 deletions(-)

54

55

commit 7f6a15ff9f7eff608e4208ff99725eb8cd543d66

56

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

57

Date: Mon May 9 10:11:18 2011 +0200

58

59

org.gnome.Empathy.gschema.xml: update summary and description of

60

show-balance-in-roster

61

62

We are generally using "contact list" instead of "roster". (#649734)

63

64

data/org.gnome.Empathy.gschema.xml.in | 4 ++--

65

1 files changed, 2 insertions(+), 2 deletions(-)

66

67

commit 7f4901b8677aeb0235b99acf2130eb5407f93b4d

68

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

69

Date: Fri May 6 10:38:23 2011 +0200

70

71

add a translation comment explaining the 'Provide' string (#649492)

72

73

src/empathy-notifications-approver.c | 3 +++

74

1 files changed, 3 insertions(+), 0 deletions(-)

75

76

commit 9cd96631aadd370af208741905d7b90eac93907c

77

Author: Yaron Shahrabani <sh.yaron@gmail.com>

78

Date: Mon May 9 09:21:42 2011 +0300

79

80

Updated Hebrew translation.

81

82

po/he.po | 873

83

+++++++++++++++++++++++++++++++++++---------------------------

84

1 files changed, 500 insertions(+), 373 deletions(-)

85

86

commit ebd45e55f663e1c1e7bbadce2c910c0a8063e622

87

Author: Jorge González <jorgegonz@svn.gnome.org>

88

Date: Sun May 8 17:08:55 2011 +0200

89

90

Updated Spanish translation

91

92

po/es.po | 569

93

+++++++++++++++++++++++++++++++++-----------------------------

94

1 files changed, 304 insertions(+), 265 deletions(-)

95

96

commit 05715d914645b0415c77812b94f7a1b123857c8c

97

Author: Daniel Mustieles <daniel.mustieles@gmail.com>

98

Date: Thu May 5 19:43:18 2011 +0200

99

100

Updated Spanish translation

101

102

po/es.po | 167

103

++++++++++++++++++++++++++++++++++----------------------------

104

1 files changed, 92 insertions(+), 75 deletions(-)

105

106

commit 3aca984088136430b8f54b16e5f1bed1e891c6d1

107

Author: Gabor Kelemen <kelemeng@gnome.hu>

108

Date: Wed May 4 16:35:32 2011 +0200

109

110

Include gi18n-lib.h in library sources, not gi18n.h.

111

112

Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=649379

113

114

libempathy-gtk/empathy-contact-blocking-dialog.c | 3 ++-

115

libempathy-gtk/empathy-contact-search-dialog.c | 3 ++-

116

libempathy-gtk/empathy-contact-selector.c | 2 +-

117

libempathy-gtk/empathy-location-manager.c | 2 +-

118

libempathy-gtk/empathy-theme-adium.c | 2 +-

119

5 files changed, 7 insertions(+), 5 deletions(-)

120

121

commit 9a17d44fc225a0e4a26d702366236622830c301a

122

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

123

Date: Thu May 5 11:27:28 2011 +0200

124

125

ignore return value of main_window_setup_balance_create_widget()

126

127

fix unused-but-set-variable warnings with gcc 4.6. Thanks to Marc

128

Plano-Lesay

129

for reporting.

130

131

src/empathy-main-window.c | 3 +--

132

1 files changed, 1 insertions(+), 2 deletions(-)

133

134

commit 05c9e6264afc59d72d824f19ca18f902dbd61cae

135

Author: Xavier Claessens <xclaesse@gmail.com>

136

Date: Wed May 4 18:31:53 2011 +0200

137

138

Adium: Fix wrong html fallbacks

139

140

Fallbacks are actually more complex than I though. This is exactly

141

how adium does

142

the fallbacks

143

144

libempathy-gtk/empathy-theme-adium.c | 339

145

+++++++++++++---------------------

146

1 files changed, 131 insertions(+), 208 deletions(-)

147

148

commit cf10975ad04b36d408ae1615de570b5b0df52cf9

149

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

150

Date: Thu May 5 10:31:04 2011 +0200

151

152

Depends on tp-glib 0.14.3

153

154

We need it for TP_ERROR_STR_INSUFFICIENT_BALANCE.

155

156

configure.ac | 2 +-

157

1 files changed, 1 insertions(+), 1 deletions(-)

158

159

commit 822b3b6e0a5d781cbe0ff024eed6c8b8dace6526

160

Merge: c698741 90d1301

161

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

162

Date: Thu May 5 18:30:33 2011 +1000

163

164

Merge branch 'balance-rebase'

165

166

commit c698741b1825e306de447fa09624f4a93f067374

167

Merge: 981d175 0d44943

168

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

169

Date: Thu May 5 18:22:31 2011 +1000

170

171

Merge branch 'delivery-reports-rebase'

172

173

commit 981d17576bb3451bd4ac79cbd2de079fb64d260b

174

Author: Marc Plano-Lesay <marc.planolesay@gmail.com>

175

Date: Wed May 4 14:35:07 2011 +0200

176

177

fix unused-but-set-variable warnings

178

179

libempathy-gtk/empathy-account-widget.c | 3 ---

180

libempathy-gtk/empathy-contact-widget.c | 14 ++------------

181

src/empathy-accounts-dialog.c | 20 --------------------

182

src/empathy-auth-client.c | 3 +--

183

src/empathy-chat-window.c | 9 ---------

184

src/empathy-event-manager.c | 10 ----------

185

src/empathy-ft-manager.c | 3 ---

186

src/empathy-new-chatroom-dialog.c | 7 -------

187

src/empathy-preferences.c | 6 +-----

188

src/ev-sidebar.c | 2 --

189

tests/interactive/contact-manager.c | 3 +--

190

11 files changed, 5 insertions(+), 75 deletions(-)

191

192

commit 9a1a49ed9ddf5a3d1da99eabca27882705688545

193

Merge: 77fab8e 0fda594

194

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

195

Date: Thu May 5 17:37:40 2011 +1000

196

197

Merge branch 'sms-support-rebase'

198

199

commit 0d44943efc4f3f727861387ba89f57238aa92577

200

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

201

Date: Wed May 4 10:05:16 2011 +1000

202

203

Add a tooltip to the sending message spinner

204

205

src/empathy-chat-window.c | 17 +++++++++++------

206

1 files changed, 11 insertions(+), 6 deletions(-)

207

208

commit 24e6b10a9c1795964f0e6e80e074eff24344f64b

209

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

210

Date: Wed May 4 09:58:18 2011 +1000

211

212

Fix broken logic that caused delivery report spinner to spin forever

213

214

libempathy/empathy-tp-chat.c | 9 +++++----

215

1 files changed, 5 insertions(+), 4 deletions(-)

216

217

commit 3e22736f0211a0bb668218243bc4764435f62a58

218

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

219

Date: Thu Apr 28 15:28:35 2011 +1000

220

221

[chat-window] add a spinner to the window tab for when messages are

222

being sent

223

224

src/empathy-chat-window.c | 33 +++++++++++++++++++++++++++++++++

225

1 files changed, 33 insertions(+), 0 deletions(-)

226

227

commit 4f37d474725cd006eb627e10349e0361ce9a7b29

228

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

229

Date: Thu Apr 28 15:28:08 2011 +1000

230

231

[chat] expose this property in EmpathyChat

232

233

libempathy-gtk/empathy-chat.c | 44

234

+++++++++++++++++++++++++++++++++++++++++

235

libempathy-gtk/empathy-chat.h | 2 +

236

2 files changed, 46 insertions(+), 0 deletions(-)

237

238

commit 1f46d6c5aa319ea7b81c29dcd08a0c7eb40d5789

239

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

240

Date: Wed Apr 27 14:10:50 2011 +1000

241

242

[tp-chat] add a counter for the number of pending messages

243

244

Requires delivery reports to include delivery-token.

245

246

libempathy/empathy-tp-chat.c | 81

247

++++++++++++++++++++++++++++++++++++++++--

248

libempathy/empathy-tp-chat.h | 6 +++

249

2 files changed, 84 insertions(+), 3 deletions(-)

250

251

commit b0aaacf05d0b46ca53f3b6b9f2dd0565cea0f5d0

252

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

253

Date: Thu Apr 21 15:03:52 2011 +1000

254

255

Use dbus-error from delivery report for better errors

256

257

libempathy-gtk/empathy-chat.c | 52

258

++++++++++++++++++++++++----------------

259

libempathy/empathy-tp-chat.c | 12 ++++++---

260

2 files changed, 39 insertions(+), 25 deletions(-)

261

262

commit 90d1301153a574f9d3ac986783efa6b96ebb2f57

263

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

264

Date: Tue May 3 17:36:12 2011 +1000

265

266

Change the menu to say "Credit Balance"

267

268

src/empathy-main-window.ui | 2 +-

269

1 files changed, 1 insertions(+), 1 deletions(-)

270

271

commit 8b7ca3f8fc98f353c439841efbf6951e86ad45a7

272

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

273

Date: Tue May 3 17:33:34 2011 +1000

274

275

Update balance view in roster per feedback

276

277

src/empathy-main-window.c | 39 +++++++++++++++++++++++++--------------

278

1 files changed, 25 insertions(+), 14 deletions(-)

279

280

commit 49af530a5bfa17173e28a7b706c5e68117c2cd21

281

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

282

Date: Tue May 3 17:22:30 2011 +1000

283

284

Change menu string to "Top up My Account ($1.23)..."

285

286

src/empathy-main-window.c | 22 ++++++++++++++--------

287

1 files changed, 14 insertions(+), 8 deletions(-)

288

289

commit ceeeac4a2c95f89e4ed4042e9e0795786c94fb82

290

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

291

Date: Thu Apr 21 13:12:15 2011 +1000

292

293

Update formatting for NOK

294

295

libempathy/empathy-utils.c | 2 +-

296

1 files changed, 1 insertions(+), 1 deletions(-)

297

298

commit 0ba165de9aecc194985de7c6c938b69360e9c3a3

299

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

300

Date: Tue Apr 19 08:32:31 2011 +1000

301

302

The icon needs to be set as "icon-name" not "stock-id"

303

304

src/empathy-main-window.c | 4 +++-

305

1 files changed, 3 insertions(+), 1 deletions(-)

306

307

commit a3efb63e796880a945daa81be60c77df8a610f95

308

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

309

Date: Mon Apr 18 13:09:19 2011 +1000

310

311

Fill out empathy_format_currency() with more currencies

312

313

libempathy/empathy-utils.c | 17 +++++++++--------

314

1 files changed, 9 insertions(+), 8 deletions(-)

315

316

commit f8c157d0188f3c8244b74d4d07fc4f85b7ef1079

317

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

318

Date: Mon Apr 18 11:12:47 2011 +1000

319

320

Use pointless g* types for consistency

321

322

libempathy/empathy-utils.c | 8 ++++----

323

libempathy/empathy-utils.h | 2 +-

324

2 files changed, 5 insertions(+), 5 deletions(-)

325

326

commit d4597e973a5eef6389f0900c3cea91d73e7c9873

327

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

328

Date: Mon Apr 18 10:51:34 2011 +1000

329

330

'spacing' is an object property, not a child property of the packing

331

332

src/empathy-main-window.ui | 2 +-

333

1 files changed, 1 insertions(+), 1 deletions(-)

334

335

commit 4786fdc5f4424c88c7fcaad5357f42a27c4e24ad

336

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

337

Date: Fri Apr 15 16:39:40 2011 +1000

338

339

Add a menu item to choose whether to show account balances in

340

the roster

341

342

data/org.gnome.Empathy.gschema.xml.in | 5 +++++

343

src/empathy-main-window.c | 30

344

+++++++++++++++++++++++++-----

345

src/empathy-main-window.ui | 8 ++++++++

346

3 files changed, 38 insertions(+), 5 deletions(-)

347

348

commit 1038e0350d5cbe5b70f8d618b1a13d6717da8d7c

349

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

350

Date: Fri Apr 15 16:18:33 2011 +1000

351

352

Create balance widget, tie it to the action

353

354

TODO:

355

- show and hide balance widgets in response to a toggleaction

356

357

src/empathy-main-window.c | 53

358

+++++++++++++++++++++++++++++++++++++++++++-

359

src/empathy-main-window.ui | 19 +++++++++++++--

360

2 files changed, 68 insertions(+), 4 deletions(-)

361

362

commit 4f128d19a94c2315db1bab800be93d97e6033b72

363

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

364

Date: Fri Apr 15 15:47:50 2011 +1000

365

366

Factor out main_window_setup_balance_create_action()

367

368

src/empathy-main-window.c | 66

369

+++++++++++++++++++++++++++-----------------

370

1 files changed, 40 insertions(+), 26 deletions(-)

371

372

commit c26345ba2beb3957327810e201a9f71097910738

373

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

374

Date: Fri Apr 15 15:24:23 2011 +1000

375

376

Support Conn.I.Balance.ManageCreditURI

377

378

src/empathy-main-window.c | 43

379

+++++++++++++++++++++++++++++--------------

380

1 files changed, 29 insertions(+), 14 deletions(-)

381

382

commit 0892b114ee4fd20559fb0c613c7c145c8bedbc9d

383

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

384

Date: Fri Apr 15 14:33:20 2011 +1000

385

386

Remove balance from menu when account is disconnected

387

388

src/empathy-main-window.c | 36 ++++++++++++++++++++++++++++++++----

389

1 files changed, 32 insertions(+), 4 deletions(-)

390

391

commit 416da629fa9a0e9293b811d36547b0b189b6e13d

392

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

393

Date: Fri Apr 15 14:20:31 2011 +1000

394

395

Add a menuitem to report the account balance for each account

396

397

Adds a menu item for each connection that supports Conn.I.Balance,

398

requests

399

the current balance and then tracks further updates to the balance.

400

401

TODO:

402

- remove the menu item when the account is disconnected

403

- implement the activated signal

404

405

src/empathy-main-window.c | 197

406

++++++++++++++++++++++++++++++++++++++++++++

407

src/empathy-main-window.ui | 2 +

408

2 files changed, 199 insertions(+), 0 deletions(-)

409

410

commit 1cc68d03a0339cf5f31fabb308b3f1cd9bdb9272

411

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

412

Date: Fri Apr 15 14:15:47 2011 +1000

413

414

Add method empathy_format_currency()

415

416

This method takes a Telepathy Currency_Amount and attempts to format

417

it using

418

currency rules appropriate for that amount.

419

420

Unfortunately I haven't yet found a good summary of currency rules,

421

so I've

422

mostly been guessing. The currencies structure needs completing

423

and checking.

424

425

libempathy/empathy-utils.c | 74

426

++++++++++++++++++++++++++++++++++++++++++++

427

libempathy/empathy-utils.h | 2 +

428

2 files changed, 76 insertions(+), 0 deletions(-)

429

430

commit 0fda59487b536e49bfcec7ab1ee6e9c6d7b6f306

431

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

432

Date: Thu May 5 16:22:23 2011 +1000

433

434

Include SMSChannel property in empathy_chat_window_find_chat()

435

436

The approach in https://bugzilla.gnome.org/show_bug.cgi?id=644085

437

was wrong

438

because channel paths can change across reconnects. This would cause

439

new chat

440

windows to be created when they were rerequested.

441

442

A more future-proof solution would be to keep a white/black list

443

of comparable

444

properties, but I think this is overengineering the problem for

445

the time

446

being. Instead we'll just include the SMSChannel property in the

447

comparison.

448

449

src/empathy-chat-manager.c | 3 ++-

450

src/empathy-chat-window.c | 8 +++++---

451

src/empathy-chat-window.h | 3 ++-

452

3 files changed, 9 insertions(+), 5 deletions(-)

453

454

commit 11e8ca993282f16043b821f00e55f5ebd03fb089

455

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

456

Date: Wed Apr 13 16:24:21 2011 +1000

457

458

Only set the SMS button sensitive if we have SMS capability

459

460

libempathy-gtk/empathy-new-message-dialog.c | 65

461

++++++++++++++++++++++++++-

462

1 files changed, 63 insertions(+), 2 deletions(-)

463

464

commit 73220cb660bf75ac0c57f46ca514146cfa091e4f

465

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

466

Date: Wed Apr 13 16:23:41 2011 +1000

467

468

contact-selector-dialog: add a selected-account property

469

470

libempathy-gtk/empathy-contact-selector-dialog.c | 25

471

+++++++++++++++++++++-

472

1 files changed, 24 insertions(+), 1 deletions(-)

473

474

commit 537eb8711fdac7dc78c047b390fc65ab424bd0d3

475

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

476

Date: Tue Apr 12 16:23:49 2011 +1000

477

478

Add an SMS button to the new-message dialog

479

480

libempathy-gtk/empathy-new-message-dialog.c | 43

481

++++++++++++++++++++++++--

482

1 files changed, 39 insertions(+), 4 deletions(-)

483

484

commit 2411c0bc8accdfe6ff38cca5510c79f0f56abd8f

485

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

486

Date: Tue Apr 12 09:43:36 2011 +1000

487

488

Don't wait for SMS properties when there is no SMS support on

489

the channel

490

491

libempathy/empathy-tp-chat.c | 3 +++

492

1 files changed, 3 insertions(+), 0 deletions(-)

493

494

commit 8d16f171e0e256e0d8c954c7deb7c410e8e66465

495

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

496

Date: Thu Apr 7 11:54:32 2011 +1000

497

498

Add "(SMS)" to the tab name for SMS channels

499

500

libempathy-gtk/empathy-chat.c | 11 ++++++++++-

501

1 files changed, 10 insertions(+), 1 deletions(-)

502

503

commit 385dc5af3c16b6de75d92b989585e44f953967f6

504

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

505

Date: Thu Apr 7 11:48:56 2011 +1000

506

507

Change empathy_chat_get_name() from const char * -> char *

508

509

Change the name to empathy_chat_dup_name() to reflect this change.

510

511

Note to reviewer: I think I've updated all the callers, but this is

512

the commit

513

to check carefully for new leaks :)

514

515

libempathy-gtk/empathy-chat.c | 8 +++---

516

libempathy-gtk/empathy-chat.h | 2 +-

517

src/empathy-chat-window.c | 42

518

+++++++++++++++++++++++++++-------------

519

3 files changed, 33 insertions(+), 19 deletions(-)

520

521

commit 19ff66754d0afc6ef10fffba319c781dfc9d0ec9

522

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

523

Date: Thu Apr 7 11:43:07 2011 +1000

524

525

Add "SMS:" to the tooltip

526

527

src/empathy-chat-window.c | 4 ++++

528

1 files changed, 4 insertions(+), 0 deletions(-)

529

530

commit a0069b64b55bd239eb7d4678fb9792b1359210dc

531

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

532

Date: Thu Apr 7 11:42:12 2011 +1000

533

534

Set EMPATHY_IMAGE_SMS on sms channels

535

536

src/empathy-chat-window.c | 6 ++++++

537

1 files changed, 6 insertions(+), 0 deletions(-)

538

539

commit 6a5fd794b64d48898c3b941b64c6431f55419939

540

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

541

Date: Thu Apr 7 11:41:54 2011 +1000

542

543

Add sms-channel property to empathy-chat

544

545

libempathy-gtk/empathy-chat.c | 46

546

+++++++++++++++++++++++++++++++++++++++-

547

libempathy-gtk/empathy-chat.h | 2 +

548

2 files changed, 46 insertions(+), 2 deletions(-)

549

550

commit 8af3231ae3260e40bc327567540a0a3a76dce5b1

551

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

552

Date: Wed Apr 6 17:13:33 2011 +1000

553

554

Add sms-channel property to empathy-tp-chat

555

556

libempathy/empathy-tp-chat.c | 77

557

++++++++++++++++++++++++++++++++++++++++++

558

libempathy/empathy-tp-chat.h | 2 +

559

2 files changed, 79 insertions(+), 0 deletions(-)

560

561

commit b41c1f0e4b8277feee45703d283591adaed6305b

562

Author: Chandni Verma <chandniverma2112@gmail.com>

563

Date: Wed May 4 00:59:12 2011 +0530

564

565

Move the code ensuring a requested sms channel to empathy-request-util

566

as empathy-dispatcher has been deleted in master

567

568

libempathy-gtk/empathy-individual-menu.c | 2 +-

569

libempathy/empathy-request-util.c | 55

570

+++++++++++++++++------------

571

libempathy/empathy-request-util.h | 5 +++

572

3 files changed, 38 insertions(+), 24 deletions(-)

573

574

commit ce8a8930c60b7dbb45f14ed49e8473c4f78e9686

575

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

576

Date: Wed Apr 6 16:34:43 2011 +1000

577

578

Add SMS entry to empathy-individual-menu

579

580

libempathy-gtk/empathy-images.h | 1 +

581

libempathy-gtk/empathy-individual-menu.c | 65

582

++++++++++++++++++++++++++++++

583

libempathy-gtk/empathy-individual-menu.h | 5 ++-

584

libempathy/empathy-contact.c | 21 ++++++++++

585

libempathy/empathy-contact.h | 3 +

586

5 files changed, 94 insertions(+), 1 deletions(-)

587

588

commit 77fab8ebc60ce2625c4f449cde6296b25b10b05d

589

Author: Daniel Mustieles <daniel.mustieles@gmail.com>

590

Date: Wed May 4 22:39:50 2011 +0200

591

592

Updated Spanish translation

593

594

po/es.po | 4 ++--

595

1 files changed, 2 insertions(+), 2 deletions(-)

596

597

commit e589a87b20c200748226195090d4b0a89ae631eb

598

Author: Daniel Mustieles <daniel.mustieles@gmail.com>

599

Date: Wed May 4 22:38:14 2011 +0200

600

601

Updated Spanish translation

602

603

po/es.po | 22 ++++++++++++----------

604

1 files changed, 12 insertions(+), 10 deletions(-)

605

606

commit f758b26e3d8bbc6ca348ce4de99b95547745a374

607

Author: Daniel Mustieles <daniel.mustieles@gmail.com>

608

Date: Wed May 4 22:36:44 2011 +0200

609

610

Updated Spanish translation

611

612

po/es.po | 100

613

+++++++++++++++++++++++++++++++++++++++++++++-----------------

614

1 files changed, 73 insertions(+), 27 deletions(-)

615

616

commit 3eef7be07ed7873e1f95571082eb6c2319e0b9b3

617

Author: Xavier Claessens <xclaesse@gmail.com>

618

Date: Wed May 4 14:30:02 2011 +0200

619

620

Adium: Correctly support action messages (/me)

621

622

Fixes bug #649367

623

624

libempathy-gtk/empathy-theme-adium.c | 22 +++++++++++++++-------

625

1 files changed, 15 insertions(+), 7 deletions(-)

626

627

commit d26565223775beb169f46c315f8c09d1de0b85da

628

Author: Xavier Claessens <xclaesse@gmail.com>

629

Date: Tue May 3 23:39:38 2011 +0200

630

631

Adium: Fix selection of default variant

632

633

For theme version >= 3, a variant CSS is mandatory. If none are set

634

inf DefaultVariant, the first one from Variant/ should be used.

635

636

For theme version <= 2, a variant CSS is optional, and by default they

637

should not have one. If no variant is selected, fallback to main.css.

638

639

This also prepare needed API to select other variants

640

641

libempathy-gtk/empathy-theme-adium.c | 216

642

+++++++++++++++++++++++++--------

643

libempathy-gtk/empathy-theme-adium.h | 3 +

644

2 files changed, 166 insertions(+), 53 deletions(-)

645

646

commit f4d37063650dd562b21ff722700fff573ca5e6b6

647

Author: Kjartan Maraas <kmaraas@gnome.org>

648

Date: Wed May 4 11:14:27 2011 +0200

649

650

Updated Norwegian bokmål translation

651

652

po/nb.po | 623

653

+++++++++++++++++++++++++++++++++++---------------------------

654

1 files changed, 348 insertions(+), 275 deletions(-)

655

656

commit 06abfe6cfc83b0355403ee7d5ccc45afc2d3b43d

657

Author: Daniel Mustieles <daniel.mustieles@gmail.com>

658

Date: Tue May 3 23:11:22 2011 +0200

659

660

Updated Spanish translation

661

662

po/es.po | 113

663

++++++++++++++++++++++++++++++-------------------------------

664

1 files changed, 56 insertions(+), 57 deletions(-)

665

666

commit a4c37d0cbf7030206a31a9eee838ae8b0d3f13d3

667

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

668

Date: Tue May 3 14:43:34 2011 +0200

669

670

empathy-chat: track chat displayed instead of channels being handled

671

(#649273)

672

673

src/empathy-chat-manager.c | 71

674

++++++++++++++++++++------------------------

675

src/empathy-chat.c | 6 ++--

676

2 files changed, 35 insertions(+), 42 deletions(-)

677

678

commit 454bb79700b86511e3b0b03c7aab0d498e6a7258

679

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

680

Date: Tue May 3 14:29:26 2011 +0200

681

682

remove unused empathy_chat_manager_get_num_handled_chats()

683

684

src/empathy-chat-manager.c | 8 --------

685

src/empathy-chat-manager.h | 2 --

686

2 files changed, 0 insertions(+), 10 deletions(-)

687

688

commit 74c8015453317b0084bdac8a22e6974e2af0865d

689

Author: Xavier Claessens <xclaesse@gmail.com>

690

Date: Tue May 3 16:21:54 2011 +0200

691

692

Preferences: Show chat theme preview

693

694

Fixes bug #541438

695

696

src/empathy-preferences.c | 250 ++++++---

697

src/empathy-preferences.ui | 1427

698

++++++++++++++++++++++++--------------------

699

2 files changed, 965 insertions(+), 712 deletions(-)

700

701

commit 752ff0ce87069fad6eaea4d9e6dff84d8a2cf55d

702

Author: Xavier Claessens <xclaesse@gmail.com>

703

Date: Tue May 3 16:20:29 2011 +0200

704

705

ThemeManager: Make sure to emit theme-changed only once when the

706

theme changed

707

708

Also avoid emiting the signal if it is just a variant change that can

709

be applied on view.

710

711

libempathy-gtk/empathy-theme-manager.c | 89

712

++++++++++++++++++++++++++++----

713

1 files changed, 79 insertions(+), 10 deletions(-)

714

715

commit af9137e60f178bcc5fe039c64ea5e7a762ffcc62

716

Author: Xavier Claessens <xclaesse@gmail.com>

717

Date: Tue May 3 14:23:25 2011 +0200

718

719

Adium: Also queue events when loading the page

720

721

libempathy-gtk/empathy-theme-adium.c | 32

722

+++++++++++++++++++++-----------

723

1 files changed, 21 insertions(+), 11 deletions(-)

724

725

commit 9c9775421d361b2f615bb06a7e9286bfeb912da0

726

Author: Xavier Claessens <xclaesse@gmail.com>

727

Date: Tue May 3 11:11:43 2011 +0200

728

729

Adium: Events must be queued until the Template.html loaded

730

731

libempathy-gtk/empathy-theme-adium.c | 7 +++++++

732

1 files changed, 7 insertions(+), 0 deletions(-)

733

734

commit 7aa2b0f9959c05bd4c361cd582438fd92e9229e4

735

Author: Xavier Claessens <xclaesse@gmail.com>

736

Date: Mon May 2 22:18:53 2011 +0200

737

738

Adium: Mark autoreply message

739

740

libempathy-gtk/empathy-theme-adium.c | 5 +++--

741

1 files changed, 3 insertions(+), 2 deletions(-)

742

743

commit 1a3795ae51d0d0539a8a4ab267e743811d9ce75c

744

Author: Xavier Claessens <xclaesse@gmail.com>

745

Date: Mon May 2 22:14:15 2011 +0200

746

747

Adium: highlight messages starting with our name

748

749

libempathy-gtk/empathy-theme-adium.c | 6 +++---

750

1 files changed, 3 insertions(+), 3 deletions(-)

751

752

commit 0a23e2154b658e2093980e299045fdcc92feabd2

753

Author: Muhammet Kara <muhammet.k@gmail.com>

754

Date: Tue May 3 11:23:24 2011 +0300

755

756

Updated Turkish translation

757

758

po/tr.po | 112

759

++++++++++++++++++++++++++++++-------------------------------

760

1 files changed, 55 insertions(+), 57 deletions(-)

761

762

commit b71596cf3baf4852ec2bae3ce0fdab236e98d3cc

763

Author: Xavier Claessens <xclaesse@gmail.com>

764

Date: Mon May 2 21:26:09 2011 +0200

765

766

Depend on stable release of glib 2.28.0

767

768

configure.ac | 2 +-

769

1 files changed, 1 insertions(+), 1 deletions(-)

770

771

commit e3a4b93a1e7ec0fd3aa87818189bd87710645257

772

Author: Xavier Claessens <xclaesse@gmail.com>

773

Date: Mon May 2 20:27:13 2011 +0200

774

775

Fix crash if contact_id is NULL when selecting its color

776

777

libempathy-gtk/empathy-theme-adium.c | 7 ++++---

778

1 files changed, 4 insertions(+), 3 deletions(-)

779

780

commit e9ef0cff07611187f2230b08e396fc1637e14ec8

781

Author: Xavier Claessens <xclaesse@gmail.com>

782

Date: Mon May 2 15:42:24 2011 +0200

783

784

Adium: Temporally disable scrolling when appending backlog

785

786

libempathy-gtk/empathy-theme-adium.c | 16 +++++++++++-----

787

1 files changed, 11 insertions(+), 5 deletions(-)

788

789

commit 28e020cf508280879d2a7b8ea3ceec878f5c381b

790

Author: Xavier Claessens <xclaesse@gmail.com>

791

Date: Mon May 2 15:10:39 2011 +0200

792

793

Update Template.html from newest adium

794

795

data/Template.html | 354

796

+++++++++++++++++++++++++++++++++++++++-------------

797

1 files changed, 269 insertions(+), 85 deletions(-)

798

799

commit 9c19838a24ca1085a5b77f40eb29bcd1b6597221

800

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

801

Date: Mon May 2 14:55:55 2011 +0200

802

803

coding style fix

804

805

libempathy-gtk/empathy-theme-adium.c | 2 +-

806

1 files changed, 1 insertions(+), 1 deletions(-)

807

808

commit d4250dd038f2c7f5556c7b564f011de8e210e1c3

809

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

810

Date: Mon May 2 14:42:00 2011 +0200

811

812

POTFILES.in: add libempathy-gtk/empathy-search-bar.c

813

814

po/POTFILES.in | 1 +

815

1 files changed, 1 insertions(+), 0 deletions(-)

816

817

commit 715bb21b4598091c2dac0ebf94b3d744056d01e6

818

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

819

Date: Mon May 2 13:36:42 2011 +0200

820

821

theme-adium: implement %senderColor% (#541632)

822

823

libempathy-gtk/empathy-theme-adium.c | 33

824

+++++++++++++++++++++++++++++++--

825

1 files changed, 31 insertions(+), 2 deletions(-)

826

827

commit fdae42d539623655e9e496c80392164bc3c0f263

828

Author: Xavier Claessens <xclaesse@gmail.com>

829

Date: Mon May 2 13:54:17 2011 +0200

830

831

Support new themes that have only Resources/Content.html

832

833

Still fallback to legacy html files if global one is missing.

834

835

libempathy-gtk/empathy-theme-adium.c | 120

836

+++++++++++++++++++++++-----------

837

1 files changed, 81 insertions(+), 39 deletions(-)

838

839

commit bc609ea14a874a1ef9c66747ce118228c9fb0a65

840

Author: Xavier Claessens <xclaesse@gmail.com>

841

Date: Mon May 2 13:52:06 2011 +0200

842

843

Fix a crash if replacement is NULL

844

845

libempathy-gtk/empathy-theme-adium.c | 4 ++--

846

1 files changed, 2 insertions(+), 2 deletions(-)

847

848

commit 4b846aa7efc67f6e01f2e4344d8da0a298d172b8

849

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

850

Date: Mon May 2 10:10:17 2011 +0200

851

852

individual_store_get_individual_status_icon_with_icon_name: look in

853

the cache before creating new pixbuf

854

855

libempathy-gtk/empathy-individual-store.c | 7 ++++++-

856

1 files changed, 6 insertions(+), 1 deletions(-)

857

858

commit ee02e3e2da01c356c6883fa51b2d5cf1cac7318c

859

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

860

Date: Mon May 2 10:04:22 2011 +0200

861

862

main_window_flash_foreach: don't leak the pixbuf returned by

863

empathy_pixbuf_from_icon_name

864

865

src/empathy-main-window.c | 3 +++

866

1 files changed, 3 insertions(+), 0 deletions(-)

867

868

commit 7078e93bbcd562175248a8fdf752f2fa92f1171c

869

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

870

Date: Fri Apr 29 17:53:17 2011 +0200

871

872

set a not empty string when setting

873

EMPATHY_NOTIFY_MANAGER_CAP_X_CANONICAL_APPEND

874

875

libnotify now filters out empty string so the hint was not set

876

(#648842).

877

878

src/empathy-chat-window.c | 3 ++-

879

src/empathy-notifications-approver.c | 3 ++-

880

2 files changed, 4 insertions(+), 2 deletions(-)

881

882

commit 85058e4e3f88412683771172f7dace66366ad069

883

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

884

Date: Fri Apr 29 15:47:50 2011 +0200

885

886

Display favorite offline contacts only in the Favorite group (#648914)

887

888

libempathy-gtk/empathy-individual-view.c | 53

889

+++++++++++++++++++++++++++---

890

1 files changed, 48 insertions(+), 5 deletions(-)

891

892

commit 5ead12fb5b53cea0c8a97e8f101e2d729ca47282

893

Author: Fran Diéguez <fran.dieguez@mabishu.com>

894

Date: Sat Apr 30 23:09:26 2011 +0200

895

896

Updated galician translations

897

898

po/gl.po | 593

899

++++++++++++++++++++++++++++++++-----------------------------

900

1 files changed, 311 insertions(+), 282 deletions(-)

901

902

commit d8f9882180f0b1b8579a88e0c96a9b52895ab1a0

903

Author: Marek Černocký <marek@manet.cz>

904

Date: Sat Apr 30 13:07:04 2011 +0200

905

906

Updated Czech translation

907

908

po/cs.po | 661

909

++++++++++++++++++++++++++++++++------------------------------

910

1 files changed, 342 insertions(+), 319 deletions(-)

911

912

commit c85766cdb415b34c85f292573b46000d6f592487

913

Author: Matej Urbančič <mateju@svn.gnome.org>

914

Date: Thu Apr 28 21:25:18 2011 +0200

915

916

Updated Slovenian translation

917

918

po/sl.po | 605

919

++++++++++++++++++++++++++++++++------------------------------

920

1 files changed, 316 insertions(+), 289 deletions(-)

921

922

commit 6f6b46ec60bd4492024c38a0e7a6301ccb880e2a

923

Author: Daniel Mustieles <daniel.mustieles@gmail.com>

924

Date: Wed Apr 27 20:12:22 2011 +0200

925

926

Updated Spanish translation

927

928

po/es.po | 364

929

+++++++++++++++++++++++++++++++++-----------------------------

930

1 files changed, 193 insertions(+), 171 deletions(-)

931

932

commit 5360a078c1b0d1e80a031fab38b865144447080d

933

Author: Xavier Claessens <xclaesse@gmail.com>

934

Date: Tue Apr 26 11:52:33 2011 +0200

935

936

Use focus feature of adium themes

937

938

libempathy-gtk/empathy-chat-view.c | 11 ++++

939

libempathy-gtk/empathy-chat-view.h | 4 ++

940

libempathy-gtk/empathy-chat.c | 16 +++++-

941

libempathy-gtk/empathy-theme-adium.c | 93

942

++++++++++++++++++++++++++++++++--

943

4 files changed, 118 insertions(+), 6 deletions(-)

944

945

commit e4e176e847974f11e5155f434c1620c042dacd69

946

Author: Xavier Claessens <xclaesse@gmail.com>

947

Date: Tue Apr 26 14:31:50 2011 +0200

948

949

Add FIXMEs for things we don't implement yet from adium theme spec

950

951

This also replaces well known keywords that we don't implement yet by

952

"",

953

otherwise the html is broken and webkit does not render it correctly.

954

955

libempathy-gtk/empathy-theme-adium.c | 162

956

++++++++++++++++++++++++++--------

957

1 files changed, 123 insertions(+), 39 deletions(-)

958

959

commit 898327a20db060ddcedde2e85757c952c08dbef3

960

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

961

Date: Wed Apr 27 12:04:06 2011 +0200

962

963

chat_window_page_switched_cb: get the child from the GTK+ signal

964

965

We don't care about GTK+2 compatibility any more.

966

967

src/empathy-chat-window.c | 15 +++------------

968

1 files changed, 3 insertions(+), 12 deletions(-)

969

970

commit bc3746dd1bb352d54542d662846273491fa869e2

971

Author: Muhammet Kara <muhammet.k@gmail.com>

972

Date: Tue Apr 26 15:21:12 2011 +0300

973

974

Updated Turkish translation

975

976

po/tr.po | 400

977

+++++++++++++++++++++++++++++++++-----------------------------

978

1 files changed, 214 insertions(+), 186 deletions(-)

979

980

commit 3e34b40f5a2ce026187c2e9c8316f1b255c193e9

981

Author: Will Thompson <will.thompson@collabora.co.uk>

982

Date: Fri Apr 15 19:31:28 2011 +0100

983

984

contact_list_store_chat_state_changed_cb(): tidy

985

986

This doesn't fix bgo#647891, but I think it makes the loop clearer.

987

988

Reviewed-by: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

989

990

libempathy-gtk/empathy-contact-list-store.c | 10 ++++------

991

1 files changed, 4 insertions(+), 6 deletions(-)

992

993

commit 4b33bdcdb42169a0e38c4a21b07deb6a4d8dcc93

994

Author: Abduxukur Abdurixit <abdurixit@gmail.com>

995

Date: Mon Apr 25 09:56:22 2011 +0200

996

997

Added UG translation

998

999

po/ug.po | 272

1000

++++++++++++++++++--------------------------------------------

1001

1 files changed, 77 insertions(+), 195 deletions(-)

1002

1003

commit e958f2457d7c4f9b51422cb10a658cc8a5756a13

1004

Author: Sira Nokyoongtong <gumaraa@gmail.com>

1005

Date: Mon Apr 25 14:44:56 2011 +0700

1006

1007

Updated Thai translation.

1008

1009

po/th.po | 2317

1010

++++++++++++++++++++++++++++++++++++++++++--------------------

1011

1 files changed, 1573 insertions(+), 744 deletions(-)

1012

1013

commit 4d4d074747c78b34394af9931d241f087c720f7f

1014

Author: Abduxukur Abdurixit <abdurixit@gmail.com>

1015

Date: Sun Apr 24 20:29:13 2011 +0200

1016

1017

Added UG translation

1018

1019

po/ug.po | 1563

1020

+++++++++++++++++++++++++++++++++-----------------------------

1021

1 files changed, 845 insertions(+), 718 deletions(-)

1022

1023

commit 1af5e4df56d4be49a4f79fe614adf5016a28170c

1024

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

1025

Date: Fri Apr 22 10:20:50 2011 +0200

1026

1027

account-assistant: ensure that the import widget takes all the space

1028

available (#648372)

1029

1030

src/empathy-account-assistant.c | 4 ++--

1031

1 files changed, 2 insertions(+), 2 deletions(-)

1032

1033

commit bf973005c4dde610ecdf7d9e1207e602128ed48f

1034

Author: Arash Mousavi <amousavi@src.gnome.org>

1035

Date: Fri Apr 22 01:07:58 2011 +0430

1036

1037

Updated Persian translation

1038

1039

po/fa.po | 1048

1040

+++++++++++++++++++++++++++++++++++---------------------------

1041

1 files changed, 597 insertions(+), 451 deletions(-)

1042

1043

commit 6553d96b15dde13d30ed25f0c302c21f3c72bcce

1044

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

1045

Date: Wed Apr 20 14:27:37 2011 +0200

1046

1047

account-widget: remove all the code related to the enabled checkbox

1048

1049

libempathy-gtk/empathy-account-widget.c | 158

1050

+------------------------------

1051

1 files changed, 2 insertions(+), 156 deletions(-)

1052

1053

commit 6df860aee0936c9bc903420c490a312dd6e3207e

1054

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

1055

Date: Mon Mar 14 21:30:10 2011 +1100

1056

1057

Remove enabled toggle from account-widget

1058

1059

libempathy-gtk/empathy-account-widget.c | 4 ++++

1060

1 files changed, 4 insertions(+), 0 deletions(-)

1061

1062

commit aab7e0e7a78708663fd75baddfd7bd2b06251257

1063

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

1064

Date: Wed Apr 20 14:21:08 2011 +0200

1065

1066

don't display the enable switch if account is restricted

1067

1068

src/empathy-accounts-dialog.c | 7 +++++++

1069

1 files changed, 7 insertions(+), 0 deletions(-)

1070

1071

commit 9de3622a5e8e94005b2d2c782486822459690e2c

1072

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

1073

Date: Wed Apr 20 14:09:07 2011 +0200

1074

1075

use a GtkSwitch instead of MX switch

1076

1077

src/empathy-accounts-dialog.c | 19 +++++++++----------

1078

1 files changed, 9 insertions(+), 10 deletions(-)

1079

1080

commit 4d9b2abd1374653c7fa88cc1edc30438dcf0ba8f

1081

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

1082

Date: Mon Mar 14 21:24:15 2011 +1100

1083

1084

Add an enabled switch to the account dialog GtkInfoBar

1085

1086

src/empathy-accounts-dialog.c | 63

1087

+++++++++++++++++++++++++++++++++++++++++

1088

1 files changed, 63 insertions(+), 0 deletions(-)

1089

1090

commit 83f3f9dc6adf394915c7da8a1da16c127ea6a10d

1091

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

1092

Date: Tue Apr 19 17:33:14 2011 +0200

1093

1094

location-manager: use tp_asv_*

1095

1096

libempathy-gtk/empathy-location-manager.c | 29

1097

++++++++++-------------------

1098

1 files changed, 10 insertions(+), 19 deletions(-)

1099

1100

commit 2f5f9eb6d3d4185f9a20c158567ccdd969df52d9

1101

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

1102

Date: Tue Apr 19 17:25:15 2011 +0200

1103

1104

location-manager: use the self->priv pattern

1105

1106

libempathy-gtk/empathy-location-manager.c | 194

1107

++++++++++++++---------------

1108

libempathy-gtk/empathy-location-manager.h | 3 +-

1109

2 files changed, 94 insertions(+), 103 deletions(-)

1110

1111

commit d98211ce5e4f1c092c4d8b2ebcb2734c00eb9548

1112

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

1113

Date: Tue Apr 19 17:13:18 2011 +0200

1114

1115

location-manager: remove useless propety getter and setter

1116

1117

libempathy-gtk/empathy-location-manager.c | 34

1118

-----------------------------

1119

1 files changed, 0 insertions(+), 34 deletions(-)

1120

1121

commit 108817b949df863a7c17748587dbccc9b313ba16

1122

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

1123

Date: Tue Apr 19 17:12:20 2011 +0200

1124

1125

location_manager_dispose: use tp_clear_*

1126

1127

libempathy-gtk/empathy-location-manager.c | 41

1128

++++------------------------

1129

1 files changed, 6 insertions(+), 35 deletions(-)

1130

1131

commit 35722b1439baba701f5ba99ea8c3b956e7dda157

1132

Author: Piotr Drąg <piotrdrag@gmail.com>

1133

Date: Wed Apr 20 12:42:28 2011 +0200

1134

1135

Updated Polish translation

1136

1137

po/pl.po | 325

1138

++++++++++++++++++++++++++++++++------------------------------

1139

1 files changed, 166 insertions(+), 159 deletions(-)

1140

1141

commit bdea54f59e52ebeaa0743674aa5998636f26a241

1142

Merge: 9d9cfc0 eb6ab43

1143

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

1144

Date: Wed Apr 20 09:49:52 2011 +0200

1145

1146

Merge branch 'timestamp-648188'

1147

1148

commit eb6ab4328849a0c5ee5959560f90f36fd71a815d

1149

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

1150

Date: Tue Apr 19 12:18:02 2011 +0200

1151

1152

chat_text_view_append_timestamp: use empathy_time_to_string_utc()

1153

1154

libempathy-gtk/empathy-chat-text-view.c | 6 +-----

1155

1 files changed, 1 insertions(+), 5 deletions(-)

1156

1157

commit 92af7e9f7c5f114963299fcf53b48b4ed86a2f7b

1158

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

1159

Date: Tue Apr 19 11:06:52 2011 +0200

1160

1161

Port all timestamps from time_t to gint64 (#648188)

1162

1163

libempathy-gtk/empathy-chat-text-view.c | 43 ++++++++--------

1164

libempathy-gtk/empathy-chat-text-view.h | 2 +-

1165

libempathy-gtk/empathy-contact-widget.c | 6 +--

1166

libempathy-gtk/empathy-individual-widget.c | 6 +--

1167

libempathy-gtk/empathy-location-manager.c | 17 +++----

1168

libempathy-gtk/empathy-theme-adium.c | 6 +-

1169

libempathy-gtk/empathy-theme-boxes.c | 2 +-

1170

libempathy/empathy-ft-handler.c | 4 +-

1171

libempathy/empathy-message.c | 18 +++----

1172

libempathy/empathy-message.h | 2 +-

1173

libempathy/empathy-time.c | 76

1174

+++++++++++++++++-----------

1175

libempathy/empathy-time.h | 8 ++--

1176

libempathy/empathy-tp-file.c | 2 +-

1177

src/empathy-map-view.c | 14 ++++--

1178

14 files changed, 110 insertions(+), 96 deletions(-)

1179

1180

commit 2d1ca4e5b9f7fdff7b1ea2d4fc31828d7dbbbae8

1181

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

1182

Date: Tue Apr 19 11:31:18 2011 +0200

1183

1184

empathy-time: remove unused functions

1185

1186

libempathy/empathy-time.c | 50

1187

---------------------------------------------

1188

libempathy/empathy-time.h | 2 -

1189

2 files changed, 0 insertions(+), 52 deletions(-)

1190

1191

commit e3eb2f9d11ae3cc274c9d020dca0306fde07f783

1192

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

1193

Date: Tue Apr 19 10:49:42 2011 +0200

1194

1195

empathy-message: cast timestamps to glong

1196

1197

tp_message_get_received_timestamp() and tpl_event_get_timestamp()

1198

both return

1199

gint64 while the timestamp is stored as a glong. We need to cast it

1200

as varargs

1201

won't do it for us and not casting will result in a a sizing

1202

mismatch on

1203

32-bit.

1204

1205

Ideally we should stop using time_t and always use gint64 with

1206

timestamps.

1207

1208

libempathy/empathy-message.c | 4 ++--

1209

1 files changed, 2 insertions(+), 2 deletions(-)

1210

1211

commit 52d369333daea849d6119f4aee80007d9c659652

1212

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

1213

Date: Tue Apr 19 09:52:54 2011 +0200

1214

1215

empathy_message_new_from_tp_message: assign priv as soon as the

1216

message is created

1217

1218

libempathy/empathy-message.c | 3 ++-

1219

1 files changed, 2 insertions(+), 1 deletions(-)

1220

1221

commit 9d9cfc021b05fe9afbe8769d6e0c289cf1dc9734

1222

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

1223

Date: Wed Apr 13 12:34:38 2011 +0200

1224

1225

accounts_dialog_cms_prepare_cb: don't update the settings if we are

1226

already preparing one

1227

1228

This may lead to ignoring the existing setting if it's a slow one

1229

to prepare

1230

(as Haze for example). (#647641)

1231

1232

src/empathy-accounts-dialog.c | 4 +++-

1233

1 files changed, 3 insertions(+), 1 deletions(-)

1234

1235

commit c97c920a473ac08460f3869db70a6bb829c9317d

1236

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

1237

Date: Mon Apr 18 14:48:47 2011 +0200

1238

1239

use the TpChannel:chat-state-changed signal

1240

1241

libempathy/empathy-tp-chat.c | 11 ++++-------

1242

1 files changed, 4 insertions(+), 7 deletions(-)

1243

1244

commit d12280ac153d2b16b2a6a7181ebc5fa4c9300408

1245

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

1246

Date: Mon Apr 18 14:31:42 2011 +0200

1247

1248

use delivery report instead of Text.SendError

1249

1250

libempathy/empathy-tp-chat.c | 75

1251

++++++++++++++++++++++++++++--------------

1252

1 files changed, 50 insertions(+), 25 deletions(-)

1253

1254

commit f3b23695b79b4eee34619e36c9f7c37160674de5

1255

Author: Cosimo Cecchi <cosimoc@gnome.org>

1256

Date: Fri Apr 15 15:53:03 2011 -0400

1257

1258

preferences: use GtkBox instead of Gtk[V,H]Box

1259

1260

Use the orientation property of GtkBox to inherit the new proper

1261

packing

1262

defaults, otherwise boxes in the preferences will look all spread

1263

in the

1264

notebook height.

1265

1266

https://bugzilla.gnome.org/show_bug.cgi?id=647904

1267

1268

src/empathy-preferences.ui | 86

1269

++++++++++++++++++++++----------------------

1270

1 files changed, 43 insertions(+), 43 deletions(-)

1271

1272

commit 1f28f03c2d9765928df41bd5309ac58cfca45229

1273

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

1274

Date: Mon Apr 18 13:25:39 2011 +0200

1275

1276

factor out handle_incoming_message()

1277

1278

libempathy/empathy-tp-chat.c | 40

1279

+++++++++++++++++-----------------------

1280

1 files changed, 17 insertions(+), 23 deletions(-)

1281

1282

commit 4cda099c0f5715355829e7ead5b272eb2465a3c0

1283

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

1284

Date: Fri Apr 15 17:08:58 2011 +0200

1285

1286

empathy-message: remove useless public setters

1287

1288

Also fix the GParamFlags of properties.

1289

1290

libempathy/empathy-message.c | 141

1291

+++++++-----------------------------------

1292

libempathy/empathy-message.h | 13 ----

1293

2 files changed, 22 insertions(+), 132 deletions(-)

1294

1295

commit e3a5d537c9604663f46ec6e82cf397781718a222

1296

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

1297

Date: Fri Apr 15 16:50:33 2011 +0200

1298

1299

remove empathy_message_new()

1300

1301

libempathy/empathy-message.c | 22 +++++++---------------

1302

libempathy/empathy-message.h | 1 -

1303

2 files changed, 7 insertions(+), 16 deletions(-)

1304

1305

commit 6c45c22ef3b659f977221ad691638a073bcfa94e

1306

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

1307

Date: Fri Apr 15 16:41:25 2011 +0200

1308

1309

use tp_text_channel_send_message_async()

1310

1311

libempathy-gtk/empathy-chat.c | 19 +++++++-----

1312

libempathy/empathy-tp-chat.c | 65

1313

+++++++++++++++++++++++++++-------------

1314

libempathy/empathy-tp-chat.h | 2 +-

1315

3 files changed, 56 insertions(+), 30 deletions(-)

1316

1317

commit 92ff1b9177bd6d8633b8d92357e5081db0e9554f

1318

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

1319

Date: Mon Apr 18 14:38:46 2011 +0200

1320

1321

chat_send_error_cb: don't display the message if it's NULL

1322

1323

libempathy-gtk/empathy-chat.c | 11 ++++++++---

1324

1 files changed, 8 insertions(+), 3 deletions(-)

1325

1326

commit e311aa90b3aad5822ddc4a4c040162dea65dea68

1327

Author: Philip Withnall <philip.withnall@collabora.co.uk>

1328

Date: Sat Apr 16 17:13:51 2011 +0100

1329

1330

Bug 647056 — Removing a contact causes a segfault

1331

1332

Fix a double unref which was causing segfaults when removing contacts.

1333

1334

Closes: bgo#647056

1335

1336

libempathy-gtk/empathy-individual-view.c | 1 -

1337

1 files changed, 0 insertions(+), 1 deletions(-)

1338

1339

commit 2af2286eb763f631624db953679c1cba28ff91d7

1340

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

1341

Date: Fri Apr 15 15:17:07 2011 +0200

1342

1343

factor out empathy_message_new_from_tp_message

1344

1345

libempathy/empathy-message.c | 33 +++++++++++++++++

1346

libempathy/empathy-message.h | 5 +++

1347

libempathy/empathy-tp-chat.c | 83

1348

++++++++----------------------------------

1349

3 files changed, 53 insertions(+), 68 deletions(-)

1350

1351

commit 05ab1873675c5e2a6a04c85ef976fb1067a0d743

1352

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

1353

Date: Fri Apr 15 15:35:07 2011 +0200

1354

1355

empathy-message: add missing getter/setter

1356

1357

libempathy/empathy-message.c | 18 ++++++++++++++++++

1358

1 files changed, 18 insertions(+), 0 deletions(-)

1359

1360

commit fde2bece1e5729ce6907f22a6ae48bb3d1eccab4

1361

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

1362

Date: Fri Apr 15 14:37:53 2011 +0200

1363

1364

use TpTextChannel:message-sent

1365

1366

libempathy/empathy-tp-chat.c | 30 ++++++++++++++----------------

1367

1 files changed, 14 insertions(+), 16 deletions(-)

1368

1369

commit c94106860671d6d7d522d93235727e746c10de07

1370

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

1371

Date: Fri Apr 15 14:08:33 2011 +0200

1372

1373

use TpTextChannel:message-received

1374

1375

libempathy/empathy-tp-chat.c | 52

1376

++++++++++++++++++++---------------------

1377

1 files changed, 25 insertions(+), 27 deletions(-)

1378

1379

commit 29ba2de90301c925a95214af450f6a0dae4867c7

1380

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

1381

Date: Fri Apr 15 12:57:56 2011 +0200

1382

1383

use tp_text_channel_get_pending_messages() to get the pending messages

1384

1385

libempathy/empathy-tp-chat.c | 91

1386

++++++++++++++++--------------------------

1387

1 files changed, 34 insertions(+), 57 deletions(-)

1388

1389

commit ddcc4fc3969c7eb60af1a298a8619d1bb0359a83

1390

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

1391

Date: Fri Apr 15 12:21:52 2011 +0200

1392

1393

empathy-tp-chat: ensure that we get a TpTextChannel

1394

1395

libempathy/empathy-chatroom-manager.c | 3 +++

1396

libempathy/empathy-tp-chat.c | 2 +-

1397

src/empathy-chat-manager.c | 7 +++++++

1398

src/empathy-event-manager.c | 2 +-

1399

4 files changed, 12 insertions(+), 2 deletions(-)

1400

1401

commit 5d64d93d3b713a474b56610f38c4fcbb9612c02e

1402

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

1403

Date: Fri Apr 15 11:58:39 2011 +0200

1404

1405

Add translation context on some strings (#646131)

1406

1407

libempathy-gtk/empathy-account-widget.c | 2 +-

1408

libempathy/empathy-utils.c | 2 +-

1409

src/empathy-streamed-media-window.c | 12 ++++++++----

1410

3 files changed, 10 insertions(+), 6 deletions(-)

1411

1412

commit 75895a624190789b42a96b68051258cf837a0de6

1413

Author: Yaron Shahrabani <sh.yaron@gmail.com>

1414

Date: Mon Apr 18 10:46:29 2011 +0300

1415

1416

Updated Hebrew translation.

1417

1418

po/he.po | 447

1419

++++++++++++++++++++++++++++++++------------------------------

1420

1 files changed, 229 insertions(+), 218 deletions(-)

1421

1422

commit 701b2d42aeb5175ee1713cdc5346e4be6ca3c02f

1423

Merge: c2cd5ba 8160b75

1424

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

1425

Date: Fri Apr 15 11:24:30 2011 +0200

1426

1427

Merge branch 'nm-asleep-647793'

1428

1429

commit 8160b750d804d3d7af55d6c77f1cddc6a16859b8

1430

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

1431

Date: Fri Apr 15 08:33:27 2011 +0200

1432

1433

connectivity: consider that network is disconnected if state is

1434

NM_STATE_ASLEEP (#647793)

1435

1436

libempathy/empathy-connectivity.c | 1 +

1437

1 files changed, 1 insertions(+), 0 deletions(-)

1438

1439

commit c2cd5bafc71297d80eff48708750b2a4a419b671

1440

Author: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>

1441

Date: Thu Apr 14 18:58:18 2011 +0700

1442

1443

Updated Vietnamese translation

1444

1445

po/vi.po | 22 +++++++++++-----------

1446

1 files changed, 11 insertions(+), 11 deletions(-)

1447

1448

commit 45800f762da9457e8f4f72d9f23dcfea02bf5e97

1449

Author: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>

1450

Date: Thu Apr 14 18:52:55 2011 +0700

1451

1452

po/vi.po: import from Damned Lies

1453

1454

po/vi.po | 760

1455

+++++++++++++++++++++-----------------------------------------

1456

1 files changed, 260 insertions(+), 500 deletions(-)

1457

1458

commit d2a6e841f9d9c4922c37305e5013b9fc884f250f

1459

Author: Youness Alaoui <youness.alaoui@collabora.co.uk>

1460

Date: Mon Apr 4 21:41:40 2011 -0400

1461

1462

Enable audio/video capabilities if InitialAudio/Video is in the

1463

fixed props for StreamedMedia channels If a connection manager puts

1464

InitialAudio=TRUE or InitialVideo=TRUE in the fixed properties,

1465

empathy thinks the CM doesn't support audio/video.

1466

1467

libempathy/empathy-contact.c | 7 +++++++

1468

1 files changed, 7 insertions(+), 0 deletions(-)

1469

1470

commit ae01650e1c46d9856457d7cf657908acb3684913

1471

Author: Daniel Martinez <entaltoaragon@gmail.com>

1472

Date: Mon Apr 11 22:11:56 2011 +0200

1473

1474

[l10n] Updated Argonesian translation

1475

1476

po/an.po | 2048

1477

+++++++++++++++++++++++++++++++++++--------------------------

1478

1 files changed, 1175 insertions(+), 873 deletions(-)

1479

1480

commit acbd56b155b95df10b9bcb53618523bda3d561ba

1481

Author: Daniel Mustieles <daniel.mustieles@gmail.com>

1482

Date: Mon Apr 11 21:03:15 2011 +0200

1483

1484

Updated Spanish translation

1485

1486

po/es.po | 443

1487

++++++++++++++++++++++++++++++++------------------------------

1488

1 files changed, 226 insertions(+), 217 deletions(-)

1489

1490

commit ceb451e3260ee114562f9f31324d1cd2206ba971

1491

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

1492

Date: Thu Apr 7 13:11:30 2011 +0200

1493

1494

ft-manager: add a 'Close' button (#646084)

1495

1496

src/empathy-ft-manager.c | 9 ++++++++-

1497

src/empathy-ft-manager.ui | 13 +++++++++++++

1498

2 files changed, 21 insertions(+), 1 deletions(-)

1499

1500

commit 53138664c59afe454c5d3ade01ae9c9a1d87193b

1501

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

1502

Date: Thu Apr 7 13:11:23 2011 +0200

1503

1504

factor out close_window()

1505

1506

src/empathy-ft-manager.c | 38 ++++++++++++++++++++++----------------

1507

1 files changed, 22 insertions(+), 16 deletions(-)

1508

1509

commit e02b5b2a9d3ae6cc0a27cb17b0969898d978d021

1510

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

1511

Date: Tue Mar 29 11:23:00 2011 +0200

1512

1513

Display a notification for auth events

1514

1515

This makes them more visible when using the Shell (#646061).

1516

1517

src/empathy-notifications-approver.c | 16 +++++++---------

1518

1 files changed, 7 insertions(+), 9 deletions(-)

1519

1520

commit f4711fa5d39fe11f158e11d6499a352d824715df

1521

Author: Vitaly Minko <vitaly.minko@gmail.com>

1522

Date: Thu Apr 7 07:29:23 2011 +0000

1523

1524

Base the search bar on GtkToolbar instead of GtkHBox in order not

1525

to resize the chat window when we activate it (#614319).

1526

1527

libempathy-gtk/empathy-search-bar.c | 42 +++++++++

1528

libempathy-gtk/empathy-search-bar.ui | 152

1529

+++++++++++++++++-----------------

1530

2 files changed, 119 insertions(+), 75 deletions(-)

1531

1532

commit 10d7351ff8da146ae19652186094b5fb3fde3ebd

45

1533

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

46

1534

Date: Thu Mar 24 11:21:33 2011 +0100

47

1535

53

1541

pass

54

1542

the account which was selected when we started the call (#645586).

55

1543

56

libempathy-gtk/empathy-log-window.c | 60

57

+++++++++++++++++++++++++----------

58

1 files changed, 43 insertions(+), 17 deletions(-)

59

60

commit bfcf9b8485e5bb41b7c29b5a9b2245a71def5725

1544

libempathy-gtk/empathy-log-window.c | 29 +++++++++++++----------------

1545

1 files changed, 13 insertions(+), 16 deletions(-)

1546

1547

commit bd751c69ef2e0a9928b4853a8657e1cea376531e

1548

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

1549

Date: Tue Apr 5 16:37:37 2011 +0200

1550

1551

emulate '/me' command if CM doesn't support Action messages (#622118)

1552

1553

libempathy-gtk/empathy-chat.c | 28 ++++++++++++++++++++++++++--

1554

1 files changed, 26 insertions(+), 2 deletions(-)

1555

1556

commit ae37cca09e8af88c08d2ed16400c1860fd173f7c

1557

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

1558

Date: Wed Apr 6 11:37:28 2011 +0200

1559

1560

add empathy_tp_chat_get_self_contact()

1561

1562

https://bugzilla.gnome.org/show_bug.cgi?id=622118

1563

1564

libempathy/empathy-tp-chat.c | 10 ++++++++++

1565

libempathy/empathy-tp-chat.h | 2 ++

1566

2 files changed, 12 insertions(+), 0 deletions(-)

1567

1568

commit 048f70b95b6845759d64196b18ebe8ff7d4aba2b

1569

Author: Inaki Larranaga Murgoitio <dooteo@zundan.com>

1570

Date: Wed Apr 6 09:37:34 2011 +0200

1571

1572

Updated Basque language

1573

1574

po/eu.po | 41 +++++++++++++++++++++--------------------

1575

1 files changed, 21 insertions(+), 20 deletions(-)

1576

1577

commit af33f911c23b3f478f197088e5ff9ea861cbb442

1578

Author: Bruno Brouard <annoa.b@gmail.com>

1579

Date: Tue Apr 5 11:41:06 2011 +0200

1580

1581

Updated French Doc Translation

1582

1583

help/fr/fr.po | 141

1584

+++++++++++++++++++++++++++-----------------------------

1585

1 files changed, 68 insertions(+), 73 deletions(-)

1586

1587

commit d7f6a39d2d12d9c66b94dfd58488b9c8f9aea35e

1588

Author: Philip Withnall <philip@tecnocode.co.uk>

1589

Date: Wed Mar 30 15:18:03 2011 +0100

1590

1591

Bug 646227 — Possible overflow in persona-view:drag_data_get

1592

1593

I think it was a fluke that this code worked in the first place,

1594

since it was

1595

accessing arrays with indices which were out of range, and which

1596

wouldn't have

1597

corresponded to the correct entries even if they were in range.

1598

1599

This should fix the mapping between DND types and DND URIs/atoms

1600

in the

1601

contact list, individual and persona views.

1602

1603

Closes: bgo#646227

1604

1605

libempathy-gtk/empathy-contact-list-view.c | 18 +------------

1606

libempathy-gtk/empathy-individual-view.c | 37

1607

++++++++++++++++-----------

1608

libempathy-gtk/empathy-persona-view.c | 28 ++++++++++++++-------

1609

3 files changed, 43 insertions(+), 40 deletions(-)

1610

1611

commit cf5ae6bf0560a62e108eb43b172e1ee837d0aa9c

1612

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

1613

Date: Mon Apr 4 15:50:58 2011 +0200

1614

1615

Revert "-Fix use of include <config.h> to make sure translations work"

1616

1617

This reverts commit f0f99ffaa08240fbb72d7eed198368fd22fe4c47.

1618

1619

Sorry, I didn't mean to push that...

1620

1621

libempathy-gtk/empathy-contact-blocking-dialog.c | 4 ----

1622

libempathy-gtk/empathy-contact-search-dialog.c | 4 ----

1623

libempathy/empathy-account-settings.c | 3 ---

1624

libempathy/empathy-auth-factory.c | 4 ----

1625

libempathy/empathy-connection-managers.c | 3 ---

1626

libempathy/empathy-debug.h | 3 +++

1627

libempathy/empathy-ft-handler.c | 4 ----

1628

libempathy/empathy-presence-manager.c | 6 ++----

1629

libempathy/empathy-server-sasl-handler.c | 4 ----

1630

libempathy/empathy-server-tls-handler.c | 4 ----

1631

libempathy/empathy-tp-streamed-media.c | 4 ----

1632

src/empathy-invite-participant-dialog.c | 4 ----

1633

src/empathy-streamed-media-window.c | 3 ---

1634

13 files changed, 5 insertions(+), 45 deletions(-)

1635

1636

commit f0f99ffaa08240fbb72d7eed198368fd22fe4c47

1637

Author: Kjartan Maraas <kmaraas@gnome.org>

1638

Date: Tue Mar 29 19:03:09 2011 +0200

1639

1640

-Fix use of include <config.h> to make sure translations work

1641

1642

libempathy-gtk/empathy-contact-blocking-dialog.c | 4 ++++

1643

libempathy-gtk/empathy-contact-search-dialog.c | 4 ++++

1644

libempathy/empathy-account-settings.c | 3 +++

1645

libempathy/empathy-auth-factory.c | 4 ++++

1646

libempathy/empathy-connection-managers.c | 3 +++

1647

libempathy/empathy-debug.h | 3 ---

1648

libempathy/empathy-ft-handler.c | 4 ++++

1649

libempathy/empathy-presence-manager.c | 6 ++++--

1650

libempathy/empathy-server-sasl-handler.c | 4 ++++

1651

libempathy/empathy-server-tls-handler.c | 4 ++++

1652

libempathy/empathy-tp-streamed-media.c | 4 ++++

1653

src/empathy-invite-participant-dialog.c | 4 ++++

1654

src/empathy-streamed-media-window.c | 3 +++

1655

13 files changed, 45 insertions(+), 5 deletions(-)

1656

1657

commit 9048ff4f63c8ac3174468ceb4787b658d948c6e0

1658

Author: Stef Walter <stefw@collabora.co.uk>

1659

Date: Mon Mar 28 13:31:17 2011 +0200

1660

1661

Remove unnecessary code in empathy_auth_factory_constructed()

1662

1663

https://bugzilla.gnome.org/show_bug.cgi?id=645930

1664

1665

libempathy/empathy-auth-factory.c | 8 --------

1666

1 files changed, 0 insertions(+), 8 deletions(-)

1667

1668

commit 0b0a93b600355d4c205c7777669ee5a42d5e9a3b

1669

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

1670

Date: Mon Apr 4 15:19:26 2011 +0200

1671

1672

remove released flag

1673

1674

configure.ac | 2 +-

1675

1 files changed, 1 insertions(+), 1 deletions(-)

1676

1677

commit ee8f98a6e6f1e3e3dd0e6c8cfc29189f2b368b8b

1678

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

1679

Date: Mon Apr 4 14:58:18 2011 +0200

1680

1681

prepare 3.0 release

1682

1683

NEWS | 47 +++++++++++++++++++++++++++++++++++++++++++++++

1684

configure.ac | 8 ++++----

1685

2 files changed, 51 insertions(+), 4 deletions(-)

1686

1687

commit de3dbb6817d90c0eee7207fc5b69e53e7e72200a

1688

Author: Danilo Segan <danilo@gnome.org>

1689

Date: Mon Apr 4 13:09:16 2011 +0200

1690

1691

Initialize matched to FALSE to stop -Wall breaking the build (and

1692

potentially avoid a hard-to-track bug)

1693

1694

Fixes bug #646691

1695

1696

libempathy/empathy-tls-verifier.c | 2 +-

1697

1 files changed, 1 insertions(+), 1 deletions(-)

1698

1699

commit edb212fe16edbfc8a563bb74c52f9bcf8e92f0d7

1700

Author: Mattias Põldaru <mahfiaz@gmail.com>

1701

Date: Mon Apr 4 13:20:02 2011 +0300

1702

1703

[l10n] Updated Estonian translation

1704

1705

po/et.po | 13 ++++++++++---

1706

1 files changed, 10 insertions(+), 3 deletions(-)

1707

1708

commit 94c471284d48d0a76aa91bf685474ffb8afd9f82

1709

Author: Baris Cicek <baris@teamforce.name.tr>

1710

Date: Mon Apr 4 08:08:43 2011 +0300

1711

1712

Updated Turkish translation

1713

1714

po/tr.po | 3552

1715

+++++++++++++++++++++++++++++++++++++++++++-------------------

1716

1 files changed, 2465 insertions(+), 1087 deletions(-)

1717

1718

commit c4d472673077829a974c57f48bc9f6650adf42b0

1719

Author: OKANO Takayoshi <kano@na.rim.or.jp>

1720

Date: Mon Apr 4 13:29:44 2011 +0900

1721

1722

Updated Japanese translation

1723

1724

po/ja.po | 1720

1725

+++++++++++++++++++++++++++++++++++++-------------------------

1726

1 files changed, 1041 insertions(+), 679 deletions(-)

1727

1728

commit 83a11e57bc0d48517ec933eb501345f9b4f32618

1729

Author: Wolfgang Stöggl <c72578@yahoo.de>

1730

Date: Sun Apr 3 21:56:53 2011 +0200

1731

1732

[l10n] Updated German doc translation, umlauts fixed

1733

1734

help/de/de.po | 790

1735

+++++++++++++++++++++++++++++----------------------------

1736

1 files changed, 404 insertions(+), 386 deletions(-)

1737

1738

commit fae3a5b7cc32c9812ef19cdef16eb4af64e78c1b

1739

Author: Jordi Serratosa <serratosa@gmail.com>

1740

Date: Sun Apr 3 21:08:00 2011 +0200

1741

1742

[l10n]Fixes on Catalan translation

1743

1744

po/ca.po | 60

1745

++++++++++++++++++++++++++++++------------------------------

1746

1 files changed, 30 insertions(+), 30 deletions(-)

1747

1748

commit f8a706890eb0e3e10151bbabb12a6b18ddcc6db0

1749

Author: Wolfgang Stöggl <c72578@yahoo.de>

1750

Date: Sun Apr 3 21:02:29 2011 +0200

1751

1752

[l10n] Updated German translation, umlauts fixed

1753

1754

po/de.po | 10 +++++-----

1755

1 files changed, 5 insertions(+), 5 deletions(-)

1756

1757

commit dd236139e7d5772268c4d9f930655e0d38a94238

1758

Author: George Stefanakis <george.stefanakis@gmail.com>

1759

Date: Sun Apr 3 21:18:35 2011 +0300

1760

1761

l10n: Updated Greek translation for empathy

1762

1763

po/el.po | 644

1764

+++++++++++++++++++++++++++++++++++---------------------------

1765

1 files changed, 366 insertions(+), 278 deletions(-)

1766

1767

commit 54efb4637d6e1d0ce4cf780a86c28406529f249b

1768

Author: Kenneth Nielsen <k.nielsen81@gmail.com>

1769

Date: Sun Apr 3 17:44:28 2011 +0200

1770

1771

Updated Danish translation

1772

1773

po/da.po | 1734

1774

++++++++++++++++++++++++++++++++++++--------------------------

1775

1 files changed, 1000 insertions(+), 734 deletions(-)

1776

1777

commit 5b43017b00397e024ea2dbf4a4dbf64b81a656f6

1778

Author: Rodrigo Padula de Oliveira <contato@rodrigopadula.com>

1779

Date: Sun Apr 3 09:41:13 2011 -0400

1780

1781

Updated Brazilian Portuguese translation. Reviewed by Djavan Fagundes.

1782

1783

po/pt_BR.po | 1660

1784

++++++++++++++++++++++++++++++++++-------------------------

1785

1 files changed, 958 insertions(+), 702 deletions(-)

1786

1787

commit 1fb1ef5c1caeda184312047b78da3aacf6e09d0a

1788

Author: Jorge González <jorgegonz@svn.gnome.org>

1789

Date: Sat Apr 2 21:04:35 2011 +0200

1790

1791

Updated Spanish translation

1792

1793

help/es/es.po | 42 ++++++++++++++++++++++++++----------------

1794

1 files changed, 26 insertions(+), 16 deletions(-)

1795

1796

commit c81f08fb5baebdd855089f05828f1c68fbc74893

1797

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

1798

Date: Wed Mar 30 09:51:29 2011 +0200

1799

1800

set a category on presence notifications

1801

1802

src/empathy-event-manager.c | 6 ++++--

1803

src/empathy-event-manager.h | 3 ++-

1804

src/empathy-notifications-approver.c | 8 ++++++--

1805

3 files changed, 12 insertions(+), 5 deletions(-)

1806

1807

commit aaf4798dd5eb270c95964441cf29768e580ef80b

1808

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

1809

Date: Tue Mar 29 10:07:01 2011 +0200

1810

1811

set a category on chat related notifications

1812

1813

That can be used by the Shell to filter out notifications it's

1814

handling itself

1815

directly (#645932).

1816

1817

libempathy-gtk/empathy-notify-manager.h | 1 +

1818

src/empathy-notifications-approver.c | 25 +++++++++++++++++++++++++

1819

2 files changed, 26 insertions(+), 0 deletions(-)

1820

1821

commit dfc65cb90ac55e7b84a4213356dbaec9a6ec6b9a

1822

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

1823

Date: Tue Mar 29 09:48:22 2011 +0200

1824

1825

set urgency hint on urgent notifications

1826

1827

This will ensure that they stay visible in the Shell and that

1828

their actions

1829

buttons are displayed as well (#645932).

1830

1831

src/empathy-notifications-approver.c | 25 +++++++++++++++++++++++++

1832

1 files changed, 25 insertions(+), 0 deletions(-)

1833

1834

commit ae4b21495c6a89feab8733f5dcd0480e54f2a69d

1835

Author: Leonid Kanter <leon@asplinux.ru>

1836

Date: Fri Apr 1 18:17:47 2011 +0300

1837

1838

applied patch from https://bugzilla.gnome.org/show_bug.cgi?id=645870

1839

1840

po/ru.po | 44 ++++++++++++++++++++++++++------------------

1841

1 files changed, 26 insertions(+), 18 deletions(-)

1842

1843

commit f572cd37d07e92fbe6e38136d537f5b2b35af519

1844

Author: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>

1845

Date: Fri Apr 1 20:25:54 2011 +0700

1846

1847

Updated Vietnamese translation

1848

1849

po/vi.po | 676

1850

++++++++++++++++++++++++--------------------------------------

1851

1 files changed, 264 insertions(+), 412 deletions(-)

1852

1853

commit aeefb7d2d3923afde063e0b732b3fa4f2c601add

1854

Author: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>

1855

Date: Fri Apr 1 19:36:03 2011 +0700

1856

1857

po/vi.po: import from Damned Lies

1858

1859

po/vi.po | 3549

1860

+++++++++++++++++++++++++++++++++++++++++---------------------

1861

1 files changed, 2356 insertions(+), 1193 deletions(-)

1862

1863

commit 41e332ab54dfdc11e69eee80ca7e3041a89d9923

1864

Author: Hendrik Richter <hendrikr@gnome.org>

1865

Date: Fri Apr 1 12:02:53 2011 +0200

1866

1867

Added translated German screenshots.

1868

1869

help/de/de.po | 25 ++++++++++++-------------

1870

1 files changed, 12 insertions(+), 13 deletions(-)

1871

1872

commit 264d6b3e2894e667a18c56eee25e881c7ff068fc

1873

Author: Hendrik Richter <hendrikr@gnome.org>

1874

Date: Fri Apr 1 11:58:20 2011 +0200

1875

1876

Added translated German screenshots.

1877

1878

help/de/figures/empathy-main-window.png | Bin 8924 -> 49766 bytes

1879

1 files changed, 0 insertions(+), 0 deletions(-)

1880

1881

commit d3222e8126fca4ea0a84c42fde7f847d9449ffe8

1882

Author: Hendrik Richter <hendrikr@gnome.org>

1883

Date: Fri Apr 1 11:55:52 2011 +0200

1884

1885

Added translated German screenshots.

1886

1887

help/de/figures/empathy-new-account.png | Bin 15901 -> 0 bytes

1888

1 files changed, 0 insertions(+), 0 deletions(-)

1889

1890

commit b82b1b9889a2711a37c6c4470b27af069c65a5ff

1891

Author: Sweta Kothari <swkothar@redhat.com>

1892

Date: Fri Apr 1 14:14:04 2011 +0530

1893

1894

Updated Gujarati Translations

1895

1896

po/gu.po | 1265

1897

++++++++++++++++++++++++++++++--------------------------------

1898

1 files changed, 619 insertions(+), 646 deletions(-)

1899

1900

commit 1088e62b5db25c12e1c850707d493ec571174317

1901

Author: Mario Blättermann <mariobl@gnome.org>

1902

Date: Fri Apr 1 08:57:29 2011 +0200

1903

1904

[l10n] Updated German doc translation

1905

1906

help/de/de.po | 656

1907

++++-----------------------------------------------------

1908

1 files changed, 43 insertions(+), 613 deletions(-)

1909

1910

commit f2c42001e687fbdcbc0a1472a71165728d4313f6

1911

Author: Shaun McCance <shaunm@gnome.org>

1912

Date: Thu Mar 31 22:14:21 2011 -0400

1913

1914

help/C/figures: Icon and screenshot updates

1915

1916

help/C/figures/available.png | Bin 689 -> 859 bytes

1917

help/C/figures/away.png | Bin 538 -> 770 bytes

1918

help/C/figures/busy.png | Bin 616 -> 893 bytes

1919

help/C/figures/empathy-logo.png | Bin 1813 -> 1640 bytes

1920

help/C/figures/empathy-main-window.png | Bin 7703 -> 27421 bytes

1921

help/C/figures/offline.png | Bin 405 -> 863 bytes

1922

6 files changed, 0 insertions(+), 0 deletions(-)

1923

1924

commit 3a0570577e5c1c5e01379887d0064aa43fd19efa

1925

Author: Branko Kokanović <branko.kokanovic@gmail.com>

1926

Date: Thu Mar 31 01:38:53 2011 +0200

1927

1928

Updated Serbian translation

1929

1930

po/sr.po | 1742

1931

+++++++++++++++++++++++++++++++++-----------------------

1932

po/sr@latin.po | 1742

1933

+++++++++++++++++++++++++++++++++-----------------------

1934

2 files changed, 2086 insertions(+), 1398 deletions(-)

1935

1936

commit 258307b49b00f853be61b50c58434e873e7837fa

1937

Author: Inaki Larranaga Murgoitio <dooteo@zundan.com>

1938

Date: Wed Mar 30 19:49:31 2011 +0200

1939

1940

Updated Basque language

1941

1942

po/eu.po | 188

1943

+++++++++++++++++++++++++++++---------------------------------

1944

1 files changed, 88 insertions(+), 100 deletions(-)

1945

1946

commit a67b3d4692546def274d7af1b41c498f19c1c9c4

1947

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

1948

Date: Wed Mar 30 13:46:48 2011 +0200

1949

1950

empathy_chat_window_present_chat: no need to call show_all on

1951

the window

1952

1953

empathy_window_present_with_time() called later in this function

1954

will do it

1955

for us.

1956

1957

This has the nice side effect of avoid to display the window before

1958

resizing

1959

it and do making it look bad (#638951).

1960

1961

src/empathy-chat-window.c | 1 -

1962

1 files changed, 0 insertions(+), 1 deletions(-)

1963

1964

commit 671e4e196414bd4bf7f25ef75458c118a93c4640

1965

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

1966

Date: Wed Mar 30 11:18:40 2011 +0200

1967

1968

move the Enabled translator comment just before the string

1969

1970

If not, gettext doesn't find it...

1971

1972

libempathy-gtk/empathy-account-widget.c | 4 ++--

1973

1 files changed, 2 insertions(+), 2 deletions(-)

1974

1975

commit 97eacb399329265dd353c14e3f9bb0884b43e435

1976

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

1977

Date: Wed Mar 30 10:43:51 2011 +0200

1978

1979

givve translators context for the 'Unknown' string

1980

1981

libempathy/empathy-utils.c | 1 +

1982

src/empathy-streamed-media-window.c | 4 ++++

1983

2 files changed, 5 insertions(+), 0 deletions(-)

1984

1985

commit 58f30b2d38b13d3cf3cc945766d86a2e15de5926

1986

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

1987

Date: Wed Mar 30 10:36:51 2011 +0200

1988

1989

give translators context for the 'Enabled' checkbox (#646131)

1990

1991

libempathy-gtk/empathy-account-widget.c | 2 ++

1992

1 files changed, 2 insertions(+), 0 deletions(-)

1993

1994

commit 24017811832ecfb91b27b04a0bd2e131716f3659

1995

Author: Pavol Klačanský <pavol@klacansky.com>

1996

Date: Tue Mar 29 17:44:47 2011 +0200

1997

1998

Added Slovak translation

1999

2000

po/LINGUAS | 1 +

2001

po/sk.po | 4371

2002

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

2003

2 files changed, 4372 insertions(+), 0 deletions(-)

2004

2005

commit e833fbd01588bbaf8a3c099ce24b137a7b3ebf5e

2006

Author: Cosimo Cecchi <cosimoc@gnome.org>

2007

Date: Mon Mar 28 16:27:01 2011 -0400

2008

2009

ft-manager: make sure the scrolled window expands in the dialog height

2010

2011

GTK+ 3 changed some packing defaults of GtkDialog, so this needs to be

2012

done explicitly here.

2013

2014

https://bugzilla.gnome.org/show_bug.cgi?id=646010

2015

2016

src/empathy-ft-manager.ui | 1 +

2017

1 files changed, 1 insertions(+), 0 deletions(-)

2018

2019

commit 42d8206c772865ab8229f01e76d51f7690435a50

2020

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

2021

Date: Tue Mar 29 15:08:59 2011 +0200

2022

2023

don't format header of presence notifications (#646097)

2024

2025

According to the spec [1], only the Body can be formated.

2026

2027

Furthermore, the Shell doesn't support such formating in the header.

2028

2029

[1] http://www.galago-project.org/specs/notification/0.9/x161.html

2030

2031

src/empathy-event-manager.c | 14 ++++----------

2032

1 files changed, 4 insertions(+), 10 deletions(-)

2033

2034

commit fd5c50d89b88d0b62692aaf85252cf61eeba3341

2035

Author: Luca Ferretti <lferrett@gnome.org>

2036

Date: Wed Mar 23 16:42:56 2011 +0100

2037

2038

Use /org/gnome as starting path for schemas

2039

2040

data/org.gnome.Empathy.gschema.xml.in | 16 ++++++++--------

2041

1 files changed, 8 insertions(+), 8 deletions(-)

2042

2043

commit a71daa64a4d29b52ea772fed376a9a7422707ff6

2044

Author: Inaki Larranaga Murgoitio <dooteo@zundan.com>

2045

Date: Tue Mar 29 10:26:56 2011 +0200

2046

2047

Updated Basque language

2048

2049

po/eu.po | 1221

2050

+++++++++++++++++++++++++++++++++++---------------------------

2051

1 files changed, 694 insertions(+), 527 deletions(-)

2052

2053

commit 13a84a5541f97658873d360fd6caaffaeaf2a614

2054

Author: Hannie Dumoleyn <lafeber-dumoleyn2@zonnet.nl>

2055

Date: Mon Mar 28 20:08:21 2011 +0200

2056

2057

Updated Dutch translation by Hannie Dumoleyn

2058

2059

po/nl.po | 1681

2060

++++++++++++++++++++++++++++++++++++--------------------------

2061

1 files changed, 986 insertions(+), 695 deletions(-)

2062

2063

commit e0a3c2812f535f411a801baafc3e08ec1c82bd50

2064

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

2065

Date: Mon Mar 28 13:00:53 2011 +0200

2066

2067

remove released flag

2068

2069

configure.ac | 2 +-

2070

1 files changed, 1 insertions(+), 1 deletions(-)

2071

2072

commit 8f2225aa7f24ebcc3bf25943591d01e62a7a4e7c

2073

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

2074

Date: Mon Mar 28 12:42:22 2011 +0200

2075

2076

prepare 2.91.93

2077

2078

NEWS | 24 ++++++++++++++++++++++++

2079

configure.ac | 4 ++--

2080

2 files changed, 26 insertions(+), 2 deletions(-)

2081

2082

commit 4a662ab1fc168a3868fa6f83ecb6845a6bb1bf37

2083

Author: Rajesh Ranjan <rranjan@redhat.com>

2084

Date: Mon Mar 28 14:37:55 2011 +0530

2085

2086

hindi updated

2087

2088

po/hi.po | 3634

2089

+++++++++++++++++++++++++++++++++++++++++++-------------------

2090

1 files changed, 2545 insertions(+), 1089 deletions(-)

2091

2092

commit 3faa1f894ae25830ba4fbdf4d8d7f016f28cbcdf

2093

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

2094

Date: Wed Mar 23 15:01:54 2011 +0100

2095

2096

event-manager: only display incoming messages in notification

2097

2098

If not, we display outgoing ones as well if the user uses Shell's

2099

message tray

2100

to reply.

2101

2102

src/empathy-event-manager.c | 9 ++++++++-

2103

1 files changed, 8 insertions(+), 1 deletions(-)

2104

2105

commit 36f079ca48db4727b237ea471f13f7593c8e1b71

61

2106

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

62

2107

Date: Thu Mar 24 15:00:37 2011 +0100

63

2108

73

2118

libempathy-gtk/empathy-theme-adium.c | 13 +++++++++----

74

2119

1 files changed, 9 insertions(+), 4 deletions(-)

75

2120

76

commit a25c50bfacbf3dc5e4e338aac3f7842b28cb9ef7

77

Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

78

Date: Thu Mar 24 12:13:35 2011 +0000

79

80

Clarify the wording to indicate it's all about accounts

81

82

libempathy-gtk/empathy-individual-dialogs.c | 11 ++++++++---

83

1 files changed, 8 insertions(+), 3 deletions(-)

84

85

commit 7b7363be0b28fcf89502036eea4d653e2244f827

2121

commit 3935bc1bc5c5da553f74eb2db75d0a7f1444bc6d

2122

Author: Abduxukur Abdurixit <abdurixit@gmail.com>

2123

Date: Sun Mar 27 19:18:36 2011 +0200

2124

2125

Added UG translation

2126

2127

po/ug.po | 1091

2128

+++++++++++++++++++++++++++++++++++--------------------------

2129

1 files changed, 626 insertions(+), 465 deletions(-)

2130

2131

commit 3f93ca5601789155d84adfe42028ffa984a19272

2132

Author: Žygimantas Beručka <zygis@gnome.org>

2133

Date: Sun Mar 27 19:34:29 2011 +0300

2134

2135

Updated Lithuanian translation

2136

2137

po/lt.po | 364

2138

+++++++++++++++++++++++++++++++++++++++-----------------------

2139

1 files changed, 232 insertions(+), 132 deletions(-)

2140

2141

commit cc31eef5cb583f5b521a754ffc9af0efbfb2a442

2142

Author: Dr.T.Vasudevan <agnihot3@gmail.com>

2143

Date: Sun Mar 27 15:31:25 2011 +0530

2144

2145

Updated Tamil translation

2146

2147

po/ta.po | 1463

2148

++++++++++++++++++++++++++++++--------------------------------

2149

1 files changed, 701 insertions(+), 762 deletions(-)

2150

2151

commit 29c5768b6eef66ba95baeff2d167b76716e8f4d7

2152

Author: Krasimir Chonov <mk2616@abv.bg>

2153

Date: Sat Mar 26 06:40:04 2011 +0200

2154

2155

Updated Bulgarian translation

2156

2157

po/bg.po | 789

2158

+++++++++++++++++++++++++++++++++++---------------------------

2159

1 files changed, 445 insertions(+), 344 deletions(-)

2160

2161

commit eae49dc6444e0e7a834c6d40fe79735f0ed2f23c

2162

Author: Aron Xu <aronxu@gnome.org>

2163

Date: Fri Mar 25 04:09:07 2011 +0000

2164

2165

Update Simplified Chinese translation.

2166

2167

po/zh_CN.po | 257

2168

+++++++++++++++++++++++++++++------------------------------

2169

1 files changed, 128 insertions(+), 129 deletions(-)

2170

2171

commit 8f13a8e6f7cd8ab9ed79c8f63ba977ba3069627d

2172

Author: A S Alam <aalam@users.sf.net>

2173

Date: Fri Mar 25 08:31:19 2011 +0530

2174

2175

update tranlation for Punjabi by A S Alam

2176

2177

po/pa.po | 296

2178

++++++++++++++++++++++++++++++++++++++++----------------------

2179

1 files changed, 193 insertions(+), 103 deletions(-)

2180

2181

commit 2e24da05f2b400423be9c87fbfe5e60329b5a7f7

2182

Author: Sandeep Shedmake <sshedmak@redhat.com>

2183

Date: Thu Mar 24 20:58:49 2011 +0530

2184

2185

Updated Marathi Translations

2186

2187

po/mr.po | 3634

2188

++++++++++++++++++++++++++++++++++++++++++--------------------

2189

1 files changed, 2494 insertions(+), 1140 deletions(-)

2190

2191

commit 2ba5f4fdf1d4ab286da84d9f442eb714be1dafd6

2192

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

2193

Date: Thu Mar 24 10:41:14 2011 +0100

2194

2195

Calendar widget should be disabled if no contact selected (#645582)

2196

2197

libempathy-gtk/empathy-log-window.c | 9 +++++++++

2198

libempathy-gtk/empathy-log-window.ui | 1 +

2199

2 files changed, 10 insertions(+), 0 deletions(-)

2200

2201

commit 17df132d41f12c7003dbeda74a7de2cb598b64f9

2202

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

2203

Date: Thu Mar 24 13:13:02 2011 +0100

2204

2205

account_chooser_filter_ready_cb: don't unref the account

2206

2207

Our ref is already released in filter_result_callback_data_free

2208

(#645672).

2209

2210

libempathy-gtk/empathy-account-chooser.c | 1 -

2211

1 files changed, 0 insertions(+), 1 deletions(-)

2212

2213

commit b7a5f478cc1e3828504f653b4a66b22f28523cb7

86

2214

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

87

2215

Date: Wed Mar 23 14:27:19 2011 +0100

88

2216

95

2223

src/empathy-chat-window.c | 2 +-

96

2224

1 files changed, 1 insertions(+), 1 deletions(-)

97

2225

98

commit 93519f10b6c247017920a39fc0122c3310bfe062

2226

commit 26ac10366710eb6e60539421ccf88c5e6833a58b

99

2227

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

100

2228

Date: Wed Mar 23 14:26:29 2011 +0100

101

2229

107

2235

libempathy/empathy-tp-chat.c | 2 +-

108

2236

1 files changed, 1 insertions(+), 1 deletions(-)

109

2237

110

commit 97167291ee0e9436dd9282d0d8d673f6ed2d10cf

111

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

112

Date: Tue Feb 1 13:47:58 2011 +0000

113

114

Update tools from telepathy-glib

115

116

extensions/Makefile.am | 12 +-

117

tools/Makefile.am | 14 +-

118

tools/c-constants-gen.py | 84 +++++---

119

tools/check-coding-style.mk | 4 +-

120

tools/git-which-branch.sh | 25 +++

121

tools/glib-client-gen.py | 283 +++++++++++++++----------

122

tools/glib-errors-check-gen.py | 58 +++++

123

tools/glib-errors-enum-body-gen.py | 62 ------

124

tools/glib-errors-enum-header-gen.py | 75 -------

125

tools/glib-errors-str-gen.py | 82 +++++++

126

tools/glib-ginterface-gen.py | 293 +++++++++++++++++---------

127

tools/glib-gtypes-generator.py | 214 ++++++++++++-------

128

tools/glib-interfaces-gen.py | 138 +++++++++++--

129

tools/gobject-foo.py | 23 ++-

130

tools/identity.xsl | 7 -

131

tools/libglibcodegen.py | 5 +-

132

tools/libtpcodegen.py | 36 +---

133

tools/make-release-mail.py | 76 +++++++

134

tools/manager-file.py | 175 +++++++++++++++

135

tools/shave.mk | 1 +

136

tools/telepathy-glib.supp | 390

137

++++++++++++++++++++++++++++++++++

138

tools/test-wrapper.sh | 30 +++

139

tools/valgrind.mk | 13 ++

140

tools/with-session-bus.sh | 10 +-

141

tools/xincludator.py | 39 ++++

142

25 files changed, 1623 insertions(+), 526 deletions(-)

143

144

commit 2bddc2dae8b00f034164096d7a981015d8690cf7

145

Author: Milo Casagrande <milo@ubuntu.com>

146

Date: Wed Mar 23 17:19:17 2011 +0100

147

148

[l10n] Updated Italian translation

149

150

po/it.po | 1668

151

+++++++++++++++++++++++++++++++-------------------------------

152

1 files changed, 834 insertions(+), 834 deletions(-)

153

154

commit 71403238333ea70c8ffb6b58a066eef5715c29a7

155

Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

156

Date: Wed Mar 23 15:00:08 2011 +0000

157

158

Minimize the scope in which we use TpyCallChannel

159

160

src/empathy-call-window.c | 13 +++++++------

161

1 files changed, 7 insertions(+), 6 deletions(-)

162

163

commit 213cdb60921d87364db80d4b7f645d4fd8c5f65b

164

Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

165

Date: Wed Mar 23 14:51:27 2011 +0000

166

167

Fix indentation

168

169

src/empathy-status-icon.c | 13 ++++++-------

170

1 files changed, 6 insertions(+), 7 deletions(-)

171

172

commit 3fcdbfb8bf8ccf9b510e977ad8847dd0639def4b

173

Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

174

Date: Wed Mar 23 14:45:56 2011 +0000

175

176

Prepare the video input pipeline when there is an initial content

177

178

src/empathy-call-window.c | 22 +++++++++++++++++-----

179

1 files changed, 17 insertions(+), 5 deletions(-)

180

181

commit e3849f0476977eac243b5baafd10b3075f1ceee1

182

Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

183

Date: Wed Mar 23 13:09:09 2011 +0000

184

185

Wait for the channel to be ready before handling it

186

187

src/empathy-call-factory.c | 51

188

+++++++++++++++++++++++++++++++++++++-------

189

1 files changed, 43 insertions(+), 8 deletions(-)

190

191

commit bf7d9036e61d2006c93a434b15e0896c2282fbdb

192

Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

193

Date: Tue Mar 22 18:28:33 2011 +0000

194

195

Use a new id for accepting without video

196

197

src/empathy-status-icon.c | 2 +-

198

1 files changed, 1 insertions(+), 1 deletions(-)

199

200

commit 0ed251dffae40e2585a0e1fd96243ce713c84480

201

Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

202

Date: Tue Mar 22 16:41:51 2011 +0000

203

204

Also add Answer with video to the notification dialogs

205

206

src/empathy-event-manager.c | 1 +

207

src/empathy-event-manager.h | 1 +

208

src/empathy-status-icon.c | 36 +++++++++++++++++++++++++++++++++++-

209

3 files changed, 37 insertions(+), 1 deletions(-)

210

211

commit 19c4cd220e3f21147cb4c73fa0d62de2c40eaf7f

212

Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

213

Date: Tue Mar 22 16:40:33 2011 +0000

214

215

Add Answer with video to the default dialogs

216

217

We should be able to answer calls with or without video. This

218

patch only

219

implements that for Call type channels, but for clarity have ``Answer

220

with video'' as the only button on SM channels for video calls to be

221

sure it's clear to the user what to expect

222

223

src/empathy-event-manager.c | 38 +++++++++++++++++++++++++++++---------

224

1 files changed, 29 insertions(+), 9 deletions(-)

225

226

commit a108a3deab6cf83a39b8f859b25ea7ea86ad90c7

227

Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

228

Date: Tue Mar 22 13:18:37 2011 +0000

229

230

Follow the sending state of the channel to determine whether we

231

should send video

232

233

src/empathy-call-window.c | 22 ++++++++++++++--------

234

1 files changed, 14 insertions(+), 8 deletions(-)

235

236

commit 078609cfc4e6edf27f2bdbd3b27fb9557a9f2a90

237

Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

238

Date: Wed Mar 23 14:52:18 2011 +0000

239

240

Update yell snapshot

241

242

telepathy-yell | 2 +-

243

1 files changed, 1 insertions(+), 1 deletions(-)

244

245

commit 1d431d242ed66a5ef3640fc927ffdeaaac14a882

246

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

247

Date: Wed Mar 23 15:46:46 2011 +1100

248

249

Really remove user from the blocked list when readding them

250

251

Previous commit in 161c9a2381a9c2df45ef8df81e8b680ce41b5c64 would

252

have worked,

253

if not for Folks. And it turns out the CM I tested against already

254

happens to

255

forget the blocked status if you readd a contact, so it looked like

256

it was

257

working.

258

259

Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=645487

260

261

libempathy/empathy-individual-manager.c | 14 ++++++++++++++

262

1 files changed, 14 insertions(+), 0 deletions(-)

263

264

commit f9c69dcf82745e7d82673c5d11f8969fa2709eb7

265

Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

266

Date: Tue Mar 22 19:57:25 2011 +0000

267

268

Cope with gtk_icon_theme_lookup_icon returning NULL

269

270

libempathy-gtk/empathy-ui-utils.c | 3 +++

271

1 files changed, 3 insertions(+), 0 deletions(-)

272

273

commit c4bfd9ec3f2df6e38b66023d82bc6c17c8ed4348

274

Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

275

Date: Tue Mar 22 19:41:16 2011 +0000

276

277

Give the FilterResultData a reference to account

278

279

This partially reverts the regression introduce in

280

c5220a248d7626129eadce95a606eb4157aafe71, but gives a more explicit

281

reference to the data structure which will hopefully make the

282

code more

283

clear

284

285

libempathy-gtk/empathy-account-chooser.c | 2 +-

286

1 files changed, 1 insertions(+), 1 deletions(-)

287

288

commit 6642163b272bd6a008e2ee412491ad23fe964321

289

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

290

Date: Tue Mar 22 16:59:26 2011 +0000

291

292

Fix use of uninitialized variable

293

294

libempathy/empathy-tls-verifier.c | 4 ++--

295

1 files changed, 2 insertions(+), 2 deletions(-)

296

297

commit 8e416d8de3b381a7d869e463125fc938d43820bb

298

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

299

Date: Tue Mar 22 14:35:34 2011 +0000

2238

commit 1da2f83f35972269f9e4712ecee01ed0ad5a55a2

2239

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

2240

Date: Wed Mar 23 09:53:17 2011 +0100

2241

2242

remove released flag

2243

2244

configure.ac | 2 +-

2245

1 files changed, 1 insertions(+), 1 deletions(-)

2246

2247

commit 194f9646a5abb7d599d5624e7081cb6300323c44

2248

Author: Mario Blättermann <mariobl@gnome.org>

2249

Date: Tue Mar 22 22:21:45 2011 +0100

2250

2251

[l10n] Updated German translation

2252

2253

po/de.po | 1115

2254

+++++++++++++++++++++++++++++++++++---------------------------

2255

1 files changed, 637 insertions(+), 478 deletions(-)

2256

2257

commit 36bf86cda2f19c44fb09f2254f098ca16ed0c86b

2258

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

2259

Date: Tue Mar 22 16:36:49 2011 +0100

2260

2261

prepare 2.91.92

2262

2263

NEWS | 44 ++++++++++++++++++++++++++++++++++++++++++++

2264

configure.ac | 6 +++---

2265

2 files changed, 47 insertions(+), 3 deletions(-)

2266

2267

commit 5de055b29a5d04c5fc9220321a3f18fd30ce85d7

2268

Merge: e68f144 91ddb84

2269

Author: Stef Walter <stefw@collabora.co.uk>

2270

Date: Tue Mar 22 17:16:35 2011 +0100

2271

2272

Merge branch 'unbreak-tests'

2273

2274

commit 91ddb848264326ad2cec68ca750424b1649e7f64

2275

Author: Stef Walter <stefw@collabora.co.uk>

2276

Date: Tue Mar 22 17:10:32 2011 +0100

2277

2278

Fix calls to empathy_tls_verifier_new() in tests.

2279

2280

tests/empathy-tls-test.c | 87

2281

++++++++++++++++++++++++++++++++++++++++------

2282

1 files changed, 76 insertions(+), 11 deletions(-)

2283

2284

commit e68f14484d688716bb3d09fbc9ee4fa5ad17db9e

2285

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

2286

Date: Tue Mar 22 15:25:26 2011 +0000

300

2287

301

2288

Don't try to block personas that don't support blocking

302

2289

303

https://bugzilla.gnome.org/show_bug.cgi?id=645488

304

305

libempathy/empathy-individual-manager.c | 15 +++++++++++----

306

1 files changed, 11 insertions(+), 4 deletions(-)

307

308

commit ba40b4cdae9aae29b6b2e711431e38d63207851c

309

Author: Stef Walter <stefw@collabora.co.uk>

310

Date: Tue Mar 22 16:20:30 2011 +0100

311

312

Set the extra-certificate-identities in EmpathyAccountsDialog

313

314

https://bugzilla.gnome.org/show_bug.cgi?id=645133

315

316

src/empathy-accounts-dialog.c | 11 +++++++++++

317

1 files changed, 11 insertions(+), 0 deletions(-)

318

319

commit d5ee1dea31080835f3c1ca091c58769fc989b037

320

Author: Stef Walter <stefw@collabora.co.uk>

321

Date: Tue Mar 22 16:08:34 2011 +0100

2290

libempathy/empathy-individual-manager.c | 11 ++++++++---

2291

1 files changed, 8 insertions(+), 3 deletions(-)

2292

2293

commit 6c943efd9aabd9d0d8674c3c58d2e58efdb412f6

2294

Author: Stef Walter <stefw@collabora.co.uk>

2295

Date: Mon Mar 21 10:58:31 2011 +0100

322

2296

323

2297

Only add the 'extra-certificate-identities' parameter if gabble

324

2298

supports it.

325

2299

326

libempathy/empathy-account-settings.c | 7 +++++++

327

libempathy/empathy-account-settings.h | 4 ++++

328

src/empathy-account-assistant.c | 10 +++++++---

329

3 files changed, 18 insertions(+), 3 deletions(-)

2300

libempathy-gtk/empathy-protocol-chooser.c | 8 ++++++--

2301

libempathy/empathy-account-settings.c | 7 +++++++

2302

libempathy/empathy-account-settings.h | 4 ++++

2303

3 files changed, 17 insertions(+), 2 deletions(-)

330

2304

331

commit af15e92f0ae08e321a46e21e92500bf47d060b44

2305

commit 6cd0e1c0916e69eb15192c6bdbf1b5d7ee599f5a

332

2306

Author: Stef Walter <stefw@collabora.co.uk>

333

Date: Fri Mar 18 18:47:09 2011 +0100

2307

Date: Fri Mar 18 14:38:10 2011 +0100

334

2308

335

2309

Create GTalk accounts with extra-certificate-identities =

336

2310

'talk.google.com'

341

2315

342

2316

https://bugzilla.gnome.org/show_bug.cgi?id=645133

343

2317

344

src/empathy-account-assistant.c | 7 +++++++

2318

libempathy-gtk/empathy-protocol-chooser.c | 7 +++++++

345

2319

1 files changed, 7 insertions(+), 0 deletions(-)

346

2320

347

commit 48c53fdb5bfcf801fc3f8eadf11340b97cae003b

348

Author: Stef Walter <stefw@collabora.co.uk>

349

Date: Tue Mar 22 15:54:50 2011 +0100

350

351

Support building with libgcr 3.0

352

353

configure.ac | 3 +--

354

libempathy-gtk/gcr-simple-certificate.c | 2 +-

355

libempathy-gtk/gcr-simple-certificate.h | 2 +-

356

3 files changed, 3 insertions(+), 4 deletions(-)

357

358

commit 8b18f92aedef75ae557e879ddc4a60ce833d50d3

359

Author: Stef Walter <stefw@collabora.co.uk>

360

Date: Fri Mar 18 18:42:55 2011 +0100

361

362

Use ServerTLSConnection.ReferenceIdentities to check cert identity.

363

364

The certificate identity can be checked against more than just

365

one piece of information. Load and use all the reference identities

366

to check the identity of the certificate.

2321

commit 6c5affb1f943b6685a0ac63adcfff24b47be6e2e

2322

Merge: 5316d72 698675b

2323

Author: Stef Walter <stefw@collabora.co.uk>

2324

Date: Tue Mar 22 15:22:43 2011 +0100

2325

2326

Merge branch 'reference-identities'

2327

2328

Conflicts:

2329

libempathy/empathy-server-tls-handler.c

2330

2331

commit 698675bdc1fbc7e6e622be24e272df7e70f34716

2332

Author: Stef Walter <stefw@collabora.co.uk>

2333

Date: Tue Mar 22 15:13:33 2011 +0100

2334

2335

Use telepathy property constants in server EmpathyServerTLSHandler

367

2336

368

2337

https://bugzilla.gnome.org/show_bug.cgi?id=645119

369

2338

370

libempathy/empathy-server-tls-handler.c | 47

371

+++++++++++++++++++++++++++++-

372

libempathy/empathy-tls-verifier.c | 42

373

+++++++++++++++++++++++++--

374

libempathy/empathy-tls-verifier.h | 3 +-

375

src/empathy-auth-client.c | 6 +++-

376

4 files changed, 90 insertions(+), 8 deletions(-)

2339

libempathy/empathy-server-tls-handler.c | 8 ++++----

2340

1 files changed, 4 insertions(+), 4 deletions(-)

377

2341

378

commit 19d3ea612850bc3e2fabc387997e97ea11c89645

379

Merge: c54f625 965d241

2342

commit 5316d721a24d2c1c2496f751a4cf139d88e274c1

2343

Merge: e5bfa46 f357bd6

380

2344

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

381

Date: Tue Mar 22 14:55:16 2011 +0100

382

383

Merge branch 'stable-block-645504-2.34' into gnome-2-34

384

385

commit c54f6252a002ad3c7b02f7339c4e81d4c2249e94

2345

Date: Tue Mar 22 14:54:32 2011 +0100

2346

2347

Merge branch 'stable-block-645504'

2348

2349

commit e5bfa46e3a659aec01d328ab041a6e4ce1a5e446

386

2350

Author: Milo Casagrande <milo@ubuntu.com>

387

Date: Tue Mar 22 14:32:25 2011 +0100

2351

Date: Tue Mar 22 14:32:25 2011 +0100

388

2352

389

2353

Updated Italian translation

390

2354

392

2356

++++++++++++++++++++++++++++++++++++--------------------------

393

2357

1 files changed, 971 insertions(+), 711 deletions(-)

394

2358

395

commit f1f0b2c029a92d3a6bb70e8f9dcefd89e0da01dc

2359

commit 3bea79c93cd58333c4ccaee60afe98f861001afd

396

2360

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

397

Date: Mon Mar 7 11:31:48 2011 +0100

2361

Date: Mon Mar 7 11:31:48 2011 +0100

398

2362

399

2363

accounts_dialog_add_account: ensure that the selected account is

400

2364

still visible in the treeview

402

2366

src/empathy-accounts-dialog.c | 20 +++++++++++++++++++-

403

2367

1 files changed, 19 insertions(+), 1 deletions(-)

404

2368

405

commit baf46a1e06dbffd67facd46b0760b3a34a3dd1d2

2369

commit 0b9a9d0171d55523519249a55971c9f4f051dc4c

406

2370

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

407

Date: Mon Mar 7 11:05:23 2011 +0100

2371

Date: Mon Mar 7 11:05:23 2011 +0100

408

2372

409

2373

accounts_dialog_model_set_selected: use select_and_scroll_to_iter

410

2374

413

2377

src/empathy-accounts-dialog.c | 2 +-

414

2378

1 files changed, 1 insertions(+), 1 deletions(-)

415

2379

416

commit 347d200c0b02fd27ae23f2953806adc8b0b88d32

2380

commit 0ac4dcb553efbdd058a5b37ba948c1d542d87075

417

2381

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

418

Date: Mon Mar 7 11:03:33 2011 +0100

2382

Date: Mon Mar 7 11:03:33 2011 +0100

419

2383

420

2384

factor out select_and_scroll_to_iter()

421

2385

423

2387

+++++++++++++++++++++++--------------

424

2388

1 files changed, 23 insertions(+), 14 deletions(-)

425

2389

426

commit c628b0547ec2486841ed994674c9d10b66ca66dc

427

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

428

Date: Tue Mar 22 13:00:34 2011 +0100

429

430

re-enable /msg and /query commands (#645509)

431

432

This is a manual backport from master.

433

434

libempathy-gtk/empathy-chat.c | 62

435

+++++++++++++++++++++++++----------------

436

telepathy-yell | 2 +-

437

2 files changed, 39 insertions(+), 25 deletions(-)

438

439

commit 965d24177d640c781ad76c91dddddf253aeff727

440

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

441

Date: Tue Mar 22 11:39:23 2011 +0100

2390

commit bf2ef141ceb1515dfabfd07b29236e13d333c884

2391

Author: Cheng-Chia Tseng <pswo10680@gmail.com>

2392

Date: Tue Mar 22 19:21:39 2011 +0800

2393

2394

Updated Traditional Chinese translation(Hong Kong and Taiwan)

2395

2396

po/zh_HK.po | 827

2397

+++++++++++++++++++++++++++++++++--------------------------

2398

po/zh_TW.po | 827

2399

+++++++++++++++++++++++++++++++++--------------------------

2400

2 files changed, 932 insertions(+), 722 deletions(-)

2401

2402

commit f357bd611198d6156f3e58604729e24ad3366cea

2403

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

2404

Date: Tue Mar 22 11:39:23 2011 +0100

442

2405

443

2406

stop generating API for ContactBlocking

444

2407

445

.../Connection_Interface_Contact_Blocking.xml | 172

2408

.../Connection_Interface_Contact_Blocking.xml | 172

446

2409

--------------------

447

extensions/Makefile.am | 1 -

448

extensions/misc.xml | 1 -

2410

extensions/Makefile.am | 1 -

2411

extensions/misc.xml | 1 -

449

2412

3 files changed, 0 insertions(+), 174 deletions(-)

450

2413

451

commit 4de0f849b0af5d31c6745d2d15314aee2b418c0e

2414

commit 8b7056b27d71eb651bed271013ab3515b399cc83

452

2415

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

453

Date: Tue Mar 22 11:48:15 2011 +0100

2416

Date: Tue Mar 22 11:48:15 2011 +0100

454

2417

455

2418

Use stable API for ContactBlocking (#645504)

456

2419

457

2420

libempathy/empathy-tp-contact-list.c | 12 ++++++------

458

2421

1 files changed, 6 insertions(+), 6 deletions(-)

459

2422

460

commit ba02c6229ba7108e8f877ac3b7c3212b14cf5a19

2423

commit ce0a41ef7bd65f6c1ef5e96bb4317cf5cdf26fc5

461

2424

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

462

Date: Tue Mar 22 11:46:37 2011 +0100

2425

Date: Tue Mar 22 11:46:37 2011 +0100

463

2426

464

2427

depends on telepathy-glib 0.14.1

465

2428

468

2431

configure.ac | 2 +-

469

2432

1 files changed, 1 insertions(+), 1 deletions(-)

470

2433

471

commit 8d4d472ab00b533362d527972865a4f28f9d4986

472

Merge: c5220a2 161c9a2

473

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

474

Date: Tue Mar 22 09:58:48 2011 +0100

475

476

Merge remote-tracking branch 'danni/blocking-645487' into gnome-2-34

477

478

commit c5220a248d7626129eadce95a606eb4157aafe71

479

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

480

Date: Mon Mar 21 12:31:07 2011 +0100

2434

commit 1b68d34282947697e1c173456bdb35700dc0f19e

2435

Author: Dan Williams <dcbw@redhat.com>

2436

Date: Tue Mar 22 10:04:24 2011 +0100

2437

2438

Handle new NM 0.9 states (#644412)

2439

2440

libempathy/empathy-connectivity.c | 8 ++++++++

2441

1 files changed, 8 insertions(+), 0 deletions(-)

2442

2443

commit 5d27216d4ee76a9bb460b69370f205652a6d9c09

2444

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

2445

Date: Tue Mar 22 14:44:12 2011 +1100

2446

2447

Remove user from the blocked list when readding them

2448

2449

Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=645487

2450

2451

libempathy/empathy-tp-contact-list.c | 8 ++++++++

2452

1 files changed, 8 insertions(+), 0 deletions(-)

2453

2454

commit 17e2fea441df25d3b91597957744f172a0d80668

2455

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

2456

Date: Mon Mar 21 12:31:07 2011 +0100

481

2457

482

2458

account_chooser_update_iter: don't leak the TpAccount

483

2459

484

2460

libempathy-gtk/empathy-account-chooser.c | 2 ++

485

2461

1 files changed, 2 insertions(+), 0 deletions(-)

486

2462

487

commit 161c9a2381a9c2df45ef8df81e8b680ce41b5c64

488

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

489

Date: Tue Mar 22 14:44:12 2011 +1100

490

491

Remove user from the blocked list when readding them

492

493

Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=645487

494

495

libempathy/empathy-tp-contact-list.c | 8 ++++++++

496

1 files changed, 8 insertions(+), 0 deletions(-)

497

498

commit 8688c876cd65d1bb058c1ed2ab18256089cf5f07

2463

commit 4d795d822f9590c2916bfa64b4cbc3d536e3ad4a

499

2464

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

500

Date: Mon Mar 21 17:52:10 2011 +0000

2465

Date: Mon Mar 21 17:52:10 2011 +0000

501

2466

502

2467

Also show an avatar when blocking from a conversation

503

2468

505

2470

506

2471

libempathy-gtk/empathy-contact-dialogs.c | 11 +++++++++--

507

2472

libempathy-gtk/empathy-contact-dialogs.h | 1 +

508

libempathy-gtk/empathy-contact-menu.c | 5 ++++-

2473

libempathy-gtk/empathy-contact-menu.c | 5 ++++-

509

2474

3 files changed, 14 insertions(+), 3 deletions(-)

510

2475

511

commit bfcad7858e75c99a2cb6fa51a5fc47c473df23dc

2476

commit 9c4deab9ee56bd39de5f4828d774a4d1be59a7bb

2477

Author: Yuri Myasoedov <omerta13@yandex.ru>

2478

Date: Mon Mar 21 23:07:50 2011 +0300

2479

2480

Updated Russian translation

2481

2482

po/ru.po | 293

2483

+++++++++++++++++++++++++++++++++++++++++---------------------

2484

1 files changed, 193 insertions(+), 100 deletions(-)

2485

2486

commit 0b92a57a1c29bb3195345cec85b7ce6e19a29a02

2487

Author: Shankar Prasad <svenkate@redhat.com>

2488

Date: Mon Mar 21 16:12:50 2011 +0530

2489

2490

Updated kn translations

2491

2492

po/kn.po | 271

2493

++++++++++++++++++++++++++++++++++----------------------------

2494

1 files changed, 148 insertions(+), 123 deletions(-)

2495

2496

commit a8e558e10b1b5170346a75e1322f75d8ebad1662

512

2497

Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

513

Date: Mon Mar 21 09:27:00 2011 +0000

2498

Date: Sun Mar 20 12:44:51 2011 +0000

514

2499

515

2500

Fix some races in the chatroom joining code

516

2501

526

2511

and when

527

2512

the auto-connect options on a chatrooms change.

528

2513

529

Conflicts:

530

531

src/empathy.c

532

533

src/empathy.c | 69

534

+++++++++++++++++++++++++++++++-------------------------

535

1 files changed, 38 insertions(+), 31 deletions(-)

536

537

commit 23c00506586759589874434849fe7f83a5afa8e7

2514

src/empathy.c | 72

2515

++++++++++++++++++++++++++++++---------------------------

2516

1 files changed, 38 insertions(+), 34 deletions(-)

2517

2518

commit 79cf371093d1a1b0d9120a4bbcc5d73c7c67842d

2519

Author: Duarte Loreto <happyguy_pt@hotmail.com>

2520

Date: Mon Mar 21 00:19:03 2011 +0000

2521

2522

Updated Portuguese translation

2523

2524

po/pt.po | 747

2525

++++++++++++++++++++++++++++++++++---------------------------

2526

1 files changed, 416 insertions(+), 331 deletions(-)

2527

2528

commit 85bac3ba97a74efcc7c2a3ba835bd47431deddfb

2529

Author: Gil Forcada <gforcada@gnome.org>

2530

Date: Sun Mar 20 21:25:58 2011 +0100

2531

2532

[l10n]Updated Catalan translation

2533

2534

po/ca.po | 663

2535

++++++++++++++++++++++++++++++++++----------------------------

2536

1 files changed, 364 insertions(+), 299 deletions(-)

2537

2538

commit 24a0b04281688f4fc1b7696d9ca806f1bae661dc

2539

Author: Rudolfs Mazurs <rudolfs.mazurs@gmail.com>

2540

Date: Sun Mar 20 17:03:09 2011 +0200

2541

2542

Updated Latvian translation.

2543

2544

po/lv.po | 1299

2545

+++++++++++++++++++++++++++++++-------------------------------

2546

1 files changed, 659 insertions(+), 640 deletions(-)

2547

2548

commit 819b9a246ae94aff9e55a706f37fcc00e1f0bcf2

2549

Author: Kjartan Maraas <kmaraas@gnome.org>

2550

Date: Sun Mar 20 11:25:09 2011 +0100

2551

2552

Updated Norwegian bokmål translation

2553

2554

po/nb.po | 216

2555

+++++++++++++++++++++++++++++++-------------------------------

2556

1 files changed, 108 insertions(+), 108 deletions(-)

2557

2558

commit 5acdf1332d6af7d895745ffe60bce72d7f4e3b69

2559

Author: Kjartan Maraas <kmaraas@gnome.org>

2560

Date: Thu Mar 17 09:53:23 2011 +0100

2561

2562

Updated Norwegian bokmål translation

2563

2564

po/nb.po | 589

2565

++++++++++++++++++++++++++++++++++++--------------------------

2566

1 files changed, 339 insertions(+), 250 deletions(-)

2567

2568

commit 8e4b1bdae8815bc8e64eea6ec78592c50c413bc8

2569

Author: Aron Xu <aronxu@gnome.org>

2570

Date: Sat Mar 19 16:16:57 2011 +0000

2571

2572

Update Simplified Chinese translation.

2573

2574

po/zh_CN.po | 877

2575

+++++++++++++++++++++++++++++++----------------------------

2576

1 files changed, 463 insertions(+), 414 deletions(-)

2577

2578

commit 882505f1fe475d4ec325e86a4858850eb086d3b3

2579

Author: Piotr Drąg <piotrdrag@gmail.com>

2580

Date: Sat Mar 19 16:12:27 2011 +0100

2581

2582

Updated Polish translation

2583

2584

po/pl.po | 656

2585

+++++++++++++++++++++++++++++++++++---------------------------

2586

1 files changed, 368 insertions(+), 288 deletions(-)

2587

2588

commit 02922b22156fafc1c02a2e93cd2dee1394bb2f24

2589

Author: Dirgita <dirgitadevina@yahoo.co.id>

2590

Date: Sat Mar 19 22:09:44 2011 +0700

2591

2592

Updated Indonesian translation

2593

2594

po/id.po | 2710

2595

++++++++++++++++++++++++++++++++++++++++++--------------------

2596

1 files changed, 1831 insertions(+), 879 deletions(-)

2597

2598

commit 24741700bd129cd0a7a6da87f6335ac98caa0e60

2599

Author: Changwoo Ryu <cwryu@debian.org>

2600

Date: Sat Mar 19 22:11:38 2011 +0900

2601

2602

Updated Korean translation

2603

2604

po/ko.po | 460

2605

+++++++++++++++++++++++++++++++-------------------------------

2606

1 files changed, 233 insertions(+), 227 deletions(-)

2607

2608

commit 9ef9a7660d00fb00e59af3217f38da56e2d76884

2609

Author: Khaled Hosny <khaledhosny@eglug.org>

2610

Date: Sat Mar 19 02:56:20 2011 +0200

2611

2612

Updated Arabic translation

2613

2614

po/ar.po | 512

2615

+++++++++++++++++++++++++++++++-------------------------------

2616

1 files changed, 257 insertions(+), 255 deletions(-)

2617

2618

commit 6fc411c2e7a53eafe132c67c7ce430df665e5493

538

2619

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

539

Date: Fri Mar 18 21:41:08 2011 +0000

2620

Date: Fri Mar 18 21:00:21 2011 +0000

540

2621

541

2622

Use the right marshal file

542

2623

543

2624

libempathy-gtk/empathy-chat.c | 4 ++--

544

telepathy-yell | 2 +-

545

2 files changed, 3 insertions(+), 3 deletions(-)

546

547

commit c9e61ab462770ae75ab1ce18604300f94851a934

548

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

549

Date: Fri Mar 18 15:46:23 2011 +0000

550

551

Revert "Set an accelator on contact search"

552

553

This reverts commit 5f6fc105b14d1cb84745e2f60991a9010d10914b.

554

555

src/empathy-main-window.ui | 1 -

556

1 files changed, 0 insertions(+), 1 deletions(-)

557

558

commit 95fb28d259026214f5f2e3f79d11d73c780eb7af

2625

1 files changed, 2 insertions(+), 2 deletions(-)

2626

2627

commit c39a6c8faba251e0ef0bef64412fbd3ddd5c2ea2

559

2628

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

560

2629

Date: Fri Mar 18 14:39:06 2011 +0000

561

2630

564

2633

src/empathy-account-assistant.c | 9 ++++++---

565

2634

1 files changed, 6 insertions(+), 3 deletions(-)

566

2635

567

commit 5f6fc105b14d1cb84745e2f60991a9010d10914b

568

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

569

Date: Fri Mar 18 14:55:59 2011 +0100

570

571

Set an accelator on contact search

572

573

This is kinda based on Will's 87fe6f3680d91edc933bc767cae6e500b8bac011

574

patch

575

changing the accelator but 2.34 doesn't have the menu entry, and

576

so the

577

accelator, for live search so I just picked this part from it.

578

579

src/empathy-main-window.ui | 1 +

580

1 files changed, 1 insertions(+), 0 deletions(-)

581

582

commit b166db08575e8b1b9db362b2cda67a8f5f799e98

2636

commit f1975e66ba22bfcfeeb2b1583143693a454aad89

2637

Author: Stef Walter <stefw@collabora.co.uk>

2638

Date: Fri Mar 18 14:48:55 2011 +0100

2639

2640

Style changes from review for ReferenceIdentities code

2641

2642

libempathy/empathy-server-tls-handler.c | 14 +++++++++-----

2643

libempathy/empathy-tls-verifier.c | 15 +++++++++------

2644

src/empathy-auth-client.c | 2 +-

2645

3 files changed, 19 insertions(+), 12 deletions(-)

2646

2647

commit 87fe6f3680d91edc933bc767cae6e500b8bac011

2648

Author: Will Thompson <will.thompson@collabora.co.uk>

2649

Date: Fri Mar 18 11:19:34 2011 +0000

2650

2651

Map Ctrl-Shift-F to contact search and Ctrl-F to find

2652

2653

As discussed on <https://bugzilla.gnome.org/show_bug.cgi?id=645121>,

2654

currently Ctrl-F opens the contact search dialog, and there's no

2655

keyboard shortcut for searching within the contact list (other

2656

than just

2657

typing). The Gnome HIG handles this situation: it says that the former

2658

should be Ctrl-Shift-F and the latter should be Ctrl-F.

2659

<http://library.gnome.org/devel/hig-book/2.32/input-keyboard.html.en#standard-shortcuts>

2660

2661

src/empathy-main-window.ui | 2 ++

2662

1 files changed, 2 insertions(+), 0 deletions(-)

2663

2664

commit 5719134cc2ecacb5076c9e8133feb8473979b5f5

2665

Author: Shankar Prasad <svenkate@redhat.com>

2666

Date: Fri Mar 18 18:39:37 2011 +0530

2667

2668

Updated kn translations

2669

2670

po/kn.po | 3731

2671

++++++++++++++++++++++++++++++++++++++++++++------------------

2672

1 files changed, 2642 insertions(+), 1089 deletions(-)

2673

2674

commit 053503cfa6ee966a91f85069e0eda6da0335b0e6

583

2675

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

584

2676

Date: Fri Mar 18 11:45:49 2011 +0100

585

2677

590

2682

++++++++++++++++++++++++++++---------

591

2683

1 files changed, 38 insertions(+), 12 deletions(-)

592

2684

593

commit a83655b4102c6bf161af1c2a41c6c812601b3fce

2685

commit b531101e9f3b6654476d236213ea22e100869a9c

594

2686

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

595

2687

Date: Fri Mar 18 11:43:16 2011 +0100

596

2688

600

2692

libempathy/empathy-auth-factory.h | 3 ++-

601

2693

2 files changed, 4 insertions(+), 3 deletions(-)

602

2694

603

commit e8946503f98e8530fd35bb72a3235a286aac4a57

2695

commit 37e2773cfddb5ef46d79ccd70593bd16066e6512

604

2696

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

605

2697

Date: Fri Mar 18 11:42:24 2011 +0100

606

2698

610

2702

libempathy/empathy-server-sasl-handler.h | 3 +++

611

2703

2 files changed, 15 insertions(+), 0 deletions(-)

612

2704

613

commit e097dd35820e5cc714184d89928efbdb74e70adb

614

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

615

Date: Fri Mar 18 16:03:37 2011 +1100

616

617

Reword blocking dialog some more

618

619

libempathy-gtk/empathy-individual-dialogs.c | 91

620

++++++++++++++-------------

621

1 files changed, 48 insertions(+), 43 deletions(-)

622

623

commit 462020737d41b5997b64b76b1991b79fd13eb734

2705

commit 2eb0d2db6f945cb72fd9e9a909dd1d95c79e7d02

2706

Author: Stef Walter <stefw@collabora.co.uk>

2707

Date: Fri Mar 18 11:40:54 2011 +0100

2708

2709

Free priv->hostname in EmpathyServerTlsHandler

2710

2711

https://bugzilla.gnome.org/show_bug.cgi?id=645115

2712

2713

libempathy/empathy-server-tls-handler.c | 1 +

2714

1 files changed, 1 insertions(+), 0 deletions(-)

2715

2716

commit 25ed247445aacfce41e0c15aac08cc5697427c1a

624

2717

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

625

Date: Thu Mar 17 20:12:14 2011 +0000

2718

Date: Fri Mar 18 11:14:51 2011 +0000

626

2719

627

2720

Display an avatar on the block contact dialog

628

2721

630

2723

631

2724

libempathy-gtk/empathy-individual-dialogs.c | 8 ++

632

2725

libempathy-gtk/empathy-individual-dialogs.h | 1 +

633

libempathy-gtk/empathy-individual-view.c | 112

634

+++++++++++++++++---------

635

3 files changed, 82 insertions(+), 39 deletions(-)

636

637

commit 2467d9a5ff47486ec71427763afd4a7e1e300b20

2726

libempathy-gtk/empathy-individual-view.c | 170

2727

++++++++++++++++-----------

2728

3 files changed, 111 insertions(+), 68 deletions(-)

2729

2730

commit 3b10103f06517cd7bfbb1576daadaf4855b800a2

2731

Author: Stef Walter <stefw@collabora.co.uk>

2732

Date: Fri Mar 18 11:59:02 2011 +0100

2733

2734

Use ServerTLSConnection.ReferenceIdentities to check cert identity.

2735

2736

The certificate identity can be checked against more than just

2737

one piece of information. Load and use all the reference identities

2738

to check the identity of the certificate.

2739

2740

https://bugzilla.gnome.org/show_bug.cgi?id=645119

2741

2742

libempathy/empathy-server-tls-handler.c | 41

2743

++++++++++++++++++++++++++++++-

2744

libempathy/empathy-tls-verifier.c | 38

2745

+++++++++++++++++++++++++---

2746

libempathy/empathy-tls-verifier.h | 3 +-

2747

src/empathy-auth-client.c | 6 ++++-

2748

4 files changed, 81 insertions(+), 7 deletions(-)

2749

2750

commit 00f27e9c52f494cad1b36e0e106a129e884ac428

2751

Author: Stef Walter <stefw@collabora.co.uk>

2752

Date: Fri Mar 18 11:40:54 2011 +0100

2753

2754

Free priv->hostname in EmpathyServerTlsHandler

2755

2756

https://bugzilla.gnome.org/show_bug.cgi?id=645115

2757

2758

libempathy/empathy-server-tls-handler.c | 1 +

2759

1 files changed, 1 insertions(+), 0 deletions(-)

2760

2761

commit 385b1a5c6c3f0fd9d7cd5d33843466ed9e1238cc

638

2762

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

639

2763

Date: Fri Mar 18 10:33:49 2011 +0100

640

2764

646

2770

libempathy/empathy-auth-factory.c | 3 ++-

647

2771

1 files changed, 2 insertions(+), 1 deletions(-)

648

2772

649

commit 46657275627702864348674f8c6397df922d7d45

2773

commit f1d664454fafb8f183c8721154f534f71d8423ea

650

2774

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

651

2775

Date: Fri Mar 18 10:27:23 2011 +0100

652

2776

659

2783

libempathy/empathy-auth-factory.c | 16 +++++++++-------

660

2784

1 files changed, 9 insertions(+), 7 deletions(-)

661

2785

662

commit e5485f513925ba7bc9baebbf7bed6eadf8e906f3

2786

commit 73720bb84423e70ad21599b4713d1137f8a85e73

663

2787

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

664

2788

Date: Fri Mar 18 10:23:58 2011 +0100

665

2789

670

2794

libempathy/empathy-auth-factory.c | 9 +++++++--

671

2795

1 files changed, 7 insertions(+), 2 deletions(-)

672

2796

673

commit 310801b1c9417d242a6d584f0dcc01878552f77f

674

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

675

Date: Tue Mar 15 20:57:37 2011 +1100

676

677

Fix reconnect_required, which was broken by port to MxGtkLightSwitch

678

679

libempathy-gtk/empathy-account-widget.c | 30

680

+++++++++++++++++-------------

681

src/empathy-accounts-dialog.c | 5 +++++

682

2 files changed, 22 insertions(+), 13 deletions(-)

683

684

commit ca830f84306dc6ec626107857b2a770c3faa2401

685

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

686

Date: Tue Mar 15 20:47:20 2011 +1100

687

688

Optionally call a callback on Apply to do additional things

689

690

libempathy-gtk/empathy-account-widget-private.h | 7 ++++

691

libempathy-gtk/empathy-account-widget.c | 45

692

++++++++++++++++++++++-

693

2 files changed, 50 insertions(+), 2 deletions(-)

694

695

commit ed2a37c2c6f41bb1f5704d2a2f748157fb054fc3

696

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

697

Date: Thu Mar 17 15:25:26 2011 +0100

698

699

chat_window_contact_menu_update: unsensitive the menu if there is

700

no submenu

701

702

This is a manual backport from master.

703

704

src/empathy-chat-window.c | 14 ++++++++++----

705

1 files changed, 10 insertions(+), 4 deletions(-)

706

707

commit ce99c073f333f7d29c19e3db9a3610f6ea327b39

708

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

709

Date: Thu Mar 17 14:58:07 2011 +0100

2797

commit 1d04deb0ffa562830485ba2eb626c123082afa3b

2798

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

2799

Date: Fri Mar 18 08:33:07 2011 +1100

2800

2801

Fix the icon metadata

2802

2803

The new Empathy icon was mistakenly named 'Pidgin' in the metadata.

2804

Clearly when Jakub drew it he thought he was drawing it for

2805

Pidgin. Renaming

2806

it to Empathy so people don't get confused.

2807

2808

data/icons/empathy.svg | 6 +++---

2809

1 files changed, 3 insertions(+), 3 deletions(-)

2810

2811

commit 5970402dc0e1971226b9c29014da43c8e354c1fd

2812

Author: Daniel Korostil <ted.korostiled@gmail.com>

2813

Date: Thu Mar 17 19:41:01 2011 +0200

2814

2815

Uploaded Ukranian

2816

2817

po/uk.po | 642

2818

+++++++++++++++++++++++++++++++++++---------------------------

2819

1 files changed, 361 insertions(+), 281 deletions(-)

2820

2821

commit 728a0418bb6dbf5b3f16bd3b12ca802d1530de60

2822

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

2823

Date: Thu Mar 17 16:18:02 2011 +0100

710

2824

711

2825

remove released flag

712

2826

713

2827

configure.ac | 2 +-

714

2828

1 files changed, 1 insertions(+), 1 deletions(-)

715

2829

716

commit 0b88ba25bdd817665a35c8382636cb03e761467c

2830

commit 22f5d4f35b734d1e47a810e369c7901da180905c

2831

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

2832

Date: Thu Mar 17 15:54:12 2011 +0100

2833

2834

prepare 2.91.91.1

2835

2836

NEWS | 55

2837

+++++++++++++++++++++++++++++++++++++++++++++++++++++++

2838

configure.ac | 4 ++--

2839

2 files changed, 57 insertions(+), 2 deletions(-)

2840

2841

commit 7f47a1b3053fdf5e07250f716b5c596f936b0302

717

2842

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

718

2843

Date: Thu Mar 17 11:49:43 2011 +0100

719

2844

722

2847

libempathy/empathy-server-sasl-handler.c | 6 ++++++

723

2848

1 files changed, 6 insertions(+), 0 deletions(-)

724

2849

725

commit 8e687238e7689097a541e387b18abd611b179faf

2850

commit ca9d3b8180e49292724243090fd5394172fa24c9

726

2851

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

727

2852

Date: Wed Mar 16 14:03:40 2011 +0100

728

2853

731

2856

libempathy/empathy-account-settings.c | 16 ++++++++++++++++

732

2857

1 files changed, 16 insertions(+), 0 deletions(-)

733

2858

734

commit 9900a3a35d66a9e00ea82dee37895f7d8b54faa3

2859

commit 7980966fd3bb38fde70946c057704b1b5f409968

2860

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

2861

Date: Thu Mar 17 14:03:02 2011 +0100

2862

2863

Allow to enter an email address as ICQ ID (#645014)

2864

2865

libempathy-gtk/empathy-account-widget.c | 7 +++++--

2866

1 files changed, 5 insertions(+), 2 deletions(-)

2867

2868

commit 1dc905b194ce6e1be82af2e111cdf7a913dd43fc

735

2869

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

736

2870

Date: Thu Mar 17 11:58:56 2011 +0000

737

2871

740

2874

libempathy-gtk/empathy-contact-search-dialog.c | 3 +++

741

2875

1 files changed, 3 insertions(+), 0 deletions(-)

742

2876

743

commit d5b2820161428f145463e50b80fe0df4d7668176

2877

commit f918489642f3e0f41f09c774a4e4b80497c9592a

744

2878

Author: Michael Terry <michael.terry@canonical.com>

745

2879

Date: Wed Mar 16 12:57:25 2011 -0400

746

2880

749

2883

src/empathy-chat-window.c | 33 ++++++++++++++++++++++++---------

750

2884

1 files changed, 24 insertions(+), 9 deletions(-)

751

2885

752

commit 0f47819a414ea821e6eccafb678c399a39a901ec

753

Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

754

Date: Thu Mar 17 11:41:25 2011 +0000

755

756

When the remote side hangs up, clean up the call channel

757

758

src/empathy-call-handler.c | 11 +++++++++--

759

1 files changed, 9 insertions(+), 2 deletions(-)

760

761

commit e90884d588a170b130f2f1c4faf2ff14d70bdc10

762

Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

763

Date: Thu Mar 17 11:35:46 2011 +0000

764

765

Cope with unexpected call channel invalidation

766

767

src/empathy-call-handler.c | 20 ++++++++++++++++++++

768

1 files changed, 20 insertions(+), 0 deletions(-)

769

770

commit 76341ee8710f2510851b904aa145902d5c482f1a

771

Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

772

Date: Thu Mar 17 11:31:25 2011 +0000

773

774

Use modern private structure handling

775

776

src/empathy-call-handler.c | 4 ++--

777

src/empathy-call-handler.h | 3 ++-

778

2 files changed, 4 insertions(+), 3 deletions(-)

779

780

commit cf02fdd5166de8c92d2f66c7cbad7d2efc69d834

781

Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

782

Date: Thu Mar 17 11:29:38 2011 +0000

783

784

Correct Call channel refcounting

785

786

The Call channel will get unreffed by the destroy function that's

787

given

788

to empathy_tp_contact_factory_get_from_id. So don't unref it in the

789

callback explicitely

790

791

src/empathy-call-factory.c | 5 +----

792

1 files changed, 1 insertions(+), 4 deletions(-)

793

794

commit da856bbdcf471c120de701822e9befb5ffe7283b

2886

commit b82a98e0508d3a1f7935a13c6aa89acabab3ffe4

2887

Author: Lucian Adrian Grijincu <lucian.grijincu@gmail.com>

2888

Date: Thu Mar 17 13:13:07 2011 +0100

2889

2890

Updated Romanian translation

2891

2892

po/ro.po | 332

2893

++++++++++++++++++++++++++++++--------------------------------

2894

1 files changed, 162 insertions(+), 170 deletions(-)

2895

2896

commit eedc36ded1b4a3c55758a409e4efca8955bd3d27

2897

Author: Lucian Adrian Grijincu <lucian.grijincu@gmail.com>

2898

Date: Thu Mar 17 10:45:12 2011 +0100

2899

2900

Updated Romanian translation

2901

2902

po/ro.po | 240

2903

+++++++++++++++++++++++++++++++++++++++++---------------------

2904

1 files changed, 160 insertions(+), 80 deletions(-)

2905

2906

commit 88e09c99733982de201c3c1cfbf4742a0e8662b1

2907

Author: Kjartan Maraas <kmaraas@gnome.org>

2908

Date: Wed Mar 16 19:51:15 2011 +0100

2909

2910

Fix warnings from GCC 4.6 about variables that are set but not used.

2911

2912

libempathy-gtk/empathy-account-chooser.c | 10 -------

2913

libempathy-gtk/empathy-account-widget-irc.c | 6 ----

2914

libempathy-gtk/empathy-avatar-chooser.c | 6 ----

2915

libempathy-gtk/empathy-cell-renderer-expander.c | 6 ----

2916

libempathy-gtk/empathy-chat.c | 11 --------

2917

libempathy-gtk/empathy-contact-list-store.c | 31

2918

+---------------------

2919

libempathy-gtk/empathy-contact-list-view.c | 11 --------

2920

libempathy-gtk/empathy-groups-widget.c | 4 ---

2921

libempathy-gtk/empathy-individual-linker.c | 4 ---

2922

libempathy-gtk/empathy-individual-store.c | 23 -----------------

2923

libempathy-gtk/empathy-individual-view.c | 9 ------

2924

libempathy-gtk/empathy-log-window.c | 4 ---

2925

libempathy-gtk/empathy-persona-store.c | 7 +---

2926

libempathy-gtk/empathy-persona-view.c | 12 ---------

2927

libempathy-gtk/empathy-presence-chooser.c | 2 -

2928

libempathy-gtk/empathy-ui-utils.c | 3 +-

2929

libempathy/empathy-auth-factory.c | 2 -

2930

libempathy/empathy-chatroom-manager.c | 4 ---

2931

libempathy/empathy-chatroom.c | 4 ---

2932

libempathy/empathy-ft-handler.c | 3 --

2933

libempathy/empathy-individual-manager.c | 6 ----

2934

libempathy/empathy-irc-network-manager.c | 3 --

2935

22 files changed, 5 insertions(+), 166 deletions(-)

2936

2937

commit 95a0ab7d884a6500cfba6ff63fea73269faec0da

795

2938

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

796

2939

Date: Thu Mar 17 12:25:40 2011 +0100

797

2940

800

2943

src/empathy-auth-client.c | 10 ++++++++++

801

2944

1 files changed, 10 insertions(+), 0 deletions(-)

802

2945

803

commit c85c482d05055e2db59f90098a519a8e577fe84f

2946

commit 52eb24e6e7b012856525f6f09d3c1a941375d383

2947

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

2948

Date: Mon Mar 7 15:22:29 2011 +0100

2949

2950

pass a preferred handler when requesting channels

2951

2952

We want to use Empathy components when possible instead of, say,

2953

KDE ones if

2954

both are installed (#643863).

2955

2956

libempathy-gtk/empathy-chat.c | 4 ++--

2957

libempathy-gtk/empathy-new-call-dialog.c | 5 +++--

2958

libempathy/empathy-request-util.c | 8 ++++----

2959

libempathy/empathy-tp-chat.c | 5 +++--

2960

libempathy/empathy-utils.c | 6 +++---

2961

5 files changed, 15 insertions(+), 13 deletions(-)

2962

2963

commit 04edfb3dbbdf9a2a4ac6cf2ecafcbd88044ee094

2964

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

2965

Date: Mon Mar 7 14:54:01 2011 +0100

2966

2967

define constants for handler bus name

2968

2969

It's more convenient and safe than hardcoding them everywhere.

2970

2971

libempathy/empathy-ft-factory.c | 3 ++-

2972

libempathy/empathy-request-util.h | 9 +++++++++

2973

src/empathy-chat-manager.c | 4 ++--

2974

src/empathy-streamed-media-factory.c | 3 ++-

2975

4 files changed, 15 insertions(+), 4 deletions(-)

2976

2977

commit 23d90f884b28cabd3b9b986998c118314a9238f9

2978

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

2979

Date: Mon Mar 7 14:02:52 2011 +0100

2980

2981

rename empathy-dispatcher to empathy-request-util

2982

2983

We don't have EmpathyDispatcher any more so this file just contains

2984

some

2985

utility functions now.

2986

2987

libempathy-gtk/empathy-chat.c | 8 +-

2988

libempathy-gtk/empathy-contact-list-view.c | 4 +-

2989

libempathy-gtk/empathy-contact-menu.c | 4 +-

2990

libempathy-gtk/empathy-contact-selector-dialog.c | 1 -

2991

libempathy-gtk/empathy-individual-menu.c | 4 +-

2992

libempathy-gtk/empathy-individual-view.c | 4 +-

2993

libempathy-gtk/empathy-new-message-dialog.c | 4 +-

2994

libempathy-gtk/empathy-share-my-desktop.c | 2 -

2995

libempathy-gtk/empathy-ui-utils.c | 1 -

2996

libempathy/Makefile.am | 4 +-

2997

libempathy/empathy-chatroom-manager.h | 1 -

2998

libempathy/empathy-dispatcher.c | 107

2999

----------------------

3000

libempathy/empathy-dispatcher.h | 49 ----------

3001

libempathy/empathy-request-util.c | 107

3002

++++++++++++++++++++++

3003

libempathy/empathy-request-util.h | 48 ++++++++++

3004

libempathy/empathy-utils.c | 1 -

3005

src/empathy-chat-manager.c | 6 +-

3006

src/empathy-chat-window.c | 3 +-

3007

src/empathy-main-window.c | 4 +-

3008

src/empathy-new-chatroom-dialog.c | 4 +-

3009

src/empathy.c | 6 +-

3010

tests/interactive/empetit.c | 4 +-

3011

22 files changed, 185 insertions(+), 191 deletions(-)

3012

3013

commit a7422e3aa529737591539a1e01889646c99e924b

804

3014

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

805

3015

Date: Thu Mar 10 16:48:53 2011 +0100

806

3016

810

3020

+++++++++++++++++++++++++++

811

3021

1 files changed, 58 insertions(+), 0 deletions(-)

812

3022

813

commit cd3533354e318fd0ebeee4dba4491a0b99a0c387

814

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

815

Date: Wed Mar 16 15:45:35 2011 +0100

816

817

prepare 2.33.4

818

819

NEWS | 21 +++++++++++++++++++++

820

configure.ac | 4 ++--

821

2 files changed, 23 insertions(+), 2 deletions(-)

822

823

commit c81fdc0417476ab122cd3d555095577269c3dd58

824

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

825

Date: Wed Mar 16 13:35:28 2011 +0000

826

827

Log window: grey out accounts without logs

828

829

libempathy-gtk/empathy-log-window.c | 11 +++++++++++

830

1 files changed, 11 insertions(+), 0 deletions(-)

831

832

commit 3245172e9de4d7eada65f0155c0d5039b3e7b0d6

833

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

834

Date: Wed Mar 16 13:18:06 2011 +0000

835

836

Clear logs: grey out accounts without logs

837

838

libempathy-gtk/empathy-log-window.c | 45

839

+++++++++++++++++++++++++++++++++++

840

1 files changed, 45 insertions(+), 0 deletions(-)

841

842

commit 7f7ef3c33eba6fbef4c3fdd01503db000d6be41e

3023

commit 9d201c64e57d8e2b37670e88efaaaf2de35c34ba

3024

Author: Bruno Brouard <annoa.b@gmail.com>

3025

Date: Wed Mar 16 21:22:48 2011 +0100

3026

3027

Updated French translation

3028

3029

po/fr.po | 603

3030

++++++++++++++++++++++++++++++++++++--------------------------

3031

1 files changed, 354 insertions(+), 249 deletions(-)

3032

3033

commit b4ad1d79492da018ee5a73f778f1116d9128171d

3034

Author: Bruce Cowan <bruce@bcowan.me.uk>

3035

Date: Wed Mar 16 17:05:12 2011 +0000

3036

3037

Updated British English translation

3038

3039

po/en_GB.po | 1098

3040

++++++++++++++++++++++++++++++++++-------------------------

3041

1 files changed, 642 insertions(+), 456 deletions(-)

3042

3043

commit f402904568cf4bbd351d75424c9d040f6269fb3e

3044

Author: Yaron Shahrabani <sh.yaron@gmail.com>

3045

Date: Wed Mar 16 17:56:23 2011 +0200

3046

3047

Updated Hebrew translation.

3048

3049

po/he.po | 350

3050

+++++++++++++++++++++++++++++++++++++------------------------

3051

1 files changed, 212 insertions(+), 138 deletions(-)

3052

3053

commit 75e35374e831cee1045f0493b284167b68d737bd

3054

Author: Jakub Steiner <jimmac@gmail.com>

3055

Date: Wed Mar 16 14:37:49 2011 +0100

3056

3057

New Empathy icon (#614640)

3058

3059

Thank you Telepathy icon, you served us well.

3060

3061

data/icons/Makefile.am | 2 +-

3062

data/icons/empathy.svg | 6436

3063

++++++++++++++++++++++++++

3064

data/icons/hicolor_apps_16x16_empathy.png | Bin 797 -> 890 bytes

3065

data/icons/hicolor_apps_22x22_empathy.png | Bin 1179 -> 1138 bytes

3066

data/icons/hicolor_apps_24x24_empathy.png | Bin 1249 -> 1118 bytes

3067

data/icons/hicolor_apps_256x256_empathy.png | Bin 24824 -> 17105 bytes

3068

data/icons/hicolor_apps_32x32_empathy.png | Bin 1813 -> 1640 bytes

3069

data/icons/hicolor_apps_48x48_empathy.png | Bin 2930 -> 2317 bytes

3070

data/icons/hicolor_apps_scalable_empathy.svg | 261 --

3071

9 files changed, 6437 insertions(+), 262 deletions(-)

3072

3073

commit 9dbf81ddbdbafb611fa7a29849f5fb54ff0d76b8

843

3074

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

844

3075

Date: Wed Mar 16 13:17:19 2011 +0000

845

3076

848

3079

libempathy-gtk/empathy-contact-search-dialog.c | 6 ++++--

849

3080

1 files changed, 4 insertions(+), 2 deletions(-)

850

3081

851

commit 6cfff1f1ceaaab0f5baa0d8901cf53af97c6682f

852

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

853

Date: Tue Mar 15 17:25:21 2011 +0000

854

855

AccountChooser: All -> All accounts

856

857

libempathy-gtk/empathy-account-chooser.c | 2 +-

858

1 files changed, 1 insertions(+), 1 deletions(-)

859

860

commit 36f043adbd2baffbd72066184bd95cbcb6663b00

861

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

862

Date: Tue Mar 15 17:19:13 2011 +0000

863

864

Select the same account as in the history window

865

866

libempathy-gtk/empathy-log-window.c | 30 ++++++++++++++++++++++--------

867

1 files changed, 22 insertions(+), 8 deletions(-)

868

869

commit 3a84dfc206e7e31b431130e4e8272cc0522eedab

870

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

871

Date: Tue Mar 15 16:40:40 2011 +0000

872

873

Change the 'Delete logs' button to a menu entry

874

875

And make the confirmation dialog let you select one specific

876

account, or 'All of them'.

877

878

libempathy-gtk/empathy-log-window.c | 79 ++++---

879

libempathy-gtk/empathy-log-window.ui | 445

880

+++++++++++++++++++---------------

881

2 files changed, 296 insertions(+), 228 deletions(-)

882

883

commit 0e1edc0339c271acada9588f59adc5933d16f4ec

884

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

885

Date: Tue Mar 15 16:40:01 2011 +0000

886

887

Add a empathy_account_chooser_has_all_selected

888

889

So we can know if 'All' is selected in the accounts chooser.

890

891

libempathy-gtk/empathy-account-chooser.c | 24 ++++++++++++++++++++++++

892

libempathy-gtk/empathy-account-chooser.h | 1 +

893

2 files changed, 25 insertions(+), 0 deletions(-)

894

895

commit bd72a338cdb8e91bf24cc82bbfb0b6bfc1cf7b97

896

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

897

Date: Wed Nov 17 20:06:15 2010 +0100

898

899

set do-lost property on the gstrtpjitterbuffer element

900

901

data/element-properties | 3 +++

902

1 files changed, 3 insertions(+), 0 deletions(-)

903

904

commit 49d46ebf46c683f1aee19ae94abc70a3f3741a7d

905

Author: David Laban <david.laban@collabora.co.uk>

906

Date: Mon Dec 20 15:46:36 2010 +0000

907

908

Also turn off Access Unit Delimiters (aud)

909

910

AUDs are *completely* pointless in RTP and just waste packets/confuse

911

people.

912

913

data/element-properties | 1 +

914

1 files changed, 1 insertions(+), 0 deletions(-)

915

916

commit 7933b216dbc4937f52300aab70d841dbcc114983

917

Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

918

Date: Mon Dec 20 15:22:30 2010 +0000

919

920

Turn off sliced-threads, some implementations have problems with

921

decoding it

922

923

data/element-properties | 1 +

924

1 files changed, 1 insertions(+), 0 deletions(-)

925

926

commit 99706ebbfea4df20a95d7e8cfdc13d33eaf4c8b8

927

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

928

Date: Wed Mar 16 11:17:02 2011 +0100

929

930

call-window: Put the details vbox in a scroll window

931

932

src/empathy-call-window.c | 11 +++++++++--

933

1 files changed, 9 insertions(+), 2 deletions(-)

934

935

commit 2c4f9f10da3432db913ed9c85b0adb55b0f5704a

3082

commit ba64e4982bf47cbbb0bd2db754b888ea7affa90a

3083

Merge: 1890507 2220cb9

3084

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

3085

Date: Wed Mar 16 11:37:10 2011 +0100

3086

3087

Merge branch 'call-details-644830'

3088

3089

commit 2220cb934612b293018e364ae22f1229f1023e0e

936

3090

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

937

3091

Date: Wed Mar 16 09:54:14 2011 +0100

938

3092

945

3099

src/empathy-streamed-media-window.c | 9 ++++++++-

946

3100

1 files changed, 8 insertions(+), 1 deletions(-)

947

3101

948

commit 12b493671971c0a0a73b02bf467f448022ea88b7

3102

commit 18905073c9948920f1804540b332fb0758e2e5a3

949

3103

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

950

3104

Date: Mon Mar 14 15:24:43 2011 +0100

951

3105

958

3112

libempathy-gtk/empathy-individual-view.c | 12 +++++-------

959

3113

1 files changed, 5 insertions(+), 7 deletions(-)

960

3114

961

commit 251967fd833d753f2f4b30afb437d9cbc43dd89a

3115

commit 8f7700d66b8ff5056777c803e754b8c00430ab2a

962

3116

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

963

3117

Date: Mon Mar 14 14:58:55 2011 +0100

964

3118

966

3120

967

3121

This code was too confusing when using GTK_RESPONSE_*

968

3122

969

libempathy-gtk/empathy-individual-view.c | 22 ++++++++++++++++------

970

1 files changed, 16 insertions(+), 6 deletions(-)

971

972

commit cb2741bee8b6808953a6afeea90114f123a47982

973

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

974

Date: Wed Mar 16 10:11:26 2011 +0100

975

976

depends on folks 0.4.0

977

978

This is based on Travis's commits from master.

979

980

configure.ac | 2 +-

981

libempathy-gtk/empathy-contact-widget.c | 17 ++--

982

libempathy-gtk/empathy-groups-widget.c | 114

983

++++++++++----------

984

libempathy-gtk/empathy-groups-widget.h | 8 +-

3123

libempathy-gtk/empathy-individual-view.c | 20 ++++++++++++++------

3124

1 files changed, 14 insertions(+), 6 deletions(-)

3125

3126

commit 20c4918fc73cca52bf51152878c7437686e05833

3127

Author: Mattias Põldaru <mahfiaz@gmail.com>

3128

Date: Wed Mar 16 10:14:34 2011 +0200

3129

3130

[l10n] Updated Estonian translation

3131

3132

po/et.po | 30 ++++++++++++++++++++++++------

3133

1 files changed, 24 insertions(+), 6 deletions(-)

3134

3135

commit fdc3218abcb76d83eabcf323cfed1aef89a6fa0e

3136

Author: Marek Černocký <marek@manet.cz>

3137

Date: Wed Mar 16 00:46:38 2011 +0100

3138

3139

Updated Czech translation

3140

3141

po/cs.po | 1021

3142

++++++++++++++++++++++++++++++++++++--------------------------

3143

1 files changed, 594 insertions(+), 427 deletions(-)

3144

3145

commit 73368c2d9f01213d38c9463df8ac5488fef4f90f

3146

Author: Fran Diéguez <fran@openhost.es>

3147

Date: Tue Mar 15 15:13:22 2011 +0100

3148

3149

Updated Galician translations

3150

3151

po/gl.po | 764

3152

++++++++++++++++++++++++++++++++++++--------------------------

3153

1 files changed, 445 insertions(+), 319 deletions(-)

3154

3155

commit 1ee3ed8a7b06f4078f4491f334362cf8eafee236

3156

Author: Mattias Põldaru <mahfiaz gmail com>

3157

Date: Tue Mar 15 13:36:29 2011 +0200

3158

3159

[l10n] Updated Estonian translation

3160

3161

po/et.po | 50 +++++++++++++++++++++++++++++++++++++++++++++-----

3162

1 files changed, 45 insertions(+), 5 deletions(-)

3163

3164

commit 7fcb99d91de85877a7f70b94e8cdd3ce749464ec

3165

Author: Gabor Kelemen <kelemeng@gnome.hu>

3166

Date: Tue Mar 15 03:36:26 2011 +0100

3167

3168

Updated Hungarian translation

3169

3170

po/hu.po | 277

3171

+++++++++++++++++++++++++++++++++++++++----------------------

3172

1 files changed, 177 insertions(+), 100 deletions(-)

3173

3174

commit bc07e7d582af2c453a5a70f587726446156979cc

3175

Author: Daniel Nylander <po@danielnylander.se>

3176

Date: Tue Mar 15 00:13:54 2011 +0100

3177

3178

Updated Swedish translation

3179

3180

po/sv.po | 1287

3181

++++++++++++++++----------------------------------------------

3182

1 files changed, 326 insertions(+), 961 deletions(-)

3183

3184

commit 19773d451bc55664e85b1b9818925c0ae6c225b4

3185

Author: Daniel Mustieles <daniel.mustieles@gmail.com>

3186

Date: Mon Mar 14 22:13:59 2011 +0100

3187

3188

Updated Spanish translation

3189

3190

po/es.po | 142

3191

++++++++++++++++++++++++++++++++++++-------------------------

3192

1 files changed, 84 insertions(+), 58 deletions(-)

3193

3194

commit 88a02952e20c58a233b9c88e6a10e72021b66a1a

3195

Author: Daniel Mustieles <daniel.mustieles@gmail.com>

3196

Date: Mon Mar 14 22:10:24 2011 +0100

3197

3198

Updated Spanish translation

3199

3200

po/es.po | 253

3201

+++++++++++++++++++++++++++++++++++++-------------------------

3202

1 files changed, 152 insertions(+), 101 deletions(-)

3203

3204

commit ac2774f5966790318a1ae6b79589627b7aaf6868

3205

Author: Andrej Žnidaršič <andrej.znidarsic@gmail.com>

3206

Date: Mon Mar 14 21:44:51 2011 +0100

3207

3208

Updated Slovenian translation

3209

3210

po/sl.po | 391

3211

+++++++++++++++++++++++++++++++++++---------------------------

3212

1 files changed, 223 insertions(+), 168 deletions(-)

3213

3214

commit e2aa4ed914a8fd0bd09bc3e24a5ad56362499f32

3215

Author: Travis Reitter <travis.reitter@collabora.co.uk>

3216

Date: Mon Mar 14 12:32:36 2011 -0700

3217

3218

Require the proper version of Folks.

3219

3220

configure.ac | 2 +-

3221

1 files changed, 1 insertions(+), 1 deletions(-)

3222

3223

commit 492b8ba0e7a37ad5b23ef7a3544dc6a2fd5e4eef

3224

Author: Travis Reitter <travis.reitter@collabora.co.uk>

3225

Date: Thu Mar 10 22:07:44 2011 -0800

3226

3227

Adjust for Folks PresenceOwner -> PresenceDetails rename

3228

3229

Fixes bgo#644470 - Empathy needs to catch up with Folks interface

3230

name change

3231

(API/ABI breaks)

3232

3233

libempathy-gtk/empathy-individual-store.c | 34

3234

++++++++++++++--------------

3235

libempathy-gtk/empathy-individual-view.c | 3 +-

3236

libempathy-gtk/empathy-individual-widget.c | 25 ++++++++++----------

3237

libempathy-gtk/empathy-persona-store.c | 19 ++++++++-------

3238

libempathy-gtk/empathy-ui-utils.c | 4 +-

3239

libempathy/empathy-contact.c | 20 ++++++++--------

3240

6 files changed, 54 insertions(+), 51 deletions(-)

3241

3242

commit abf8b17d703c071f4fe91c09bac97c09314a2dc0

3243

Author: Travis Reitter <travis.reitter@collabora.co.uk>

3244

Date: Thu Mar 10 22:01:09 2011 -0800

3245

3246

Adjust for Folks Groupable -> GroupDetails rename

3247

3248

Helps bgo#644470 - Empathy needs to catch up with Folks interface

3249

name change

3250

(API/ABI breaks)

3251

3252

libempathy-gtk/empathy-contact-widget.c | 6 +-

3253

libempathy-gtk/empathy-groups-widget.c | 114

3254

++++++++++++++-------------

3255

libempathy-gtk/empathy-groups-widget.h | 8 +-

3256

libempathy-gtk/empathy-individual-store.c | 3 +-

3257

libempathy-gtk/empathy-individual-view.c | 12 ++--

3258

libempathy-gtk/empathy-individual-widget.c | 4 +-

3259

libempathy/empathy-contact.c | 13 ++--

3260

libempathy/empathy-individual-manager.c | 8 +-

3261

libempathy/empathy-utils.c | 2 +-

3262

libempathy/empathy-utils.h | 2 +-

3263

10 files changed, 89 insertions(+), 83 deletions(-)

3264

3265

commit 07434728e84556fd321ea4a38f828035803ee76b

3266

Author: Travis Reitter <travis.reitter@collabora.co.uk>

3267

Date: Thu Mar 10 21:46:49 2011 -0800

3268

3269

Adjust for Folks Favouritable -> FavouriteDetails rename

3270

3271

Helps bgo#644470 - Empathy needs to catch up with Folks interface

3272

name change

3273

(API/ABI breaks)

3274

3275

libempathy-gtk/empathy-contact-widget.c | 11 ++++++-----

3276

libempathy-gtk/empathy-individual-menu.c | 6 ++++--

3277

libempathy-gtk/empathy-individual-store.c | 3 ++-

3278

libempathy-gtk/empathy-individual-view.c | 10 ++++++----

3279

libempathy-gtk/empathy-individual-widget.c | 8 ++++----

3280

libempathy/empathy-individual-manager.c | 4 ++--

3281

6 files changed, 24 insertions(+), 18 deletions(-)

3282

3283

commit 04358054e19cdd50364afd1f51cb315b132cf1f7

3284

Author: Travis Reitter <travis.reitter@collabora.co.uk>

3285

Date: Thu Mar 10 21:42:20 2011 -0800

3286

3287

Adjust for Folks AvatarOwner -> AvatarDetails rename

3288

3289

Helps bgo#644470 - Empathy needs to catch up with Folks interface

3290

name change

3291

(API/ABI breaks)

3292

3293

libempathy-gtk/empathy-ui-utils.c | 2 +-

3294

1 files changed, 1 insertions(+), 1 deletions(-)

3295

3296

commit 36eb0b9dec61bd0040161535f27fc4bbbd4511ca

3297

Author: Travis Reitter <travis.reitter@collabora.co.uk>

3298

Date: Thu Mar 10 21:12:13 2011 -0800

3299

3300

Adjust for Folks Aliasable -> AliasDetails rename

3301

3302

Helps bgo#644470 - Empathy needs to catch up with Folks interface

3303

name change

3304

(API/ABI breaks)

3305

985

3306

libempathy-gtk/empathy-individual-dialogs.c | 4 +-

986

3307

.../empathy-individual-information-dialog.c | 2 +-

987

libempathy-gtk/empathy-individual-menu.c | 6 +-

988

libempathy-gtk/empathy-individual-store.c | 52 +++++----

989

libempathy-gtk/empathy-individual-view.c | 29 +++---

990

libempathy-gtk/empathy-individual-widget.c | 35 +++---

3308

libempathy-gtk/empathy-individual-store.c | 26

3309

++++++++++---------

3310

libempathy-gtk/empathy-individual-view.c | 8 ++++--

3311

libempathy-gtk/empathy-individual-widget.c | 11 ++++----

991

3312

libempathy-gtk/empathy-linking-dialog.c | 2 +-

992

libempathy-gtk/empathy-persona-store.c | 33 +++---

993

libempathy-gtk/empathy-ui-utils.c | 6 +-

994

libempathy/empathy-contact.c | 37 ++++---

995

libempathy/empathy-individual-manager.c | 14 ++--

996

libempathy/empathy-utils.c | 2 +-

997

libempathy/empathy-utils.h | 2 +-

998

17 files changed, 191 insertions(+), 174 deletions(-)

999

1000

commit 15761dfafa40dce3e5acb2f9fecc5b808fa11e47

1001

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

1002

Date: Tue Mar 15 19:06:20 2011 +0000

1003

1004

Don't start the Call when the streams start

1005

1006

Since that can happen before the call is accepted. Instead of that,

1007

wait for the Call state to be ACCEPTED.

1008

1009

src/empathy-call-handler.c | 9 +++++++++

1010

src/empathy-call-window.c | 28 +++++++++++++++-------------

1011

2 files changed, 24 insertions(+), 13 deletions(-)

1012

1013

commit d07f730181b12a13b7af86f9095a7b6c86648e10

1014

Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

1015

Date: Mon Mar 14 18:43:57 2011 +0000

1016

1017

client file channel file should be Call.DRAFT

1018

1019

data/Empathy.Call.client | 6 +++---

1020

1 files changed, 3 insertions(+), 3 deletions(-)

1021

1022

commit 830793cef27543482fb031171f265048f0bd71fc

1023

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

1024

Date: Mon Mar 14 13:56:03 2011 +0000

1025

1026

Don't check the style on mx-gtk-light-switch.[ch]

1027

1028

Since they are imported code.

1029

1030

libempathy-gtk/Makefile.am | 3 +--

1031

1 files changed, 1 insertions(+), 2 deletions(-)

1032

1033

commit 8f37a79424dc8bd8b389d3d28a61a9ef28e1978f

1034

Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

1035

Date: Mon Mar 14 13:48:04 2011 +0000

1036

1037

Add depend on new GStreamer for gst_element_request_pad

1038

1039

configure.ac | 3 ++-

1040

1 files changed, 2 insertions(+), 1 deletions(-)

1041

1042

commit 525107a21db785a0105c68393a148dc1bfaacc4c

3313

libempathy-gtk/empathy-persona-store.c | 14 +++++-----

3314

libempathy/empathy-contact.c | 4 +-

3315

libempathy/empathy-individual-manager.c | 2 +-

3316

9 files changed, 39 insertions(+), 34 deletions(-)

3317

3318

commit 5751c344bd2783df6086b427ebcebdff9a77e63c

3319

Author: Travis Reitter <travis.reitter@collabora.co.uk>

3320

Date: Thu Mar 10 21:10:50 2011 -0800

3321

3322

Bump the Folks version requirement for the following API changes.

3323

3324

Helps bgo#644470 - Empathy needs to catch up with Folks interface

3325

name changes

3326

(API/ABI breaks)

3327

3328

configure.ac | 2 +-

3329

1 files changed, 1 insertions(+), 1 deletions(-)

3330

3331

commit 9b5ff539e9075f4efb718dd9473c07aaf37c990a

1043

3332

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

1044

3333

Date: Mon Mar 14 14:20:29 2011 +0100

1045

3334

1049

3338

libempathy-gtk/empathy-individual-view.c | 15 +++++++++++++--

1050

3339

1 files changed, 13 insertions(+), 2 deletions(-)

1051

3340

1052

commit 07ecd3f4d9cc71d4192599a89a9c8f45f7958c3e

1053

Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

1054

Date: Mon Mar 14 13:23:19 2011 +0000

1055

1056

Reject approval if call was hung up during approval

1057

1058

If an incoming call gets ENDED during our approval stage either we or

1059

someone else closed it. In that case reject the approval (which will

1060

claim and close the channel). A future improvement could be to show a

1061

notification in case this happens

1062

1063

src/empathy-event-manager.c | 29 +++++++++++++++++++++++++++--

1064

1 files changed, 27 insertions(+), 2 deletions(-)

1065

1066

commit 84e01611475d67c21b718a35ed5f1b2587b64544

1067

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

1068

Date: Mon Mar 14 21:30:10 2011 +1100

1069

1070

Remove enabled toggle from account-widget

1071

1072

libempathy-gtk/empathy-account-widget.c | 4 ++++

1073

1 files changed, 4 insertions(+), 0 deletions(-)

1074

1075

commit 25dadf4cd14de2ce0d39bdb4143e7cdd2631fe9a

1076

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

1077

Date: Mon Mar 14 21:24:15 2011 +1100

1078

1079

Add an enabled switch to the account dialog GtkInfoBar

1080

1081

src/empathy-accounts-dialog.c | 63

1082

+++++++++++++++++++++++++++++++++++++++++

1083

1 files changed, 63 insertions(+), 0 deletions(-)

1084

1085

commit d307a9d0608735925aaa7bd758ee5c5df62f2a0e

1086

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

1087

Date: Mon Mar 14 21:08:12 2011 +1100

1088

1089

Reenable labels in MxGtkLightSwitch

1090

1091

libempathy-gtk/mx-gtk-light-switch.c | 15 ++++++---------

1092

1 files changed, 6 insertions(+), 9 deletions(-)

1093

1094

commit 706b0ad396bd569224e28ed45090a3457e0634f8

1095

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

1096

Date: Mon Mar 14 20:26:23 2011 +1100

1097

1098

Import MxGtkLightSwitch from Mx

1099

1100

Available under the terms of the LGPL 2.1.

1101

1102

libempathy-gtk/Makefile.am | 8 +-

1103

libempathy-gtk/mx-gtk-light-switch.c | 539

1104

++++++++++++++++++++++++++++++++++

1105

libempathy-gtk/mx-gtk-light-switch.h | 71 +++++

1106

po/POTFILES.in | 1 +

1107

4 files changed, 617 insertions(+), 2 deletions(-)

1108

1109

commit 706bdd3ad6d9c788015a5e8733046e653dcbbd21

1110

Merge: e28558f a340eee

1111

Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

1112

Date: Mon Mar 14 12:57:55 2011 +0000

1113

1114

Merge branch 'remove-liveadder' into gnome-2-34

1115

1116

commit a340eeee18728a1fc59ddcb641b49537d03dd60a

1117

Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

1118

Date: Mon Mar 14 12:14:32 2011 +0000

1119

1120

Only distroy the video output if it exists

1121

1122

src/empathy-call-window.c | 3 ++-

1123

1 files changed, 2 insertions(+), 1 deletions(-)

1124

1125

commit b159d5e210b2ffd38d6c0d59f5758e58e7054969

1126

Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

1127

Date: Mon Mar 14 12:14:13 2011 +0000

1128

1129

Monitor the call state and close the channel when it ends

1130

1131

src/empathy-call-handler.c | 17 +++++++++++++++++

1132

1 files changed, 17 insertions(+), 0 deletions(-)

1133

1134

commit 8e5dd810b778a722b0f7d0b8d233ff187547cbbf

1135

Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

1136

Date: Mon Mar 14 11:09:23 2011 +0000

1137

1138

Lock the hash table contents when using them

1139

1140

src/empathy-audio-sink.c | 24 +++++++++++++++++++++++-

1141

1 files changed, 23 insertions(+), 1 deletions(-)

1142

1143

commit e026781c4d7974cc047a823512fb6cb8aa266f17

1144

Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

1145

Date: Mon Mar 14 09:37:43 2011 +0000

1146

1147

Ensure our bin doesn't change state before being in the hash table

1148

1149

src/empathy-audio-sink.c | 12 ++++++++++--

1150

1 files changed, 10 insertions(+), 2 deletions(-)

1151

1152

commit e8a99ac3fc77e2746078b688c208963df5ae19aa

1153

Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

1154

Date: Fri Mar 11 19:02:43 2011 +0000

1155

1156

Remove live-adder

1157

1158

src/empathy-call-window.c | 116

1159

+++++-----------------------------

1160

src/empathy-streamed-media-window.c | 119

1161

+++++------------------------------

1162

2 files changed, 30 insertions(+), 205 deletions(-)

1163

1164

commit 952d1607e5be84369843eaaee6f1b668330bd9ff

1165

Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

1166

Date: Fri Mar 11 19:01:17 2011 +0000

1167

1168

Implement request pads for multiple sinks

1169

1170

Instead of using an live-adder we're moving to using multiple

1171

pulseaudio

1172

sinks as pulse can do the right thing (tm). To make this easy for the

1173

call window have one bin that handles all the juggling of audiosinks

1174

and

1175

audio conversion

1176

1177

src/empathy-audio-sink.c | 274

1178

++++++++++++++++++++++++++++++++++++++--------

1179

src/empathy-audio-sink.h | 2 +

1180

2 files changed, 230 insertions(+), 46 deletions(-)

1181

1182

commit e28558ffcd25c365ca6992e6e03ce59ec9e8d9fb

1183

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

1184

Date: Fri Mar 11 14:42:14 2011 +0000

1185

1186

Add a .client and a .service file for empathy-call

1187

1188

https://bugzilla.gnome.org/show_bug.cgi?id=644500

1189

1190

data/Empathy.Call.client | 21

1191

++++++++++++++++++++

1192

data/Makefile.am | 9 ++++++-

1193

...esktop.Telepathy.Client.Empathy.Call.service.in | 3 ++

1194

3 files changed, 31 insertions(+), 2 deletions(-)

1195

1196

commit 2bf0786b1afd3e9c9c4bead7d9704ae2c18303fc

3341

commit 82aa40180c8cdf81ea3d8a7b217f3435a2ffcbbc

3342

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

3343

Date: Mon Mar 14 13:41:27 2011 +0100

3344

3345

coding style fixes

3346

3347

libempathy-gtk/empathy-contact-menu.c | 2 +-

3348

src/empathy-chat-window.c | 2 +-

3349

2 files changed, 2 insertions(+), 2 deletions(-)

3350

3351

commit fcb0c8c46779ef6f37575fda25500d26b49a4227

3352

Author: Khaled Hosny <khaledhosny@eglug.org>

3353

Date: Mon Mar 14 14:47:37 2011 +0200

3354

3355

Updated Arabic translation

3356

3357

po/ar.po | 205

3358

++++++++++++++++++++++++++++++++++++++++++++------------------

3359

1 files changed, 147 insertions(+), 58 deletions(-)

3360

3361

commit 9e16a464a2ca6eab92404bfe1867a3d5ec3d43d7

3362

Author: Khaled Hosny <khaledhosny@eglug.org>

3363

Date: Mon Mar 14 14:33:17 2011 +0200

3364

3365

Add missing files

3366

3367

po/POTFILES.in | 2 ++

3368

1 files changed, 2 insertions(+), 0 deletions(-)

3369

3370

commit 8e6a977d36aea1eb4b429ddee84cb9b4bc4142cd

3371

Merge: 2e3e5e8 c0eca04

3372

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

3373

Date: Mon Mar 14 12:58:00 2011 +1100

3374

3375

Merge branch 'glassrose-contact-blocking-rebase'

3376

3377

commit 2e3e5e8e732fbc2e4d3ed61892aefa09efabbfc2

3378

Author: Michael Kotsarinis <mk73628@gmail.com>

3379

Date: Sun Mar 13 20:04:58 2011 +0200

3380

3381

l10n: Updated Greek translation

3382

3383

po/el.po | 977

3384

+++++++++++++++++++++++++++++++++-----------------------------

3385

1 files changed, 527 insertions(+), 450 deletions(-)

3386

3387

commit e6a451f6f2127740016a9eea16e0a5b0feb9d47e

3388

Author: Ivar Smolin <okul@linux.ee>

3389

Date: Sun Mar 13 16:01:56 2011 +0200

3390

3391

[l10n] Updated Estonian translation

3392

3393

po/et.po | 30 ++++++++++++++++++++++++++----

3394

1 files changed, 26 insertions(+), 4 deletions(-)

3395

3396

commit 7ed12df7f33acfafd2c264f207854b21744bc3e1

3397

Author: Gabor Kelemen <kelemeng@gnome.hu>

3398

Date: Sun Mar 13 02:50:53 2011 +0100

3399

3400

Updated Hungarian translation

3401

3402

po/hu.po | 956

3403

+++++++++++++++++++++++++++++++++-----------------------------

3404

1 files changed, 512 insertions(+), 444 deletions(-)

3405

3406

commit 0d9edf1afdec76ee1885c986eeb8c79fee9016d9

3407

Author: Lucian Adrian Grijincu <lucian.grijincu@gmail.com>

3408

Date: Sat Mar 12 04:21:11 2011 +0100

3409

3410

Updated Romanian translation

3411

3412

po/ro.po | 66

3413

+++++++++++++++++++++++++++++++-------------------------------

3414

1 files changed, 33 insertions(+), 33 deletions(-)

3415

3416

commit 432364e42cba5c3ba3f31218fc5da880de32f242

3417

Author: Lucian Adrian Grijincu <lucian.grijincu@gmail.com>

3418

Date: Sat Mar 12 04:14:20 2011 +0100

3419

3420

Updated Romanian translation

3421

3422

po/ro.po | 57 ++++++++++++++++++++++++++-------------------------------

3423

1 files changed, 26 insertions(+), 31 deletions(-)

3424

3425

commit db498504eae855196f1a9a4033ed99a6281c87df

3426

Author: Lucian Adrian Grijincu <lucian.grijincu@gmail.com>

3427

Date: Sat Mar 12 04:08:15 2011 +0100

3428

3429

Updated Romanian translation

3430

3431

po/ro.po | 284

3432

++++++++++++++++++++++++++------------------------------------

3433

1 files changed, 117 insertions(+), 167 deletions(-)

3434

3435

commit 1f065e04fbcdb28d41b80ae3a48f9d47e9e7f812

3436

Author: Lucian Adrian Grijincu <lucian.grijincu@gmail.com>

3437

Date: Sat Mar 12 03:32:13 2011 +0100

3438

3439

Updated Romanian translation

3440

3441

po/ro.po | 1592

3442

++++++++++++++++++++++++++++++++++++--------------------------

3443

1 files changed, 935 insertions(+), 657 deletions(-)

3444

3445

commit 9c99b6b7e742402b1fd087ced138896caebe3fb0

3446

Author: Daniel Nylander <po@danielnylander.se>

3447

Date: Fri Mar 11 19:10:47 2011 +0100

3448

3449

Updated Swedish translation

3450

3451

po/sv.po | 1020

3452

++++++++++++++++++++++++++++++++++++++++++++++++++++----------

3453

1 files changed, 862 insertions(+), 158 deletions(-)

3454

3455

commit e982efac9e472070ff169daaf079673c4abdf816

3456

Author: Daniel Nylander <po@danielnylander.se>

3457

Date: Fri Mar 11 19:10:15 2011 +0100

3458

3459

Updated Swedish translation

3460

3461

po/sv.po | 98

3462

++++++++++++++++++++++++++++++++++----------------------------

3463

1 files changed, 54 insertions(+), 44 deletions(-)

3464

3465

commit 6d333a13c020f44505fca6eb3fb54536143dafbf

3466

Author: Daniel Nylander <po@danielnylander.se>

3467

Date: Tue Mar 8 08:31:39 2011 +0100

3468

3469

Updated Swedish translation

3470

3471

po/sv.po | 81

3472

++++++++++++++++++++++++++++++++++++--------------------------

3473

1 files changed, 47 insertions(+), 34 deletions(-)

3474

3475

commit 4a31ec6419c4b15e3e96c3ab05c9d787d1a84951

3476

Author: Khaled Hosny <khaledhosny@eglug.org>

3477

Date: Fri Mar 11 14:58:23 2011 +0200

3478

3479

Updated Arabic translation

3480

3481

po/ar.po | 167

3482

+++++++++++++++++++++++++++++++++++---------------------------

3483

1 files changed, 94 insertions(+), 73 deletions(-)

3484

3485

commit 037e132ba999ebad4f3f0a643ce33c61d0343f6a

1197

3486

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

1198

3487

Date: Fri Mar 11 12:23:25 2011 +0100

1199

3488

1202

3491

data/Empathy.Auth.client | 3 +++

1203

3492

1 files changed, 3 insertions(+), 0 deletions(-)

1204

3493

1205

commit d42f413aec2997c59c20e305e1fa0c7f8dae9c2a

3494

commit c0eca0414ca529da3b083c099ec3031436420b00

1206

3495

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

1207

3496

Date: Fri Mar 11 12:05:24 2011 +1100

1208

3497

1211

3500

libempathy-gtk/empathy-contact-dialogs.c | 7 ++++---

1212

3501

1 files changed, 4 insertions(+), 3 deletions(-)

1213

3502

1214

commit 20e419d127c87e1c00c1dbe6236ac013090ea319

1215

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

1216

Date: Fri Mar 11 11:39:48 2011 +1100

1217

1218

Reword 'Remove Contact'

1219

1220

This comes from usability feedback from Canonical

1221

1222

libempathy-gtk/empathy-individual-view.c | 6 +++---

1223

1 files changed, 3 insertions(+), 3 deletions(-)

1224

1225

commit 0e3cb52a72f79ff77fa4cf2445c3c3eae4a9cf76

3503

commit 355a558cfa919b1fa91f7c430c738b6d762239fb

1226

3504

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

1227

3505

Date: Fri Mar 11 11:08:06 2011 +1100

1228

3506

1234

3512

+++++++++++++++++++++------

1235

3513

1 files changed, 56 insertions(+), 15 deletions(-)

1236

3514

1237

commit cf3de9d34d649a4b4711224ff581710542de3bab

1238

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

1239

Date: Thu Mar 10 16:50:39 2011 +0000

1240

1241

Display Upgrade Software errors

1242

1243

https://bugzilla.gnome.org/show_bug.cgi?id=644360

1244

1245

libempathy/empathy-utils.c | 2 +

1246

src/empathy-main-window.c | 134

1247

++++++++++++++++++++++++++++++++++++++++++++

1248

2 files changed, 136 insertions(+), 0 deletions(-)

1249

1250

commit 4dec7a70c17c13a8f731972bca83ed6903746c95

1251

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

1252

Date: Thu Mar 10 15:12:15 2011 +0000

1253

1254

Check for TP_ERROR_EMERGENCY_CALLS_NOT_SUPPORTED when a call fails

1255

1256

libempathy-gtk/empathy-call-utils.c | 2 ++

3515

commit 0b2f92fa593370c799cc16b8cecf575cf3e5b130

3516

Author: Chandni Verma <chandniverma2112@gmail.com>

3517

Date: Fri Mar 11 12:27:23 2011 +0530

3518

3519

Add FIXME to empathy_individual_manager_supports_blocking()

3520

3521

The parameter @self is not required and the method can be placed in

3522

utility. I left it as it is to stay coherent with empathy-2.34

3523

and attached a FIXME to be fixed after empathy 2.x is done.

3524

3525

libempathy/empathy-individual-manager.c | 2 ++

1257

3526

1 files changed, 2 insertions(+), 0 deletions(-)

1258

3527

1259

commit fe8febb3a87c87a2ccdc5ad452b18f0d6c4f3017

1260

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

1261

Date: Thu Mar 10 13:43:08 2011 +0000

1262

1263

Bump tp-glib requirement for the new errors

1264

1265

configure.ac | 2 +-

1266

1 files changed, 1 insertions(+), 1 deletions(-)

1267

1268

commit b282a16c129b5fd965217146d149df85b69b094a

1269

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

1270

Date: Thu Mar 10 12:02:27 2011 +0000

1271

1272

Fix a couple of 'may be used uninitialized' warnings

1273

1274

libempathy-gtk/empathy-contact-list-view.c | 4 ++--

1275

1 files changed, 2 insertions(+), 2 deletions(-)

1276

1277

commit 0fbfa19469d0ace2b6ac0b11e2176a1088fef64b

1278

Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

1279

Date: Wed Mar 9 18:33:02 2011 +0000

1280

1281

media_type is of type FsMediaType, so use that enum to compare

1282

1283

src/empathy-call-window.c | 4 ++--

1284

1 files changed, 2 insertions(+), 2 deletions(-)

1285

1286

commit e619a7b070c4e7b19d2398068eca480887e82ce0

1287

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

1288

Date: Wed Mar 9 11:47:12 2011 +0100

1289

1290

remove released flag

1291

1292

configure.ac | 2 +-

1293

1 files changed, 1 insertions(+), 1 deletions(-)

1294

1295

commit a8582b613fe75b203b634c8df419ccf1fb19a774

1296

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

1297

Date: Wed Mar 9 11:39:02 2011 +0100

1298

1299

add 2.33.3 release notes

1300

1301

NEWS | 7 +++++++

1302

1 files changed, 7 insertions(+), 0 deletions(-)

1303

1304

commit a9255799804f9542f5b46470b184ced7c75136e8

1305

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

1306

Date: Wed Mar 9 11:21:17 2011 +0100

1307

1308

coding style fixes

1309

1310

libempathy-gtk/empathy-contact-menu.c | 2 +-

1311

src/empathy-chat-window.c | 2 +-

1312

2 files changed, 2 insertions(+), 2 deletions(-)

1313

1314

commit 1b0c27337f552359260634ddb7dc25c94f337ef5

1315

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

1316

Date: Wed Mar 9 11:09:52 2011 +0100

1317

1318

prepare 2.33.3

1319

1320

NEWS | 17 +++++++++++++++++

1321

configure.ac | 4 ++--

1322

2 files changed, 19 insertions(+), 2 deletions(-)

1323

1324

commit 2161a418c4fb9d8c8970e36480fcfb1c010ee9ba

1325

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

1326

Date: Wed Mar 9 11:10:29 2011 +0100

1327

1328

Revert "libempathy-gtk: In TLS Dialog allow remembering of any

1329

exception."

1330

1331

This reverts commit d6dccee01a1554244d31d7bdc79f23212a7a3f4f.

1332

1333

The certificate management refactoring have not been backported to

1334

2.34 so we

1335

can't backport this fix either.

1336

1337

libempathy-gtk/empathy-tls-dialog.c | 21 +++++++++++++++------

1338

1 files changed, 15 insertions(+), 6 deletions(-)

1339

1340

commit daf27468745030f6e3255972e923507e37b5ed17

1341

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

1342

Date: Wed Mar 9 10:22:23 2011 +0100

1343

1344

remove released flag

1345

1346

Seems I forgot to remove it after the last release.

1347

1348

configure.ac | 2 +-

1349

1 files changed, 1 insertions(+), 1 deletions(-)

1350

1351

commit 2803c580f5d7c096895c462fd549a022fba49f14

1352

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

1353

Date: Wed Mar 9 10:22:11 2011 +0100

1354

1355

contact-search-dialog: fix compilation warnings

1356

1357

libempathy-gtk/empathy-contact-search-dialog.c | 2 +-

1358

1 files changed, 1 insertions(+), 1 deletions(-)

1359

1360

commit d6dccee01a1554244d31d7bdc79f23212a7a3f4f

3528

commit 0deb4db1b785bfe4497de50cf04efdd873f58009

3529

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

3530

Date: Tue Feb 15 08:19:46 2011 +1100

3531

3532

Use tp_g_signal_connect_object for Tp proxies that outlive the

3533

CB dialog

3534

3535

libempathy-gtk/empathy-contact-blocking-dialog.c | 10 ++++++----

3536

1 files changed, 6 insertions(+), 4 deletions(-)

3537

3538

commit 5690460d1809f6e181c3eeed2aa930af1253b38c

3539

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

3540

Date: Mon Feb 14 12:44:34 2011 +1100

3541

3542

Use Conn.I.CB to report contacts as abusive when blocking them

3543

3544

libempathy/empathy-tp-contact-list.c | 13 +++++++++++--

3545

1 files changed, 11 insertions(+), 2 deletions(-)

3546

3547

commit 4b7d2787c3d4487647628109e14a6618e3db8da8

3548

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

3549

Date: Mon Feb 14 12:36:22 2011 +1100

3550

3551

Only destroy block confirmation dialogs after we've read out the

3552

abusive state

3553

3554

libempathy-gtk/empathy-contact-dialogs.c | 3 +--

3555

libempathy-gtk/empathy-individual-dialogs.c | 3 ++-

3556

2 files changed, 3 insertions(+), 3 deletions(-)

3557

3558

commit 80d502ca384aaf07e2b572da7414d7ff36e91936

3559

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

3560

Date: Mon Feb 14 12:24:58 2011 +1100

3561

3562

Determine whether a connection supports reporting abuse, set the

3563

connection flag

3564

3565

libempathy/empathy-tp-contact-list.c | 36

3566

++++++++++++++++++++++++++++++++++

3567

1 files changed, 36 insertions(+), 0 deletions(-)

3568

3569

commit 428ac8930ef8cf312523a4d8b24eeda26729c4b3

3570

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

3571

Date: Mon Feb 14 12:10:35 2011 +1100

3572

3573

Add draft Conn.I.ContactBlocking (danni's version) to extensions

3574

3575

.../Connection_Interface_Contact_Blocking.xml | 172

3576

++++++++++++++++++++

3577

extensions/Makefile.am | 1 +

3578

extensions/misc.xml | 1 +

3579

3 files changed, 174 insertions(+), 0 deletions(-)

3580

3581

commit 103b4d5da19bf7ebf648658b8ff0ccab88aa24bd

3582

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

3583

Date: Mon Feb 14 12:00:56 2011 +1100

3584

3585

Hook up abusive argument into TpContactList backend

3586

3587

libempathy-gtk/empathy-contact-dialogs.c | 6 ++++--

3588

libempathy-gtk/empathy-contact-menu.c | 6 +++---

3589

libempathy-gtk/empathy-individual-view.c | 7 +++++--

3590

libempathy/empathy-contact-list.c | 5 +++--

3591

libempathy/empathy-contact-list.h | 6 ++++--

3592

libempathy/empathy-contact-manager.c | 6 ++++--

3593

libempathy/empathy-individual-manager.c | 5 +++--

3594

libempathy/empathy-individual-manager.h | 3 ++-

3595

libempathy/empathy-tp-contact-list.c | 3 ++-

3596

9 files changed, 30 insertions(+), 17 deletions(-)

3597

3598

commit 0a9fd8a0a7517f099ca1b908679ab7935513cd9a

3599

Author: Chandni Verma <chandniverma2112@gmail.com>

3600

Date: Fri Mar 11 07:53:15 2011 +0530

3601

3602

Initialize EmpathyContactManager before creating a new contact->Block

3603

menuitem

3604

3605

libempathy-gtk/empathy-contact-menu.c | 3 ++-

3606

1 files changed, 2 insertions(+), 1 deletions(-)

3607

3608

commit dfbccc45923082027415c3c76322febf470c5901

3609

Author: Chandni Verma <chandniverma2112@gmail.com>

3610

Date: Fri Mar 11 07:50:51 2011 +0530

3611

3612

Setting "window" data on submenu only if it's not NULL

3613

3614

src/empathy-chat-window.c | 6 +++---

3615

1 files changed, 3 insertions(+), 3 deletions(-)

3616

3617

commit bbbfc7bb3c209fbc387c1e2c0566ec83aae687b9

3618

Author: Gil Forcada <gforcada@gnome.org>

3619

Date: Fri Mar 11 00:21:38 2011 +0100

3620

3621

[l10n] Updated Catalan translation

3622

3623

po/ca.po | 152

3624

+++++++++++++++++++++++++++++++++-----------------------------

3625

1 files changed, 81 insertions(+), 71 deletions(-)

3626

3627

commit 39e6b7d1fb458d9fba486da9ffe19e8c80d13e0f

3628

Author: Yaron Shahrabani <sh.yaron@gmail.com>

3629

Date: Thu Mar 10 18:38:43 2011 +0200

3630

3631

Updated Hebrew translation.

3632

3633

po/he.po | 167

3634

+++++++++++++++++++++++++++++++++++---------------------------

3635

1 files changed, 95 insertions(+), 72 deletions(-)

3636

3637

commit 5392210e8ffefcc7b825c4b1279ec69268d3cf6b

3638

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

3639

Date: Thu Mar 10 12:20:16 2011 +0100

3640

3641

Update our local fields having Overwritten_By_Nickname when updating

3642

our nickname (#644298)

3643

3644

libempathy-gtk/empathy-contact-widget.c | 43

3645

+++++++++++++++++++++++++++++++

3646

1 files changed, 43 insertions(+), 0 deletions(-)

3647

3648

commit 1e2ef0f3c681511d1b1e82a51f82b52b9414605f

3649

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

3650

Date: Thu Mar 10 12:04:37 2011 +0100

3651

3652

don't update Alias.Nickname if not needed

3653

3654

libempathy-gtk/empathy-contact-widget.c | 11 +++++++++--

3655

1 files changed, 9 insertions(+), 2 deletions(-)

3656

3657

commit aaa8d50fa75585a71d61332a8109916099ce35a4

3658

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

3659

Date: Thu Mar 10 11:59:46 2011 +0100

3660

3661

inline set_alias_on_account()

3662

3663

libempathy-gtk/empathy-contact-widget.c | 13 +++----------

3664

1 files changed, 3 insertions(+), 10 deletions(-)

3665

3666

commit c47b9f66fbc23e627a4458cc86d53d5d56b901b7

3667

Author: Piotr Drąg <piotrdrag@gmail.com>

3668

Date: Wed Mar 9 21:22:12 2011 +0100

3669

3670

Updated Polish translation

3671

3672

po/pl.po | 1123

3673

+++++++++++++++++++++++++++++++++++---------------------------

3674

1 files changed, 639 insertions(+), 484 deletions(-)

3675

3676

commit a8605cd844511f18806460bfac2d6d9a95d48603

3677

Author: Daniel Mustieles <daniel.mustieles@gmail.com>

3678

Date: Wed Mar 9 19:38:51 2011 +0100

3679

3680

Updated Spanish translation

3681

3682

po/es.po | 74

3683

+++++++++++++++++++++++++++++++++++--------------------------

3684

1 files changed, 42 insertions(+), 32 deletions(-)

3685

3686

commit ec1bdc5f4fc5591b081c3036cef2951ba0975ac9

3687

Author: Matej Urbančič <mateju@svn.gnome.org>

3688

Date: Wed Mar 9 17:37:51 2011 +0100

3689

3690

Updated Slovenian translation

3691

3692

po/sl.po | 215

3693

++++++++++++++++++++++++++++++++++----------------------------

3694

1 files changed, 119 insertions(+), 96 deletions(-)

3695

3696

commit fbe4c00e6fd22b199e28bc950f34561e7cf16bdc

3697

Author: Daniel Korostil <ted.korostiled@gmail.com>

3698

Date: Wed Mar 9 18:05:44 2011 +0200

3699

3700

Uploaded Ukranian

3701

3702

po/uk.po | 167

3703

+++++++++++++++++++++++++++++++++++---------------------------

3704

1 files changed, 95 insertions(+), 72 deletions(-)

3705

3706

commit 52d15a1d9e54d6311012ffad54d7e7881ab48f55

3707

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

3708

Date: Wed Mar 9 16:07:56 2011 +0100

3709

3710

contact-widget: don't allow edit fields having the

3711

Overwritten_By_Nickname flag (#644296)

3712

3713

libempathy-gtk/empathy-contact-widget.c | 13 +++++++++++++

3714

1 files changed, 13 insertions(+), 0 deletions(-)

3715

3716

commit de12575fb9f2e1b4945798ad44c225faa78d333d

3717

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

3718

Date: Wed Mar 9 13:02:18 2011 +0100

3719

3720

contact-widget: only call SetContactInfo() is details changed

3721

(#644295)

3722

3723

libempathy-gtk/empathy-contact-widget.c | 39

3724

+++++++++++++++++++++++++-----

3725

1 files changed, 32 insertions(+), 7 deletions(-)

3726

3727

commit e469159d894fd16ff425dca1a3e0a65ab69e2deb

3728

Merge: ee32beb c3eb5ce

1361

3729

Author: Stef Walter <stefw@collabora.co.uk>

1362

Date: Tue Mar 8 07:34:35 2011 +0100

1363

1364

libempathy-gtk: In TLS Dialog allow remembering of any exception.

1365

1366

Previously we couldn't do this because we had nowhere to store these

1367

exceptions. But now this is possible because we're storing them

1368

as trust

1369

assertions.

1370

1371

https://bugzilla.gnome.org/show_bug.cgi?id=639417

1372

1373

libempathy-gtk/empathy-tls-dialog.c | 21 ++++++---------------

1374

1 files changed, 6 insertions(+), 15 deletions(-)

1375

1376

commit d29d43f132b9459ee51cd3e712a6f2b671c20077

3730

Date: Wed Mar 9 09:10:23 2011 +0100

3731

3732

Merge branch 'remember-any-exception'

3733

3734

commit ee32bebf86571c0eb386820f741b98d0f8504be6

1377

3735

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

1378

Date: Wed Mar 9 10:14:34 2011 +0100

1379

1380

Update to telepathy-yell master

1381

1382

telepathy-yell | 2 +-

3736

Date: Wed Mar 9 09:02:17 2011 +0100

3737

3738

remove released flag

3739

3740

configure.ac | 2 +-

1383

3741

1 files changed, 1 insertions(+), 1 deletions(-)

1384

3742

1385

commit ef9b1ef55e7041e7c9514e4d62cc63aba8f01c72

3743

commit 81ba0edc73b6a226a054b76539645b7b4e5e2a99

3744

Author: Chandni Verma <chandniverma2112@gmail.com>

3745

Date: Tue Mar 8 13:36:05 2011 +0530

3746

3747

Use Contact Manager flags instead of Individual Manager flags

3748

3749

libempathy-gtk/empathy-individual-dialogs.c | 17 +++++----

3750

libempathy/empathy-individual-manager.c | 48

3751

++++++--------------------

3752

libempathy/empathy-individual-manager.h | 11 ------

3753

3 files changed, 20 insertions(+), 56 deletions(-)

3754

3755

commit 4d96e3ad50ccd6c25dae811f42fde02e303b2066

3756

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

3757

Date: Tue Mar 8 18:37:47 2011 +0100

3758

3759

prepare 2.91.91

3760

3761

NEWS | 48 ++++++++++++++++++++++++++++++++++++++++++++++++

3762

configure.ac | 6 +++---

3763

2 files changed, 51 insertions(+), 3 deletions(-)

3764

3765

commit b27e3726d374beca4ba3aaf384d22c488edc3590

1386

3766

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

1387

3767

Date: Tue Mar 8 18:18:59 2011 +0100

1388

3768

1391

3771

src/empathy-call-observer.c | 5 ++++-

1392

3772

1 files changed, 4 insertions(+), 1 deletions(-)

1393

3773

1394

commit 3cec53263f6c29d462e300f02d1ef2718be21371

3774

commit 26ef41ebb67957d65436624b03af1f9ac18f58e5

1395

3775

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

1396

3776

Date: Tue Mar 8 17:39:27 2011 +0100

1397

3777

1400

3780

po/POTFILES.in | 1 +

1401

3781

src/empathy-call-observer.c | 99

1402

3782

+++++++++++++++++++++++++++++++++++++++----

1403

telepathy-yell | 2 +-

1404

3 files changed, 93 insertions(+), 9 deletions(-)

3783

2 files changed, 92 insertions(+), 8 deletions(-)

1405

3784

1406

commit 3af8ed19330be02a6fc36829fd81ed74788db644

3785

commit 9cd35a6b1cdcd23c5baf38cd6bba53866d7bbdfa

1407

3786

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

1408

3787

Date: Tue Mar 8 17:27:50 2011 +0100

1409

3788

1414

3793

src/empathy-call-observer.c | 2 +-

1415

3794

1 files changed, 1 insertions(+), 1 deletions(-)

1416

3795

1417

commit fff311b1d870528773b4fe65ccd425f2441e4aba

3796

commit 2ecaf0508db1c5115b1da1dbd8cb6ad679922e7c

3797

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

3798

Date: Tue Mar 8 15:12:20 2011 +0100

3799

3800

Revert "disable the call observer for now"

3801

3802

This reverts commit c4f12fc9ad76f90374e08460971f001fdfb90036.

3803

3804

src/empathy-main-window.c | 5 -----

3805

1 files changed, 0 insertions(+), 5 deletions(-)

3806

3807

commit ce13127604887b13d2059adb780ce6c121e84de9

1418

3808

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

1419

3809

Date: Tue Mar 8 16:47:09 2011 +0100

1420

3810

1430

3820

+++++++++++++++++++++++++++++++++++++++----

1431

3821

1 files changed, 74 insertions(+), 7 deletions(-)

1432

3822

1433

commit b1f241686cca06cf25f48eb7212b536ed1a6391d

3823

commit c87a719dbd15c6c527b0249b9e466456da5968aa

1434

3824

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

1435

3825

Date: Tue Mar 8 16:31:03 2011 +0100

1436

3826

1439

3829

src/empathy-call-observer.c | 2 ++

1440

3830

1 files changed, 2 insertions(+), 0 deletions(-)

1441

3831

1442

commit e6016c3d672c0ea95170271d703733730d256b3f

3832

commit d1c3f0d9952f6806da997428d99cce3c8cb62d95

1443

3833

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

1444

3834

Date: Tue Mar 8 15:47:26 2011 +0100

1445

3835

1449

3839

src/empathy-call-observer.c | 2 ++

1450

3840

1 files changed, 2 insertions(+), 0 deletions(-)

1451

3841

1452

commit 0984fed5c7773df78a918e6fd47ca12c9bdec652

3842

commit 7c8e0dca9ac2e75a6d1522dc5d84c7e48175686b

1453

3843

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

1454

3844

Date: Tue Mar 8 16:29:39 2011 +0100

1455

3845

1458

3848

src/empathy-call-observer.c | 7 ++++++-

1459

3849

1 files changed, 6 insertions(+), 1 deletions(-)

1460

3850

1461

commit 65f94e4158b9a9286717cb5aeae506c015dbd489

1462

Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

1463

Date: Tue Mar 8 12:35:43 2011 +0000

1464

1465

Update the repository to freedesktop.org

1466

1467

.gitmodules | 2 +-

1468

1 files changed, 1 insertions(+), 1 deletions(-)

1469

1470

commit b8e3bcf614c420f7930292be7b432fdcabe71b32

3851

commit ddc6bf1db6787ece63bc28fdee0c7424a638e83a

3852

Author: Kjartan Maraas <kmaraas@gnome.org>

3853

Date: Tue Mar 8 14:42:48 2011 +0100

3854

3855

Updated Norwegian bokmål translation

3856

3857

po/nb.po | 85

3858

+++++++++++++++++++++++++++++++++++++------------------------

3859

1 files changed, 51 insertions(+), 34 deletions(-)

3860

3861

commit 7bab1095747eb7691532fa857b30cb6b11a54b02

3862

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

3863

Date: Tue Mar 8 08:29:23 2011 +0100

3864

3865

depends on GTK+ 3.0.2

3866

3867

We need it for GTK_STYLE_CLASS_PRIMARY_TOOLBAR.

3868

3869

configure.ac | 2 +-

3870

1 files changed, 1 insertions(+), 1 deletions(-)

3871

3872

commit c3eb5ce5e5c98bfbd6e190b2b1b7eac11d1d160d

3873

Author: Stef Walter <stefw@collabora.co.uk>

3874

Date: Tue Mar 8 07:34:35 2011 +0100

3875

3876

libempathy-gtk: In TLS Dialog allow remembering of any exception.

3877

3878

Previously we couldn't do this because we had nowhere to store these

3879

exceptions. But now this is possible because we're storing them

3880

as trust

3881

assertions.

3882

3883

https://bugzilla.gnome.org/show_bug.cgi?id=639417

3884

3885

libempathy-gtk/empathy-tls-dialog.c | 21 ++++++---------------

3886

1 files changed, 6 insertions(+), 15 deletions(-)

3887

3888

commit e0a6f43c066920f6720db060c4b055288efdb721

3889

Author: Yuri Myasoedov <omerta13@yandex.ru>

3890

Date: Tue Mar 8 09:23:25 2011 +0300

3891

3892

Updated Russian translation

3893

3894

po/ru.po | 584

3895

++++++++++++++++++++++----------------------------------------

3896

1 files changed, 210 insertions(+), 374 deletions(-)

3897

3898

commit 3ff78cbfcfe5dd8cbda7263764d3a8d93995bc20

3899

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

3900

Date: Fri Feb 11 20:30:56 2011 +1100

3901

3902

Style fixes from review

3903

3904

libempathy-gtk/empathy-individual-dialogs.c | 4 +++-

3905

libempathy-gtk/empathy-individual-dialogs.h | 3 ++-

3906

2 files changed, 5 insertions(+), 2 deletions(-)

3907

3908

commit 95bbacd1eda4500ef9cef0f998ebb485861a3a3d

3909

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

3910

Date: Fri Feb 11 16:17:48 2011 +1100

3911

3912

Add confirmation dialog to Remove

3913

3914

Also includes the future Report Abusive check box, so that all

3915

the strings

3916

are in place now.

3917

3918

libempathy-gtk/empathy-individual-dialogs.c | 94

3919

+++++++++++++++++++++++++++

3920

libempathy-gtk/empathy-individual-dialogs.h | 2 +

3921

libempathy-gtk/empathy-individual-view.c | 16 ++++-

3922

libempathy/empathy-individual-manager.c | 2 +

3923

libempathy/empathy-individual-manager.h | 1 +

3924

5 files changed, 112 insertions(+), 3 deletions(-)

3925

3926

commit 1e15d1b253163c98064997aabe6b127acbecc64b

3927

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

3928

Date: Fri Feb 11 15:27:05 2011 +1100

3929

3930

Add block confirmation to the authorise publication dialog

3931

3932

libempathy-gtk/empathy-contact-dialogs.c | 22 +++++++++++++++++-----

3933

1 files changed, 17 insertions(+), 5 deletions(-)

3934

3935

commit 95283d6bffb0b907ec1741c6c685e7fe67d701a0

3936

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

3937

Date: Fri Feb 11 13:46:07 2011 +1100

3938

3939

Add UI to blocking confirmation dialog for future "report as abusive"

3940

function

3941

3942

libempathy-gtk/empathy-contact-dialogs.c | 33

3943

+++++++++++++++++++++++++++--

3944

libempathy/empathy-contact-list.h | 1 +

3945

2 files changed, 31 insertions(+), 3 deletions(-)

3946

3947

commit 9cf8d924a615ead7f3e74644d0b9d39532645649

3948

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

3949

Date: Fri Feb 11 13:31:26 2011 +1100

3950

3951

Factor out common blocking confirmation dialog

3952

3953

libempathy-gtk/empathy-contact-dialogs.c | 43

3954

++++++++++++++++++++++++++++++

3955

libempathy-gtk/empathy-contact-dialogs.h | 3 ++

3956

libempathy-gtk/empathy-contact-menu.c | 33 +++++------------------

3957

3 files changed, 53 insertions(+), 26 deletions(-)

3958

3959

commit 0c363023bd77f286bc6257db3f7d90aeb4e7b0f0

3960

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

3961

Date: Thu Feb 10 16:23:58 2011 +1100

3962

3963

contact-blocking-dialog: report errors to the user

3964

3965

libempathy-gtk/empathy-contact-blocking-dialog.c | 55

3966

++++++++++++++++++++-

3967

1 files changed, 52 insertions(+), 3 deletions(-)

3968

3969

commit 1a2bbd7b2824e683c772b4784b98dcd531e91089

3970

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

3971

Date: Thu Feb 10 15:56:02 2011 +1100

3972

3973

Don't leak EmpathyContact

3974

3975

libempathy/empathy-individual-manager.c | 2 ++

3976

1 files changed, 2 insertions(+), 0 deletions(-)

3977

3978

commit 9968dc5978d6eb12ccc1f1cc76ca08fc0a739e85

3979

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

3980

Date: Thu Feb 10 15:45:17 2011 +1100

3981

3982

Add Block button to the subscription authorization dialog

3983

3984

libempathy-gtk/empathy-contact-dialogs.c | 21 +++++++++++-

3985

libempathy-gtk/empathy-contact-dialogs.ui | 53

3986

++++++++++++++++++++++------

3987

2 files changed, 61 insertions(+), 13 deletions(-)

3988

3989

commit 59b19ff6eafdfb68c94305ca074243f293fefeea

3990

Author: A S Alam <aalam@users.sf.net>

3991

Date: Tue Mar 8 08:43:59 2011 +0530

3992

3993

update Punjabi Translation by A S Alam

3994

3995

po/pa.po | 84

3996

+++++++++++++++++++++++++++++++++++--------------------------

3997

1 files changed, 48 insertions(+), 36 deletions(-)

3998

3999

commit 8e95ee8c1455390b18126d2280bcd218777379a8

4000

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

4001

Date: Thu Feb 10 13:19:35 2011 +1100

4002

4003

Add a confirmation dialog when you block a contact from the Contact

4004

menu

4005

4006

libempathy-gtk/empathy-contact-menu.c | 43

4007

++++++++++++++++++++++++++++++++-

4008

src/empathy-chat-window.c | 7 ++++-

4009

2 files changed, 47 insertions(+), 3 deletions(-)

4010

4011

commit 630a864d8ebac32fb7c11317308468ddbc535815

4012

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

4013

Date: Wed Feb 9 17:29:18 2011 +1100

4014

4015

Add 'Delete and Block' as an option to the Remove Contact dialog

4016

4017

libempathy-gtk/empathy-individual-view.c | 34

4018

+++++++++++++++++++++--------

4019

1 files changed, 24 insertions(+), 10 deletions(-)

4020

4021

commit 6da159d09091d68a102c142b10747ae58755de51

4022

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

4023

Date: Wed Feb 9 17:24:27 2011 +1100

4024

4025

Add contact blocking support to EmpathyIndividualManager

4026

4027

libempathy/empathy-individual-manager.c | 104

4028

+++++++++++++++++++++++++++++++

4029

libempathy/empathy-individual-manager.h | 18 +++++

4030

2 files changed, 122 insertions(+), 0 deletions(-)

4031

4032

commit 4f3b2d373b9f22abdbf2679a8c87ec68c1ae1d20

4033

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

4034

Date: Wed Feb 9 13:05:20 2011 +1100

4035

4036

Add 'Block Contact' to empathy-contact-menu

4037

4038

libempathy-gtk/empathy-chat.c | 3 +-

4039

libempathy-gtk/empathy-contact-menu.c | 71

4040

+++++++++++++++++++++++++++++++++

4041

libempathy-gtk/empathy-contact-menu.h | 3 +-

4042

3 files changed, 75 insertions(+), 2 deletions(-)

4043

4044

commit 35500a8b9e672f703059707039a1ccee23dd3597

4045

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

4046

Date: Mon Feb 7 13:41:40 2011 +1100

4047

4048

Add contact blocking to EmpathyContactList and friends

4049

4050

libempathy/empathy-contact-list.c | 23 ++++++++++++

4051

libempathy/empathy-contact-list.h | 12 ++++++

4052

libempathy/empathy-contact-manager.c | 41 +++++++++++++++++++++

4053

libempathy/empathy-tp-contact-list.c | 64

4054

++++++++++++++++++++++++++++++---

4055

libempathy/empathy-tp-contact-list.h | 1 +

4056

5 files changed, 135 insertions(+), 6 deletions(-)

4057

4058

commit 67d602af3ed86c8df908dd8ad429bdb3f8ff5d5b

4059

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

4060

Date: Tue Feb 8 13:53:11 2011 +1100

4061

4062

Handle the case where there are no accounts with deny channels

4063

4064

libempathy-gtk/empathy-contact-blocking-dialog.c | 88

4065

+++++++++++++++-------

4066

1 files changed, 62 insertions(+), 26 deletions(-)

4067

4068

commit ac5479e2ab5b1291afd853892238b0eb22c6e345

4069

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

4070

Date: Tue Feb 8 12:16:15 2011 +1100

4071

4072

Don't need to prepare accounts separately

4073

4074

libempathy-gtk/empathy-contact-blocking-dialog.c | 41

4075

++++++----------------

4076

1 files changed, 11 insertions(+), 30 deletions(-)

4077

4078

commit 65bf3f42d6699ce32edccab2412dabe195eac68d

4079

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

4080

Date: Mon Feb 7 10:59:33 2011 +1100

4081

4082

Add blocked contacts dialog to Empathy main window menu

4083

4084

src/empathy-main-window.c | 17 ++++++++++++++++-

4085

src/empathy-main-window.ui | 7 +++++++

4086

2 files changed, 23 insertions(+), 1 deletions(-)

4087

4088

commit bf0586ea17afcd2ad04fefa24b8e74cd5e1f4b23

4089

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

4090

Date: Mon Feb 7 10:59:14 2011 +1100

4091

4092

Prepare EmpathyContactManager in test

4093

4094

.../test-empathy-contact-blocking-dialog.c | 7 +++++++

4095

1 files changed, 7 insertions(+), 0 deletions(-)

4096

4097

commit fe902c25eaf5944bba218bddd1484e87a85d9905

4098

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

4099

Date: Mon Feb 7 10:58:32 2011 +1100

4100

4101

Provide autocompletion of known contacts in the entry box

4102

4103

libempathy-gtk/empathy-contact-blocking-dialog.c | 52

4104

+++++++++++++++++++--

4105

1 files changed, 47 insertions(+), 5 deletions(-)

4106

4107

commit 290021178e77efb4324b4204d2ecf8124e60c65a

4108

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

4109

Date: Sun Feb 6 12:13:43 2011 +1100

4110

4111

Add and remove contacts from deny list

4112

4113

libempathy-gtk/empathy-contact-blocking-dialog.c | 171

4114

++++++++++++++++++++-

4115

libempathy-gtk/empathy-contact-blocking-dialog.ui | 24 ++--

4116

2 files changed, 183 insertions(+), 12 deletions(-)

4117

4118

commit f6b306beda8ade7053786826eb470005b42fea36

4119

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

4120

Date: Sun Feb 6 11:04:11 2011 +1100

4121

4122

Connect ::response in test

4123

4124

.../test-empathy-contact-blocking-dialog.c | 3 +++

4125

1 files changed, 3 insertions(+), 0 deletions(-)

4126

4127

commit a859b6a6a2f9dde93ef52b445266b5df3f50373a

4128

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

4129

Date: Fri Feb 4 17:55:24 2011 +1100

4130

4131

Test for contact blocking dialog

4132

4133

tests/interactive/.gitignore | 1 +

4134

tests/interactive/Makefile.am | 2 +

4135

.../test-empathy-contact-blocking-dialog.c | 45

4136

++++++++++++++++++++

4137

3 files changed, 48 insertions(+), 0 deletions(-)

4138

4139

commit 83e88245ea04ee0d66c98ce36bf4f7112cbd2f23

4140

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

4141

Date: Fri Feb 4 17:47:31 2011 +1100

4142

4143

Beginning of contact blocking dialog

4144

4145

Can currently select an account and view the contact blocking

4146

'deny' list.

4147

List reponds to changes in the group membership.

4148

4149

Add/Remove buttons do not yet do anything.

4150

4151

libempathy-gtk/Makefile.am | 3 +

4152

libempathy-gtk/empathy-contact-blocking-dialog.c | 514

4153

+++++++++++++++++++++

4154

libempathy-gtk/empathy-contact-blocking-dialog.h | 60 +++

4155

libempathy-gtk/empathy-contact-blocking-dialog.ui | 145 ++++++

4156

4 files changed, 722 insertions(+), 0 deletions(-)

4157

4158

commit bd4149f1340c9881f001455983f7eaba987bfcb8

4159

Author: Duarte Loreto <happyguy_pt@hotmail.com>

4160

Date: Mon Mar 7 23:46:03 2011 +0000

4161

4162

Updated Portuguese translation

4163

4164

po/pt.po | 1580

4165

+++++++++++++++++++++++++++++++++++---------------------------

4166

1 files changed, 890 insertions(+), 690 deletions(-)

4167

4168

commit 637cd236669994de6e23f10098ad44daae640841

4169

Author: Daniel Mustieles <daniel.mustieles@gmail.com>

4170

Date: Mon Mar 7 19:17:00 2011 +0100

4171

4172

Updated Spanish translation

4173

4174

po/es.po | 25 +++++++++++++++++++------

4175

1 files changed, 19 insertions(+), 6 deletions(-)

4176

4177

commit c4f12fc9ad76f90374e08460971f001fdfb90036

4178

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

4179

Date: Mon Mar 7 16:58:42 2011 +0100

4180

4181

disable the call observer for now

4182

4183

src/empathy-main-window.c | 5 +++++

4184

1 files changed, 5 insertions(+), 0 deletions(-)

4185

4186

commit b9b55324c17793ebf0d82d6cd0203694a931497a

4187

Author: Cosimo Cecchi <cosimoc@gnome.org>

4188

Date: Mon Mar 7 10:11:46 2011 -0500

4189

4190

all: set the primary-toolbar style class on primary toolbars

4191

4192

So themes can override their appearance without hardcoding the widget

4193

hierarchy.

4194

4195

https://bugzilla.gnome.org/show_bug.cgi?id=644121

4196

4197

src/empathy-call-window.ui | 3 +++

4198

src/empathy-debug-window.c | 2 ++

4199

src/empathy-main-window.ui | 3 +++

4200

3 files changed, 8 insertions(+), 0 deletions(-)

4201

4202

commit 5b894aa5ad8702279c0458b890025a22172bfdd1

4203

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

4204

Date: Mon Mar 7 13:18:11 2011 +0000

4205

4206

Don't look for Call channels

4207

4208

We don't support them on master yet.

4209

4210

src/empathy-call-observer.c | 31 ++++---------------------------

4211

1 files changed, 4 insertions(+), 27 deletions(-)

4212

4213

commit b5cadd968f25270ddeb68c3760e6688124bae794

4214

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

4215

Date: Mon Mar 7 13:15:38 2011 +0000

4216

4217

Build fix

4218

4219

libempathy-gtk/empathy-contact-search-dialog.c | 2 +-

4220

1 files changed, 1 insertions(+), 1 deletions(-)

4221

4222

commit 53b016c19d0147a415b86cbadb94150c6078510a

1471

4223

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

1472

4224

Date: Sun Mar 6 15:17:05 2011 +0000

1473

4225

1476

4228

src/empathy-call-observer.c | 2 ++

1477

4229

1 files changed, 2 insertions(+), 0 deletions(-)

1478

4230

1479

commit 45e986eb37e4707f1b4e9e39ef86bd541e16ad81

4231

commit 19c228d5cd6a1eec12b0d7d015bb0fc49821f1ce

1480

4232

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

1481

Date: Wed Mar 2 12:08:33 2011 +0000

4233

Date: Mon Mar 7 11:40:35 2011 +0000

1482

4234

1483

4235

Autoreject incoming calls if there are others in progress

1484

4236

1488

4240

src/empathy-call-observer.c | 287

1489

4241

+++++++++++++++++++++++++++++++++++++++++++

1490

4242

src/empathy-call-observer.h | 54 ++++++++

1491

src/empathy-main-window.c | 4 +

1492

telepathy-yell | 2 +-

1493

5 files changed, 347 insertions(+), 1 deletions(-)

4243

src/empathy-main-window.c | 6 +-

4244

4 files changed, 347 insertions(+), 1 deletions(-)

1494

4245

1495

commit c03cf1a26b17190e50f6ef305aa74452cc03a0b5

4246

commit 20ec7b56ec63c56b41ad7c2cff2e4fd1ce3ba47f

1496

4247

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

1497

4248

Date: Mon Mar 7 11:30:38 2011 +0000

1498

4249

1502

4253

++++++++++++++++++++++++

1503

4254

1 files changed, 55 insertions(+), 0 deletions(-)

1504

4255

1505

commit 0f5a0cf61fe7de389b5840308bfc782a1347ade5

4256

commit 3c2728fb0e70803085f699538c115b4c41b0b869

1506

4257

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

1507

4258

Date: Mon Mar 7 11:26:05 2011 +0000

1508

4259

1511

4262

libempathy-gtk/empathy-contact-search-dialog.c | 6 +++++-

1512

4263

1 files changed, 5 insertions(+), 1 deletions(-)

1513

4264

1514

commit 82cf4629ab265dde415081cc32847a5e2c086cea

4265

commit cbdebf9ecf19f3303015e0efded41fe171fedbe6

1515

4266

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

1516

4267

Date: Mon Mar 7 11:50:21 2011 +0100

1517

4268

1521

4272

src/empathy-account-assistant.c | 4 ++--

1522

4273

1 files changed, 2 insertions(+), 2 deletions(-)

1523

4274

1524

commit e74ff67f4f3716065dbe3dabb458abf2939cad8e

4275

commit a9c435117a92ccad2a9b992a105102d1c471ca37

1525

4276

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

1526

4277

Date: Mon Mar 7 12:01:13 2011 +0100

1527

4278

1531

4282

libempathy/empathy-utils.c | 2 +-

1532

4283

1 files changed, 1 insertions(+), 1 deletions(-)

1533

4284

1534

commit b3a6feb7a68da6314f17b439e834346a0abda317

4285

commit e512bbfceef58803a5e8ef389c8f5585ab53596f

4286

Author: Gil Forcada <gforcada@gnome.org>

4287

Date: Mon Mar 7 12:01:54 2011 +0100

4288

4289

[l10n] Updated Catalan translation

4290

4291

po/ca.po | 31 ++++++++++++++++++++++++-------

4292

1 files changed, 24 insertions(+), 7 deletions(-)

4293

4294

commit b9d097cb326e8e8af3f74b631c7c0cf0b4408db2

1535

4295

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

1536

4296

Date: Fri Mar 4 15:24:06 2011 +0100

1537

4297

1540

4300

libempathy/empathy-auth-factory.c | 2 ++

1541

4301

1 files changed, 2 insertions(+), 0 deletions(-)

1542

4302

1543

commit 689a280174e790e1bc1e7b73e2a0de770d6bf061

4303

commit 46de927d35d667362a990905628ad7cbb4f9619e

1544

4304

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

1545

4305

Date: Fri Mar 4 15:24:42 2011 +0100

1546

4306

1551

4311

configure.ac | 2 +-

1552

4312

1 files changed, 1 insertions(+), 1 deletions(-)

1553

4313

1554

commit 43e3c9ec6bc4f963bacaacd3de3ed5fe9ce86247

4314

commit b6e030fc577477fb6bf87d8833f2404ab8c6fc48

1555

4315

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

1556

4316

Date: Mon Mar 7 11:21:43 2011 +1100

1557

4317

1563

4323

+++++++++++++++++++++++++++++++++++--

1564

4324

1 files changed, 58 insertions(+), 3 deletions(-)

1565

4325

1566

commit a0babfa947e18565fafa369aa148d7e6afa9144a

4326

commit 2eb9099ce3e60b8c60039b7947e249c294b02167

4327

Author: Žygimantas Beručka <zygis@gnome.org>

4328

Date: Sun Mar 6 17:16:12 2011 +0200

4329

4330

Updated Lithuanian translation by Aurimas Černius and me

4331

4332

po/lt.po | 1566

4333

+++++++++++++++++++++++++++++++++++---------------------------

4334

1 files changed, 884 insertions(+), 682 deletions(-)

4335

4336

commit 1923d63c2cc51521bd31100e6bad88be798d8afa

4337

Author: Khaled Hosny <khaledhosny@eglug.org>

4338

Date: Sun Mar 6 15:41:59 2011 +0200

4339

4340

Updated Arabic translation

4341

4342

po/ar.po | 333

4343

++++++++++++++++++++++++++++++++------------------------------

4344

1 files changed, 174 insertions(+), 159 deletions(-)

4345

4346

commit 584d3fcf8235676fcab935567729a6d97b7bbf9e

4347

Author: Krasimir Chonov <mk2616@abv.bg>

4348

Date: Sat Mar 5 22:04:13 2011 +0200

4349

4350

Updated Bulgarian translation

4351

4352

po/bg.po | 1503

4353

++++++++++++++++++++++++++++++++++----------------------------

4354

1 files changed, 833 insertions(+), 670 deletions(-)

4355

4356

commit c6a022e2cf5f68ed49c78731886607530de22d04

4357

Author: Ivar Smolin <okul@linux.ee>

4358

Date: Sat Mar 5 20:52:54 2011 +0200

4359

4360

[l10n] Updated Estonian translation

4361

4362

po/et.po | 19 +++++++++++++------

4363

1 files changed, 13 insertions(+), 6 deletions(-)

4364

4365

commit 78cef53c7c27496a5a108eb12ac414e3f3137b20

4366

Author: Rudolfs Mazurs <rudolfs.mazurs@gmail.com>

4367

Date: Sat Mar 5 15:12:25 2011 +0200

4368

4369

Updated Latvian translation.

4370

4371

po/lv.po | 2332

4372

+++++++++++++++++++++++++++++++++++++++++---------------------

4373

1 files changed, 1546 insertions(+), 786 deletions(-)

4374

4375

commit 1dc6fd11ddf1d028d23afa4de10791fe0068dff0

4376

Author: Daniel Mustieles <daniel.mustieles@gmail.com>

4377

Date: Sat Mar 5 11:06:23 2011 +0100

4378

4379

Updated Spanish translation

4380

4381

po/es.po | 143

4382

++++++++++++++++++++++++++++++++------------------------------

4383

1 files changed, 74 insertions(+), 69 deletions(-)

4384

4385

commit 43b41c43d30ea31769ed9fc263be72b2f9484f9f

4386

Author: A S Alam <aalam@users.sf.net>

4387

Date: Sat Mar 5 07:02:40 2011 +0530

4388

4389

update Punjabi Translation by A S Alam

4390

4391

po/pa.po | 748

4392

++++++++++++++++++++++++++++++++------------------------------

4393

1 files changed, 385 insertions(+), 363 deletions(-)

4394

4395

commit 8c651efbfd8e5ceea5e8796aec12d61840e9590d

1567

4396

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

1568

4397

Date: Fri Mar 4 10:51:36 2011 +0100

1569

4398

1575

4404

libempathy/empathy-tp-chat.c | 3 ++-

1576

4405

1 files changed, 2 insertions(+), 1 deletions(-)

1577

4406

1578

commit 5a70354f0da89d6e91cda09314e5030cfb6a5f75

4407

commit 26d17c7c631bb175f58b00d9e332b0fd8c741d90

4408

Author: Daniel Korostil <ted.korostiled@gmail.com>

4409

Date: Thu Mar 3 22:05:51 2011 +0200

4410

4411

Uploaded Ukranian

4412

4413

po/uk.po | 59

4414

++++++++++++++++++++++++++++++-----------------------------

4415

1 files changed, 30 insertions(+), 29 deletions(-)

4416

4417

commit aae7107c07db72e86b335624ad1a7967f75e4e8e

4418

Author: Yaron Shahrabani <sh.yaron@gmail.com>

4419

Date: Thu Mar 3 22:09:54 2011 +0200

4420

4421

Updated Hebrew translation.

4422

4423

po/he.po | 34 +++++++++++++++++++---------------

4424

1 files changed, 19 insertions(+), 15 deletions(-)

4425

4426

commit 1839a4f2675fea1855f8961ab7a263d54a5f4c4c

4427

Author: liuzhen <liuzhen1191@gmail.com>

4428

Date: Thu Mar 3 14:45:55 2011 +0000

4429

4430

Update Simplified Chinese translation.

4431

4432

po/zh_CN.po | 1258

4433

+++++++++++++++++++++++++++++++++--------------------------

4434

1 files changed, 711 insertions(+), 547 deletions(-)

4435

4436

commit 897a8fc900ff393f204b5e5a6e1ba2b2e170f1a3

1579

4437

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

1580

4438

Date: Fri Mar 4 00:16:18 2011 +1100

1581

4439

1584

4442

libempathy-gtk/empathy-contact-search-dialog.c | 12 ++++++++++++

1585

4443

1 files changed, 12 insertions(+), 0 deletions(-)

1586

4444

1587

commit 62aabd365e4cf4c3f91a02af884cce38f65be46b

4445

commit a5667a859d34c1d79c966f625e6c7f8997f4af36

1588

4446

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

1589

4447

Date: Fri Mar 4 00:07:38 2011 +1100

1590

4448

1593

4451

libempathy-gtk/empathy-contact-search-dialog.c | 4 +++-

1594

4452

1 files changed, 3 insertions(+), 1 deletions(-)

1595

4453

1596

commit e9c2346382897a6fa9d83c7a0bb2474e1278807d

1597

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

1598

Date: Fri Mar 4 00:03:07 2011 +1100

1599

1600

Fix compiler warning

1601

1602

libempathy-gtk/empathy-call-utils.c | 1 +

1603

1 files changed, 1 insertions(+), 0 deletions(-)

1604

1605

commit 9ae6f58ac833bf63f0ab07dcb341ef10db48dee2

4454

commit 3c8f0ee47ad969dcc56880dad67652263e7b813a

1606

4455

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

1607

4456

Date: Fri Mar 4 00:02:53 2011 +1100

1608

4457

1611

4460

libempathy-gtk/empathy-contact-search-dialog.c | 4 +++-

1612

4461

1 files changed, 3 insertions(+), 1 deletions(-)

1613

4462

1614

commit 3f71919d9f21e84d36086703cc5447e2e8cb12da

4463

commit df788298cd4def7fe18ab1ad89aa7291f9688017

1615

4464

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

1616

4465

Date: Thu Mar 3 23:54:51 2011 +1100

1617

4466

1621

4470

+++++++++++++----------

1622

4471

1 files changed, 17 insertions(+), 13 deletions(-)

1623

4472

1624

commit 60b1c56a90020621eaddcfcf064957ac748955cd

4473

commit 855095a0e0c5c50f0713caf11afad2329428827b

1625

4474

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

1626

4475

Date: Thu Mar 3 13:35:45 2011 +1100

1627

4476

1633

4482

libempathy/empathy-server-sasl-handler.h | 3 ++

1634

4483

3 files changed, 44 insertions(+), 1 deletions(-)

1635

4484

1636

commit fb03f35e9a0a0a4bf73ffe789e659c770a1d75ba

4485

commit 2d652e402b4ed7fa1ca01805288018e4fc867d53

1637

4486

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

1638

4487

Date: Thu Mar 3 13:18:05 2011 +1100

1639

4488

1643

4492

+++++++++++++++++++++++++++--

1644

4493

1 files changed, 40 insertions(+), 3 deletions(-)

1645

4494

1646

commit ef92c4ff9f18d21707b327b601e59d104f08b1fa

4495

commit 1543de6cc195aa22568d86ebb026b2c705b6d0b9

1647

4496

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

1648

4497

Date: Thu Mar 3 13:02:14 2011 +1100

1649

4498

1655

4504

extensions/misc.xml | 1 +

1656

4505

3 files changed, 61 insertions(+), 0 deletions(-)

1657

4506

1658

commit 8e18c062c6a67ca067f44fe698aac3e29d992f83

4507

commit 1c72f78a3f5b6db07dcdf92f8530e3134f896d71

4508

Author: Gil Forcada <gforcada@gnome.org>

4509

Date: Thu Mar 3 00:14:29 2011 +0100

4510

4511

[l10n] Updated Catalan translation

4512

4513

po/ca.po | 1575

4514

++++++++++++++++++++++++++++++++++----------------------------

4515

1 files changed, 862 insertions(+), 713 deletions(-)

4516

4517

commit c4d6e4444528d78e2e13e03dc94afa3f45db2511

4518

Author: Kjartan Maraas <kmaraas@gnome.org>

4519

Date: Tue Mar 1 18:18:03 2011 +0100

4520

4521

Updated Norwegian bokmål translation

4522

4523

po/nb.po | 337

4524

++++++++++++++++++++++++++++++++------------------------------

4525

1 files changed, 174 insertions(+), 163 deletions(-)

4526

4527

commit a28c97f368dd0ebe2c21c7be6fc579f45bf9b55a

4528

Author: Leonid Kanter <leon@asplinux.ru>

4529

Date: Tue Mar 1 13:49:47 2011 +0200

4530

4531

Update Russian translation by Yury Myasoedov <omerta13@yandex.ru>

4532

4533

po/ru.po | 1407

4534

+++++++++++++++++++++++++++++++++++---------------------------

4535

1 files changed, 795 insertions(+), 612 deletions(-)

4536

4537

commit c973683d56584d7bf14d1147e6efe44344b55d40

4538

Author: Daniel Nylander <po@danielnylander.se>

4539

Date: Tue Mar 1 09:15:27 2011 +0100

4540

4541

Updated Swedish translation

4542

4543

po/sv.po | 435

4544

++++++++++++++++++++++++++++++++------------------------------

4545

1 files changed, 224 insertions(+), 211 deletions(-)

4546

4547

commit d4e5ce709bf78e014c1006f1f1e648f58b474b76

1659

4548

Author: Nicolas Dufresne <nicolas.dufresne@collabora.co.uk>

1660

4549

Date: Fri Feb 25 17:38:26 2011 -0500

1661

4550

1664

4553

libempathy/empathy-message.c | 2 ++

1665

4554

1 files changed, 2 insertions(+), 0 deletions(-)

1666

4555

1667

commit 5fd9df9e45b27e550f6516e1a31e6b79907b5af8

1668

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

1669

Date: Mon Feb 28 12:29:40 2011 +0000

1670

1671

Return meaningful errors when starting a call fails

1672

1673

libempathy-gtk/empathy-call-utils.c | 23 ++++++++++++++++++++++-

1674

1 files changed, 22 insertions(+), 1 deletions(-)

1675

1676

commit decf711bd5ac82b2ea4c61e4304f1d124289a375

4556

commit e30adf5d90786cc1145828f304a0857f03fe562c

1677

4557

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

1678

4558

Date: Mon Feb 28 15:00:20 2011 +0100

1679

4559

1682

4562

libempathy/empathy-keyring.c | 3 ++-

1683

4563

1 files changed, 2 insertions(+), 1 deletions(-)

1684

4564

1685

commit f4d80d432a22487eeacfe4f3216c132d5a4e0a12

4565

commit 875ec756ab0f8ae86c40b9d9432d9c7b0b66c318

1686

4566

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

1687

4567

Date: Mon Feb 28 14:50:43 2011 +0100

1688

4568

1691

4571

libempathy/empathy-keyring.c | 19 ++++++++++++++-----

1692

4572

1 files changed, 14 insertions(+), 5 deletions(-)

1693

4573

1694

commit ee8f37f906b6d5c678a393a4aa94a9566d2c6ecc

4574

commit c4cdf9011e7cfe81b32db1742209edc7f2f54ee6

1695

4575

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

1696

4576

Date: Mon Feb 28 13:13:52 2011 +0100

1697

4577

1700

4580

src/empathy-accounts-dialog.c | 15 ++++++++++++++-

1701

4581

1 files changed, 14 insertions(+), 1 deletions(-)

1702

4582

1703

commit 6dfdd570279f24ea16f51a63ff5edf0b09055dc1

4583

commit 79a01b5492f280cc8c9ceebeef046e085e684f48

1704

4584

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

1705

4585

Date: Mon Feb 28 13:13:33 2011 +0100

1706

4586

1709

4589

src/empathy-accounts.c | 8 ++++++--

1710

4590

1 files changed, 6 insertions(+), 2 deletions(-)

1711

4591

1712

commit 0edb1dc7f535d800b9bf1d48d13a56a7086f704f

4592

commit d8bb9ec37dd074d70115c481bb667318e833b893

1713

4593

Author: Robert Sajdok <robert.sajdok@gmail.com>

1714

4594

Date: Mon Feb 28 10:17:33 2011 +0100

1715

4595

1721

4601

src/empathy-main-window.c | 1 +

1722

4602

1 files changed, 1 insertions(+), 0 deletions(-)

1723

4603

1724

commit 2f4eea01a086d58ab95ee2a179be468dd9faae8e

1725

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

1726

Date: Fri Feb 25 11:06:15 2011 +0100

1727

1728

update src/.gitignore

1729

1730

src/.gitignore | 2 ++

1731

1 files changed, 2 insertions(+), 0 deletions(-)

1732

1733

commit efd4ac85885aa38a11b05bfa3a29a030bab6afd0

1734

Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

1735

Date: Thu Feb 24 16:37:27 2011 +0000

1736

1737

Correct submodule path

1738

1739

.gitmodules | 2 +-

1740

1 files changed, 1 insertions(+), 1 deletions(-)

1741

1742

commit 19e09cf12c8683ce09729aa673be4cc72d853c92

1743

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

1744

Date: Thu Feb 24 17:18:06 2011 +0100

1745

1746

prepare 2.33.2

1747

1748

NEWS | 37 +++++++++++++++++++++++++++++++++++++

1749

configure.ac | 4 ++--

1750

2 files changed, 39 insertions(+), 2 deletions(-)

1751

1752

commit 76ddb67353d09f2f5a8a59a5e9c1faa1289d9c55

1753

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

1754

Date: Thu Feb 24 16:22:15 2011 +0000

1755

1756

Add missing files to POTFILES.in

1757

1758

po/POTFILES.in | 5 +++++

1759

1 files changed, 5 insertions(+), 0 deletions(-)

1760

1761

commit ffab36ebb3e1dd7a19466e699c22bfb9f991bb00

1762

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

1763

Date: Thu Feb 24 13:51:08 2011 +0000

1764

1765

Add a button to delete logs

1766

1767

libempathy-gtk/empathy-log-window.c | 105

1768

++++++++++++++++++++++++++++++---

1769

libempathy-gtk/empathy-log-window.ui | 2 +-

1770

2 files changed, 96 insertions(+), 11 deletions(-)

1771

1772

commit 1310cf061af956a53983ec0a48257cca3c922d9b

4604

commit af14cf9bf6d5c19ca07245963def757408a0bdc5

4605

Author: Yaron Shahrabani <sh.yaron@gmail.com>

4606

Date: Sun Feb 27 22:55:22 2011 +0200

4607

4608

Updated Hebrew translation.

4609

4610

po/he.po | 303

4611

++++++++++++++++++++++++++++++++------------------------------

4612

1 files changed, 157 insertions(+), 146 deletions(-)

4613

4614

commit 460927eb68940ef9194b4276aba42f47c1264e67

4615

Author: Daniel Korostil <ted.korostiled@gmail.com>

4616

Date: Sun Feb 27 17:46:51 2011 +0200

4617

4618

Uploaded Ukranian

4619

4620

po/uk.po | 2451

4621

++++++++++++++++++++++++++++++++++++++++----------------------

4622

1 files changed, 1570 insertions(+), 881 deletions(-)

4623

4624

commit bf7230f3bd199830b13f9b98c1754862954e3c56

4625

Author: Changwoo Ryu <cwryu@debian.org>

4626

Date: Sat Feb 26 23:15:32 2011 +0900

4627

4628

Updated Korean translation

4629

4630

po/ko.po | 1530

4631

+++++++++++++++++++++++++++++++++++---------------------------

4632

1 files changed, 857 insertions(+), 673 deletions(-)

4633

4634

commit 1ab50a302443947752c824ee777cecf7243ab0e1

4635

Author: Daniel Mustieles <daniel.mustieles@gmail.com>

4636

Date: Sat Feb 26 12:01:05 2011 +0100

4637

4638

Updated Spanish translation

4639

4640

po/es.po | 307

4641

++++++++++++++++++++++++++++++++------------------------------

4642

1 files changed, 160 insertions(+), 147 deletions(-)

4643

4644

commit 40a5e28276e503acea8bdfc5463a23ffbfe53db6

4645

Author: Bruno Brouard <annoa.b@gmail.com>

4646

Date: Fri Feb 25 20:41:04 2011 +0100

4647

4648

Updated French translation

4649

4650

po/fr.po | 305

4651

++++++++++++++++++++++++++++++++------------------------------

4652

1 files changed, 159 insertions(+), 146 deletions(-)

4653

4654

commit 6a98e814127df8d869a9c27949141783e14505d6

4655

Author: Matej Urbančič <mateju@svn.gnome.org>

4656

Date: Fri Feb 25 20:17:09 2011 +0100

4657

4658

Updated Slovenian translation

4659

4660

po/sl.po | 1000

4661

+++++++++++++++++++++++++++++++++-----------------------------

4662

1 files changed, 533 insertions(+), 467 deletions(-)

4663

4664

commit 2ea7be6e9e50e8410c048f0c11c6d8e1ab148145

4665

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

4666

Date: Fri Feb 25 15:47:47 2011 +0100

4667

4668

remove released flag

4669

4670

configure.ac | 2 +-

4671

1 files changed, 1 insertions(+), 1 deletions(-)

4672

4673

commit fe7a700a7929753dad158a947f63eb5cc918ef31

4674

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

4675

Date: Fri Feb 25 15:33:47 2011 +0100

4676

4677

prepare 2.91.90.2

4678

4679

NEWS | 6 ++++++

4680

configure.ac | 4 ++--

4681

2 files changed, 8 insertions(+), 2 deletions(-)

4682

4683

commit dfa0a14010577349ccaa56a785c4e7f1ae68119d

4684

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

4685

Date: Fri Feb 25 15:29:08 2011 +0100

4686

4687

Disable /part command for now

4688

4689

See https://bugzilla.gnome.org/show_bug.cgi?id=643295

4690

4691

libempathy-gtk/empathy-chat.c | 7 +++++++

4692

1 files changed, 7 insertions(+), 0 deletions(-)

4693

4694

commit c1ac26eb983b09e55771a9a6f6130b7e9bdff1fb

4695

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

4696

Date: Fri Feb 25 13:16:58 2011 +0100

4697

4698

remove released flag

4699

4700

configure.ac | 2 +-

4701

1 files changed, 1 insertions(+), 1 deletions(-)

4702

4703

commit e8455be378847e312f34054e29e59caaf801a997

4704

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

4705

Date: Fri Feb 25 13:03:53 2011 +0100

4706

4707

prepare 2.91.90.1

4708

4709

NEWS | 25 +++++++++++++++++++++++++

4710

configure.ac | 4 ++--

4711

2 files changed, 27 insertions(+), 2 deletions(-)

4712

4713

commit 667cae90a298a8f9a0004431fd3ce494b3c15f26

4714

Author: Chandni Verma <chandniverma2112@gmail.com>

4715

Date: Wed Feb 23 11:55:25 2011 +0530

4716

4717

Implementation of /PART command for MUCs

4718

4719

Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=604348

4720

4721

libempathy-gtk/empathy-chat.c | 62

4722

+++++++++++++++++++++++++++++++++++++----

4723

libempathy-gtk/empathy-chat.h | 3 ++

4724

2 files changed, 59 insertions(+), 6 deletions(-)

4725

4726

commit 9a5d1c52d41aab250ca5bfff3373b11d876bdf1f

4727

Author: Chandni Verma <chandniverma2112@gmail.com>

4728

Date: Wed Feb 23 11:44:54 2011 +0530

4729

4730

Updating empathy_tp_chat_leave() function in empathy-tp-chat API

4731

4732

libempathy-gtk/empathy-chat.c | 2 +-

4733

libempathy/empathy-tp-chat.c | 60

4734

++++++++++------------------------------

4735

libempathy/empathy-tp-chat.h | 3 +-

4736

src/empathy-event-manager.c | 2 +-

4737

4 files changed, 19 insertions(+), 48 deletions(-)

4738

4739

commit 860c0a75da2c97bc1e91ed3b4bb958cb7e3cb934

1773

4740

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

1774

4741

Date: Thu Feb 24 13:46:11 2011 +0000

1775

4742

1779

4746

++++++++++++++++++++-----------------------------

1780

4747

1 files changed, 47 insertions(+), 67 deletions(-)

1781

4748

1782

commit 93d07624b205676bb0cc3f42e7834945856b8ca5

4749

commit 830aa2622ca7832e4daad33bbe82e06d81be7388

1783

4750

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

1784

4751

Date: Thu Feb 24 10:46:38 2011 +0000

1785

4752

1789

4756

+++++++++++++++++-----------------

1790

4757

1 files changed, 21 insertions(+), 21 deletions(-)

1791

4758

1792

commit 6153b748bc55d0735e7294a0dcfe87905b579f11

4759

commit 69c3a29e4d9af4b68c3ccb2a6d160cbf2fd9171a

1793

4760

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

1794

4761

Date: Thu Feb 24 10:46:00 2011 +0000

1795

4762

1798

4765

libempathy-gtk/empathy-log-window.c | 4 +---

1799

4766

1 files changed, 1 insertions(+), 3 deletions(-)

1800

4767

1801

commit 7d2172c7227af850e6fa48b31d711b6dd0d14dba

4768

commit 3370389a56ebd8fe1076721f55519ea1ad34c96a

1802

4769

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

1803

4770

Date: Thu Feb 24 10:37:58 2011 +0000

1804

4771

1807

4774

configure.ac | 2 +-

1808

4775

1 files changed, 1 insertions(+), 1 deletions(-)

1809

4776

1810

commit d8c60da9cf53e2c08eb59f899062b08224c9fb7f

4777

commit acb645b19b6b0357e9a4b5af0d9e0faf3ebda49e

1811

4778

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

1812

4779

Date: Thu Feb 24 10:31:25 2011 +0000

1813

4780

1816

4783

libempathy-gtk/empathy-log-window.c | 2 +-

1817

4784

1 files changed, 1 insertions(+), 1 deletions(-)

1818

4785

1819

commit c8a06b2f3d3e090c9a86212ab0e1cd5b4a89eb65

4786

commit 72089c86163dd65754d251c9900ee98a1b9b2447

1820

4787

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

1821

4788

Date: Thu Feb 24 10:14:53 2011 +0000

1822

4789

1825

4792

libempathy-gtk/empathy-chat.c | 2 ++

1826

4793

1 files changed, 2 insertions(+), 0 deletions(-)

1827

4794

1828

commit 32eccf2454ea8abb4f1742d0c70f79a3dc8c8dd6

4795

commit 67920cae23f4b8020559d7548fd1dff8de44e962

1829

4796

Author: Nicolas Dufresne <nicolas.dufresne@collabora.co.uk>

1830

Date: Wed Feb 23 17:04:18 2011 -0500

4797

Date: Thu Feb 24 10:17:15 2011 +0000

1831

4798

1832

4799

Port empathy to Telepathy logger 0.2.0

1833

4800

1841

4808

libempathy/empathy-message.h | 4 +-

1842

4809

7 files changed, 144 insertions(+), 146 deletions(-)

1843

4810

1844

commit 1c6869ecc8569524ec2cd874b800bf4d153d31aa

1845

Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

1846

Date: Thu Feb 24 15:25:54 2011 +0000

1847

1848

Keep a ref to our handler instance

1849

1850

src/empathy-event-manager.c | 2 +-

1851

1 files changed, 1 insertions(+), 1 deletions(-)

1852

1853

commit 2112a44c81e80882d4569f8115071d742c483efc

4811

commit 677a6bf7fca3ce8e26cf02d36c2721fa03510a4d

1854

4812

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

1855

4813

Date: Thu Feb 24 14:29:22 2011 +0100

1856

4814

1862

4820

libempathy-gtk/empathy-tls-dialog.c | 13 +++++++++++++

1863

4821

1 files changed, 13 insertions(+), 0 deletions(-)

1864

4822

1865

commit 38ec957d24df497e86ae94ee81e79fec5a7757b4

1866

Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

1867

Date: Wed Feb 23 19:05:56 2011 +0000

1868

1869

More consistent naming of the call handler option

1870

1871

configure.ac | 5 +++--

1872

1 files changed, 3 insertions(+), 2 deletions(-)

1873

1874

commit 4643b155118652f3a50695431d359c5dc3a7f91b

1875

Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

1876

Date: Wed Feb 23 18:30:14 2011 +0000

1877

1878

make the dots consistent

1879

1880

configure.ac | 2 +-

1881

1 files changed, 1 insertions(+), 1 deletions(-)

1882

1883

commit 718a788ac2d4120fa007cd329afb5b29f8fd087b

1884

Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

1885

Date: Wed Feb 23 18:30:03 2011 +0000

1886

1887

escape USE_MAINTAINER_MODE to prevent errors from make

1888

1889

configure.ac | 2 +-

1890

1 files changed, 1 insertions(+), 1 deletions(-)

1891

1892

commit 857b27e6161b5a010d61a88d0a7ebce6904db49f

1893

Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

1894

Date: Wed Feb 23 18:29:30 2011 +0000

1895

1896

auto-detect the presence of farsight

1897

1898

configure.ac | 17 ++++++++++++++---

1899

1 files changed, 14 insertions(+), 3 deletions(-)

1900

1901

commit 0b12f2094066c4697b5eb151f30a186772b8447a

1902

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

1903

Date: Wed Feb 23 16:24:53 2011 +0000

1904

1905

empathy_call_new_with_streams: prefer StreamedMedia over Call

1906

1907

libempathy-gtk/empathy-call-utils.c | 26 +++++++++++++-------------

1908

1 files changed, 13 insertions(+), 13 deletions(-)

1909

1910

commit efb08036e134b31339e0e422ef68e6ddef2bf467

1911

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

1912

Date: Wed Feb 23 16:19:48 2011 +0000

1913

1914

Always build telepathy-yell and handle Call channels

1915

1916

Just keep empathy-call optional.

1917

1918

configure.ac | 4 ++--

1919

libempathy-gtk/empathy-call-utils.c | 26

1920

+-------------------------

1921

libempathy-gtk/empathy-new-call-dialog.c | 7 +------

1922

libempathy/empathy-channel-factory.c | 6 +-----

1923

src/empathy.c | 4 +---

1924

5 files changed, 6 insertions(+), 41 deletions(-)

1925

1926

commit 2c751f8089462c379401b930242b0ee244eeaf14

1927

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

1928

Date: Tue Feb 22 18:15:07 2011 +0000

1929

1930

Show an error dialog if starting a call fails

1931

1932

libempathy-gtk/empathy-call-utils.c | 26 +++++++++++++++++++++++++-

1933

1 files changed, 25 insertions(+), 1 deletions(-)

1934

1935

commit 43351bae1eb2f338922577ffa6dcc7321e35a37b

1936

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

1937

Date: Tue Feb 22 18:14:07 2011 +0000

1938

1939

Don't require EmpathyContacts to start a call

1940

1941

libempathy-gtk/empathy-call-utils.c | 18 +++++-------

1942

libempathy-gtk/empathy-call-utils.h | 11 +++-----

1943

libempathy-gtk/empathy-contact-menu.c | 8 ++++-

1944

libempathy-gtk/empathy-individual-menu.c | 8 ++++-

1945

libempathy-gtk/empathy-new-call-dialog.c | 43

1946

+----------------------------

1947

src/empathy-call-factory.c | 3 +-

1948

src/empathy-streamed-media-handler.c | 3 +-

1949

7 files changed, 30 insertions(+), 64 deletions(-)

1950

1951

commit 10edf350020350475ece049d9c8fd969f70cf5c5

1952

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

1953

Date: Tue Feb 22 17:15:11 2011 +0000

1954

1955

Move empathy_call_* util functions to libempathy-gtk

1956

1957

Since we want to pop up a dialog when starting a call fails.

1958

1959

libempathy-gtk/Makefile.am | 2 +

1960

libempathy-gtk/empathy-call-utils.c | 169

1961

++++++++++++++++++++++++++++++

1962

libempathy-gtk/empathy-call-utils.h | 46 ++++++++

1963

libempathy-gtk/empathy-contact-menu.c | 1 +

1964

libempathy-gtk/empathy-individual-menu.c | 1 +

1965

libempathy-gtk/empathy-new-call-dialog.c | 1 +

1966

libempathy/empathy-utils.c | 133 -----------------------

1967

libempathy/empathy-utils.h | 12 --

1968

src/empathy-call-factory.c | 2 +

1969

src/empathy-streamed-media-handler.c | 2 +

1970

10 files changed, 224 insertions(+), 145 deletions(-)

1971

1972

commit b768818115dbc3a0b570500a74bc9c8ded62eea5

1973

Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

1974

Date: Wed Feb 23 16:50:20 2011 +0000

1975

1976

No need to borrow the connection, it gets passed to us

1977

1978

src/empathy-event-manager.c | 1 -

1979

1 files changed, 0 insertions(+), 1 deletions(-)

1980

1981

commit e9e2c4e84abfecccd0256bfd5045a508d3c71c94

1982

Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

1983

Date: Wed Feb 23 16:50:06 2011 +0000

1984

1985

Trivial coding style fix (>80 chars)

1986

1987

src/empathy-event-manager.c | 3 ++-

1988

1 files changed, 2 insertions(+), 1 deletions(-)

1989

1990

commit cecc20a75406a29bd439d068ba56bd26a86c496b

1991

Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

1992

Date: Wed Feb 23 16:49:26 2011 +0000

1993

1994

Retrieve the contact for incoming calls so we can display it

1995

1996

src/empathy-event-manager.c | 27 ++++++++++++++++++++++++---

1997

1 files changed, 24 insertions(+), 3 deletions(-)

1998

1999

commit 50c9020cfe7924fcb9bb69599ecede1f396e9bbd

2000

Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

2001

Date: Wed Feb 23 16:45:16 2011 +0000

2002

2003

Stop ringing after approving a Channel.Type.Call channel

2004

2005

src/empathy-event-manager.c | 3 ++-

2006

1 files changed, 2 insertions(+), 1 deletions(-)

2007

2008

commit 8b0718b8a650ff1f5d9e4a77011646366e592126

2009

Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

2010

Date: Wed Feb 23 16:44:55 2011 +0000

2011

2012

event-manager Remove HAVE_CALL ifdefs, even if we didn't build the

2013

handler we can still approve

2014

2015

src/empathy-event-manager.c | 16 +---------------

2016

1 files changed, 1 insertions(+), 15 deletions(-)

2017

2018

commit c10d6f51c74185475f1203c2de936d7030c7e10e

2019

Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

2020

Date: Wed Feb 23 16:44:05 2011 +0000

2021

2022

Close call channels after hanging up

2023

2024

src/empathy-event-manager.c | 1 +

2025

1 files changed, 1 insertions(+), 0 deletions(-)

2026

2027

commit e463f78478dc8de3514baca17d1c8ffc679134ee

2028

Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

2029

Date: Wed Feb 23 14:49:11 2011 +0000

2030

2031

Update telepathy-yell submodule

2032

2033

telepathy-yell | 2 +-

2034

1 files changed, 1 insertions(+), 1 deletions(-)

2035

2036

commit e56440d55856fb0c3d3f88a6a31e362f563a3030

2037

Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

2038

Date: Wed Feb 23 14:45:19 2011 +0000

2039

2040

In gtk2 GtkProgressBar doesn't implement GTK_ORIENTABLE

2041

2042

src/empathy-call-window.c | 5 +++--

2043

src/empathy-streamed-media-window.c | 8 --------

2044

2 files changed, 3 insertions(+), 10 deletions(-)

2045

2046

commit 4e100e3643f5fd5c7a1e37aabd2e2d481b27e35d

2047

Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

2048

Date: Wed Feb 23 14:26:15 2011 +0000

2049

2050

Explicitely use the libtelepathy-yell .la file for dependency tracking

2051

2052

libempathy/Makefile.am | 2 +-

2053

1 files changed, 1 insertions(+), 1 deletions(-)

2054

2055

commit be1470f3a71db72890326fd534fb18fe9328fef0

2056

Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

2057

Date: Wed Feb 23 11:20:34 2011 +0000

2058

2059

Remove stray debug

2060

2061

src/empathy-call-handler.c | 10 +---------

2062

1 files changed, 1 insertions(+), 9 deletions(-)

2063

2064

commit 89a7b20c0c51ccaa2ad28a185672f4f472cd2e20

2065

Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

2066

Date: Wed Feb 23 11:39:35 2011 +0000

2067

2068

Only change the UI in the main thread

2069

2070

src/empathy-call-window.c | 13 +++++++++++--

2071

1 files changed, 11 insertions(+), 2 deletions(-)

2072

2073

commit ac766b706727ba8efdcb6132cd426d4882a82581

2074

Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

2075

Date: Wed Feb 23 11:38:54 2011 +0000

2076

2077

Use target-contact instead of members

2078

2079

src/empathy-call-window.c | 74

2080

+++++++++++----------------------------------

2081

1 files changed, 18 insertions(+), 56 deletions(-)

2082

2083

commit 2bf850dac794b120ff77b295dc3535dbab9a38fa

2084

Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

2085

Date: Wed Feb 23 11:28:23 2011 +0000

2086

2087

Move to using ->priv pointer in the object instance

2088

2089

src/empathy-call-window.c | 12 +++++-------

2090

src/empathy-call-window.h | 2 ++

2091

2 files changed, 7 insertions(+), 7 deletions(-)

2092

2093

commit 1825a527b99eb977f8399ff60355b5ef08e5b9f3

2094

Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

2095

Date: Wed Feb 23 11:14:32 2011 +0000

2096

2097

coding style trivia

2098

2099

src/empathy-call-factory.c | 9 ++++++---

2100

1 files changed, 6 insertions(+), 3 deletions(-)

2101

2102

commit 87c608d6bb63b59625331e764333ca49d464559a

2103

Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

2104

Date: Wed Feb 23 11:14:06 2011 +0000

2105

2106

Add TargetContact property that's guaranteed to exist on CallHandler

2107

2108

src/empathy-call-factory.c | 34 ++++++++++++++++++++++++++++------

2109

src/empathy-call-handler.c | 22 +++++++++++++++++++++-

2110

src/empathy-call-handler.h | 3 ++-

2111

3 files changed, 51 insertions(+), 8 deletions(-)

2112

2113

commit 2f18a9a0364fa63dc21ec68fda25406303f58483

2114

Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

2115

Date: Wed Feb 23 11:12:07 2011 +0000

2116

2117

Recognize Call channel capabilities

2118

2119

libempathy/empathy-contact.c | 24 ++++++++++++++++++++++++

2120

1 files changed, 24 insertions(+), 0 deletions(-)

2121

2122

commit 80e857fd3e975b1bd679dd9fc18ad7215ea322bc

2123

Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

2124

Date: Wed Feb 23 10:42:23 2011 +0000

2125

2126

Don't use wildcards for just one marshal file

2127

2128

When a build is triggered from a location that isn't the top

2129

build dir,

2130

the generated files break as the wrong prefix gets passed for some

2131

reason. Given we only create one -marshal file, being smart doesn't

2132

actually save us anything, so do things the simple way

2133

2134

libempathy/Makefile.am | 8 ++++----

2135

1 files changed, 4 insertions(+), 4 deletions(-)

2136

2137

commit 5e556267aa25dd5eb4b82f0163cd5d5660d5473e

2138

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

2139

Date: Tue Feb 22 11:24:26 2011 +0000

2140

2141

Initialize GObject

2142

2143

src/empathy.c | 2 +-

2144

1 files changed, 1 insertions(+), 1 deletions(-)

2145

2146

commit fc6b10ba6d31118f090cdeaaa0aae7bd8fb223a2

2147

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

2148

Date: Tue Feb 22 11:24:20 2011 +0000

2149

2150

Build fix

2151

2152

src/Makefile.am | 8 ++++++++

2153

1 files changed, 8 insertions(+), 0 deletions(-)

2154

2155

commit 75c06b2beeaf16ffaf9984f1e04f21782754d568

2156

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

2157

Date: Mon Feb 21 14:32:22 2011 +0000

2158

2159

Temporarily disable some code

2160

2161

src/empathy-call-handler.c | 7 +++++--

2162

1 files changed, 5 insertions(+), 2 deletions(-)

2163

2164

commit e37519e9d15b5d68e92a6baa10ab5b9347151590

2165

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

2166

Date: Mon Feb 21 15:41:16 2011 +0000

2167

2168

Don't use tpy_call_channel_is_sending_video

2169

2170

Check if we have initial video instead.

2171

2172

src/empathy-call-window.c | 4 ++--

2173

1 files changed, 2 insertions(+), 2 deletions(-)

2174

2175

commit cb99d4e808c46476203fe7518436c58fa1684166

2176

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

2177

Date: Mon Feb 21 15:27:33 2011 +0000

2178

2179

Don't use tpy_call_channel_is_receiving_video

2180

2181

Rely on src-pad-added to show the remote user's video.

2182

2183

src/empathy-call-window.c | 36 ++----------------------------------

2184

1 files changed, 2 insertions(+), 34 deletions(-)

2185

2186

commit 9236be6f1b94ed5cf849b24f2dd92e670f4f2263

2187

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

2188

Date: Mon Feb 21 14:31:50 2011 +0000

2189

2190

Call: check for priv->members to enable the video button

2191

2192

src/empathy-call-window.c | 2 +-

2193

1 files changed, 1 insertions(+), 1 deletions(-)

2194

2195

commit f738d401385f8bb99424fe354b1c63b97f9e6625

2196

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

2197

Date: Tue Feb 22 11:11:30 2011 +0000

2198

2199

Build fix

2200

2201

libempathy/empathy-utils.c | 4 ++--

2202

1 files changed, 2 insertions(+), 2 deletions(-)

2203

2204

commit 297222bf73efbed4a787695becf4c5c616834e73

2205

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

2206

Date: Fri Feb 18 17:06:56 2011 +0000

2207

2208

Add empathy-call

2209

2210

src/empathy-call.c | 195

2211

++++++++++++++++++++++++++++++++++++++++++++++++++++

2212

1 files changed, 195 insertions(+), 0 deletions(-)

2213

2214

commit 2507d4632deeadc3f52500549d40634ba6e113f6

2215

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

2216

Date: Fri Feb 18 17:05:33 2011 +0000

2217

2218

Use the new empathy_call_create_call_request thoroughly

2219

2220

src/empathy-call-factory.c | 20 +-------------------

2221

src/empathy-call-factory.h | 5 -----

2222

src/empathy-call-handler.c | 2 +-

2223

3 files changed, 2 insertions(+), 25 deletions(-)

2224

2225

commit c777e8e659a70fc418fdd99caa7f4771dad93163

2226

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

2227

Date: Fri Feb 18 17:00:32 2011 +0000

2228

2229

empathy_call_new_with_streams: start Calls when we support them

2230

2231

libempathy/empathy-utils.c | 89

2232

++++++++++++++++++++++++++++++++++++++++----

2233

libempathy/empathy-utils.h | 17 +++++---

2234

2 files changed, 91 insertions(+), 15 deletions(-)

2235

2236

commit 4038d6d672468a3a353139c5650c6906c60dce7f

2237

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

2238

Date: Fri Feb 18 16:45:21 2011 +0000

2239

2240

Initialize telepathy-yell

2241

2242

src/empathy.c | 6 ++++++

2243

1 files changed, 6 insertions(+), 0 deletions(-)

2244

2245

commit e53d64d0d2e73ae757ffb379460f1e4a58e8dad3

2246

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

2247

Date: Tue Feb 22 10:22:53 2011 +0000

2248

2249

Show notifications for Calls

2250

2251

src/empathy-status-icon.c | 1 +

2252

1 files changed, 1 insertions(+), 0 deletions(-)

2253

2254

commit 37dc8d1981d655f72f5abffebc063492037b3da6

2255

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

2256

Date: Fri Feb 18 16:42:08 2011 +0000

2257

2258

EmpathyEventManager: handle Call channels

2259

2260

src/empathy-event-manager.c | 98

2261

+++++++++++++++++++++++++++++++++++++++++--

2262

src/empathy-event-manager.h | 1 +

2263

2 files changed, 95 insertions(+), 4 deletions(-)

2264

2265

commit f44380b57b8f1bdfe4b2de41445d21fe99f85c92

2266

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

2267

Date: Fri Feb 18 16:31:35 2011 +0000

2268

2269

Teach EmpathyChannelFactory how to create Call channels

2270

2271

libempathy/Makefile.am | 2 ++

2272

libempathy/empathy-channel-factory.c | 17 +++++++++++++++++

2273

2 files changed, 19 insertions(+), 0 deletions(-)

2274

2275

commit 93bb7636ec40f000d7de9ae97fe888a9427b0868

2276

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

2277

Date: Fri Feb 18 16:26:28 2011 +0000

2278

2279

NewCallDialog: support Calls

2280

2281

libempathy-gtk/Makefile.am | 2 +

2282

libempathy-gtk/empathy-new-call-dialog.c | 77

2283

++++++++++++++++--------------

2284

2 files changed, 43 insertions(+), 36 deletions(-)

2285

2286

commit c605f0006a5a08743fbbf4279e7df9d858381d01

2287

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

2288

Date: Fri Feb 18 16:16:33 2011 +0000

2289

2290

Build an empathy-call binary when we have Call support

2291

2292

Makefile.am | 2 +-

2293

configure.ac | 6 ++++++

2294

src/Makefile.am | 26 ++++++++++++++++++++++++++

2295

3 files changed, 33 insertions(+), 1 deletions(-)

2296

2297

commit 49f3dfb8bde4c1181025fe31326bc9e72f2bdf3f

2298

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

2299

Date: Fri Feb 18 15:51:12 2011 +0000

2300

2301

Add an EmpathyCallWindowFullscreen class

2302

2303

src/empathy-call-window-fullscreen.c | 309

2304

++++++++++++++++++++++++++++++++++

2305

src/empathy-call-window-fullscreen.h | 77 +++++++++

2306

2 files changed, 386 insertions(+), 0 deletions(-)

2307

2308

commit b254540effb741b233c327792d853e05118e49de

2309

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

2310

Date: Fri Feb 18 15:50:55 2011 +0000

2311

2312

Add an EmpathyCallWindow class

2313

2314

src/empathy-call-window.c | 3304

2315

+++++++++++++++++++++++++++++++++++++++++++++

2316

src/empathy-call-window.h | 65 +

2317

2 files changed, 3369 insertions(+), 0 deletions(-)

2318

2319

commit b50a2589bec0ad258d337b0d5c3e055b26fad991

2320

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

2321

Date: Fri Feb 18 15:50:20 2011 +0000

2322

2323

Add an EmpathyCallHandler class

2324

2325

src/empathy-call-handler.c | 1012

2326

++++++++++++++++++++++++++++++++++++++++++++

2327

src/empathy-call-handler.h | 107 +++++

2328

2 files changed, 1119 insertions(+), 0 deletions(-)

2329

2330

commit 43c0cd4fbc2e2c5cdbf838cbfcde2204149a85ef

2331

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

2332

Date: Fri Feb 18 15:49:57 2011 +0000

2333

2334

Add an EmpathyCallFactory class

2335

2336

src/empathy-call-factory.c | 332

2337

++++++++++++++++++++++++++++++++++++++++++++

2338

src/empathy-call-factory.h | 82 +++++++++++

2339

2 files changed, 414 insertions(+), 0 deletions(-)

2340

2341

commit f128fa86842918dc69b4d716b1f2ba36d1244639

2342

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

2343

Date: Fri Feb 18 15:49:24 2011 +0000

2344

2345

Check for telepathy-yell if requested

2346

2347

autogen.sh | 14 +++++++++++++-

2348

configure.ac | 17 +++++++++++++++++

2349

2 files changed, 30 insertions(+), 1 deletions(-)

2350

2351

commit 4c523367f4701db73fadc923f159511f6c07ac8c

2352

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

2353

Date: Fri Feb 18 14:51:47 2011 +0000

2354

2355

Add telepathy-yell as a submodule

2356

2357

.gitmodules | 3 +++

2358

telepathy-yell | 1 +

2359

2 files changed, 4 insertions(+), 0 deletions(-)

2360

2361

commit 384469b0839388846c39bcab307783299035fc01

2362

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

2363

Date: Thu Feb 17 12:06:50 2011 +0000

2364

2365

Add ax_config_dir from audacity

2366

2367

m4/ax_config_dir.m4 | 109

2368

+++++++++++++++++++++++++++++++++++++++++++++++++++

2369

1 files changed, 109 insertions(+), 0 deletions(-)

2370

2371

commit 27a18ac693371a804f9e5b9b5263024d90d1d07e

4823

commit 4d45b02f6930ef0f97096deb5f70d62252dc7f95

4824

Author: Nirbheek Chauhan <nirbheek@gentoo.org>

4825

Date: Wed Feb 23 20:55:49 2011 +0530

4826

4827

Fix header collisions between clutter-gtk-0.10 and clutter-gtk-1.0

4828

4829

Always include clutter-gtk-1.0 first to avoid header-include-path

4830

problems

4831

4832

https://bugzilla.gnome.org/show_bug.cgi?id=643078

4833

4834

configure.ac | 4 ++--

4835

1 files changed, 2 insertions(+), 2 deletions(-)

4836

4837

commit 33b6ee49a826c72e8a872bc9a98ef5015bca638a

4838

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

4839

Date: Wed Dec 22 11:44:57 2010 +0100

4840

4841

re-implement /query and /msg (#623682)

4842

4843

libempathy-gtk/empathy-chat.c | 62

4844

+++++++++++++++++++++++++----------------

4845

1 files changed, 38 insertions(+), 24 deletions(-)

4846

4847

commit c7112dca957e3c5fb4c318f2753b22e300960747

4848

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

4849

Date: Fri Feb 4 15:37:41 2011 +0100

4850

4851

finally kill EmpathyDispatcher

4852

4853

So long, and thanks for all the dispatching!

4854

4855

libempathy/empathy-dispatcher.c | 656

4856

+--------------------------------------

4857

libempathy/empathy-dispatcher.h | 34 --

4858

2 files changed, 1 insertions(+), 689 deletions(-)

4859

4860

commit 938d9c8dbe1c39c99d92311b0fa0c2a98c0cb940

4861

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

4862

Date: Fri Feb 4 15:35:00 2011 +0100

4863

4864

ft-handler: stop instantiating a EmpathyDispatcher

4865

4866

libempathy/empathy-ft-handler.c | 10 ----------

4867

1 files changed, 0 insertions(+), 10 deletions(-)

4868

4869

commit ea84ad87c75088e29378c1c332a20567a76a538e

4870

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

4871

Date: Fri Feb 4 15:34:37 2011 +0100

4872

4873

empathy.c: stop instantiating a EmpathyDispatcher

4874

4875

src/empathy.c | 6 ------

4876

1 files changed, 0 insertions(+), 6 deletions(-)

4877

4878

commit ffb89eff7654897d8d5246bc06840411ab1de13f

4879

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

4880

Date: Fri Feb 4 15:24:36 2011 +0100

4881

4882

use tp_capabilities_supports_room_list() (#641491)

4883

4884

src/empathy-new-chatroom-dialog.c | 21 ++++++++-------------

4885

1 files changed, 8 insertions(+), 13 deletions(-)

4886

4887

commit c96c271f838ffa3911bd301b37b6c7aaffb2dfc2

4888

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

4889

Date: Thu Feb 24 10:11:26 2011 +0100

4890

4891

depend on telepathy-glib 0.13.14

4892

4893

We need it for tp_capabilities_supports_room_list()

4894

4895

configure.ac | 2 +-

4896

1 files changed, 1 insertions(+), 1 deletions(-)

4897

4898

commit 4435767a8769ac913b7fc7860474dca824a1cde8

4899

Author: Bruno Brouard <annoa.b@gmail.com>

4900

Date: Wed Feb 23 20:40:08 2011 +0100

4901

4902

Updated French translation

4903

4904

po/fr.po | 158

4905

++++++++++++++++++++++++++++++++------------------------------

4906

1 files changed, 81 insertions(+), 77 deletions(-)

4907

4908

commit 5ac753af160f7184594b74aa0b61e73e8fb3d5a7

4909

Author: Cheng-Chia Tseng <pswo10680@gmail.com>

4910

Date: Wed Feb 23 19:28:48 2011 +0800

4911

4912

Updated Traditional Chinese translation(Hong Kong and Taiwan)

4913

4914

po/zh_HK.po | 349

4915

++++++++++++++++++++++++++++++-----------------------------

4916

po/zh_TW.po | 349

4917

++++++++++++++++++++++++++++++-----------------------------

4918

2 files changed, 358 insertions(+), 340 deletions(-)

4919

4920

commit c7146024489b4cc95263b9dfa0f8f237dd799b42

4921

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

4922

Date: Tue Feb 22 22:36:07 2011 +0000

4923

4924

CC panel: don't use an undefined symbol

4925

4926

src/cc-empathy-accounts-panel.c | 2 --

4927

src/empathy-accounts-common.h | 4 ----

4928

2 files changed, 0 insertions(+), 6 deletions(-)

4929

4930

commit 35bbb7ce80ed1941a68b593fa69ebdb78c71e1e1

2372

4931

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

2373

4932

Date: Tue Feb 22 09:58:31 2011 +0100

2374

4933

2378

4937

data/icons/hicolor_apps_256x256_empathy.png | Bin 0 -> 24824 bytes

2379

4938

2 files changed, 1 insertions(+), 0 deletions(-)

2380

4939

2381

commit 1c9453749700b6d2c93da33ce9603b11af0389dc

4940

commit ef711c0be15feb40853087ea3b86d364e83030d4

4941

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

4942

Date: Tue Feb 22 09:44:23 2011 +0100

4943

4944

remove released flag

4945

4946

configure.ac | 2 +-

4947

1 files changed, 1 insertions(+), 1 deletions(-)

4948

4949

commit fc9e2392778db9c05b9f628cc104da12608c6369

4950

Author: Ivar Smolin <okul@linux.ee>

4951

Date: Tue Feb 22 10:14:54 2011 +0200

4952

4953

[l10n] Updated Estonian translation

4954

4955

po/et.po | 7 +++++--

4956

1 files changed, 5 insertions(+), 2 deletions(-)

4957

4958

commit 5527cc3dc589a986c7aaeafc54b50101059e506a

2382

4959

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

2383

4960

Date: Mon Feb 21 15:59:52 2011 +0000

2384

4961

2387

4964

src/Makefile.am | 2 +-

2388

4965

1 files changed, 1 insertions(+), 1 deletions(-)

2389

4966

2390

commit ad321c79756677c09b3fee13274c59dbaa27c483

4967

commit 41688dd942557db1da816f6ba5f6e8502de2c1c4

4968

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

4969

Date: Mon Feb 21 16:11:44 2011 +0100

4970

4971

prepare 2.91.90

4972

4973

NEWS | 58

4974

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

4975

configure.ac | 6 +++---

4976

2 files changed, 61 insertions(+), 3 deletions(-)

4977

4978

commit 738c40c96bec045a28f6871bb50b85b660c6ef8e

4979

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

4980

Date: Mon Feb 21 15:55:25 2011 +0100

4981

4982

use GeditCloseButton (#642865)

4983

4984

src/empathy-chat-window.c | 25 ++++---------------------

4985

1 files changed, 4 insertions(+), 21 deletions(-)

4986

4987

commit 6b33a26fa16179fce84a6243ede3f2d226ce4718

4988

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

4989

Date: Mon Feb 21 15:54:46 2011 +0100

4990

4991

add gedit-close-button

4992

4993

This file is a bare copy from gedit.

4994

4995

src/Makefile.am | 2 +

4996

src/gedit-close-button.c | 80

4997

++++++++++++++++++++++++++++++++++++++++++++++

4998

src/gedit-close-button.h | 60 ++++++++++++++++++++++++++++++++++

4999

3 files changed, 142 insertions(+), 0 deletions(-)

5000

5001

commit 7490e07615a360c73cf204f6023298785eefe183

5002

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

5003

Date: Mon Feb 21 14:15:18 2011 +0100

5004

5005

coding style fixes

5006

5007

libempathy-gtk/empathy-contact-list-view.c | 2 +-

5008

libempathy-gtk/empathy-ui-utils.c | 2 +-

5009

2 files changed, 2 insertions(+), 2 deletions(-)

5010

5011

commit b5f65eef4dc95e0b8ba141c00a4e731e97c893cc

2391

5012

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

2392

5013

Date: Mon Feb 21 13:59:37 2011 +0100

2393

5014

2396

5017

libempathy/empathy-account-settings.c | 2 +-

2397

5018

1 files changed, 1 insertions(+), 1 deletions(-)

2398

5019

2399

commit fe148502a5dd08fc62825cac6272cb5e980984a6

5020

commit 24915e378ea1cd185acb406e4f69ddb029f6aea2

5021

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

5022

Date: Mon Feb 21 11:57:56 2011 +0100

5023

5024

re-enable strict-prototypes warning

5025

5026

It seems that GTK+ has been fixed

5027

5028

configure.ac | 3 +--

5029

1 files changed, 1 insertions(+), 2 deletions(-)

5030

5031

commit f80ac5a563fe7e7b88f7c3f3b737907792dae355

2400

5032

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

2401

5033

Date: Mon Feb 21 10:59:56 2011 +0000

2402

5034

2411

5043

libempathy-gtk/empathy-audio-src.h | 66 -----

2412

5044

libempathy-gtk/empathy-video-src.c | 360 ------------------------

2413

5045

libempathy-gtk/empathy-video-src.h | 86 ------

2414

libempathy-gtk/empathy-video-widget.c | 485

5046

libempathy-gtk/empathy-video-widget.c | 487

2415

5047

---------------------------------

2416

5048

libempathy-gtk/empathy-video-widget.h | 72 -----

2417

src/Makefile.am | 9 +-

5049

src/Makefile.am | 8 +

2418

5050

src/empathy-audio-sink.c | 235 ++++++++++++++++

2419

5051

src/empathy-audio-sink.h | 67 +++++

2420

5052

src/empathy-audio-src.c | 387 ++++++++++++++++++++++++++

2422

5054

src/empathy-streamed-media-window.c | 8 +-

2423

5055

src/empathy-video-src.c | 360 ++++++++++++++++++++++++

2424

5056

src/empathy-video-src.h | 86 ++++++

2425

src/empathy-video-widget.c | 485

5057

src/empathy-video-widget.c | 487

2426

5058

+++++++++++++++++++++++++++++++++

2427

5059

src/empathy-video-widget.h | 72 +++++

2428

19 files changed, 1772 insertions(+), 1773 deletions(-)

2429

2430

commit 03de06a7d06a37b362ed7d5d85559000a3bb411c

2431

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

2432

Date: Fri Feb 18 11:16:39 2011 +0100

2433

2434

ensure that the theme manager stay alive

2435

2436

src/empathy.c | 6 ++++++

2437

1 files changed, 6 insertions(+), 0 deletions(-)

2438

2439

commit ee4e14effcb1cb2b109d533c88933239c25a12c8

5060

19 files changed, 1774 insertions(+), 1774 deletions(-)

5061

5062

commit a11f7c047fbc1e02a28d5c8f4366e8f2d3e1e423

5063

Author: Milo Casagrande <milo@ubuntu.com>

5064

Date: Fri Feb 18 19:19:10 2011 +0100

5065

5066

Fiexd wrong title capitalization for checkbox

5067

5068

libempathy-gtk/empathy-account-widget-aim.ui | 2 +-

5069

libempathy-gtk/empathy-account-widget-groupwise.ui | 2 +-

5070

libempathy-gtk/empathy-account-widget-icq.ui | 2 +-

5071

libempathy-gtk/empathy-account-widget-jabber.ui | 2 +-

5072

libempathy-gtk/empathy-account-widget-msn.ui | 2 +-

5073

libempathy-gtk/empathy-account-widget-sip.ui | 2 +-

5074

libempathy-gtk/empathy-account-widget-yahoo.ui | 2 +-

5075

7 files changed, 7 insertions(+), 7 deletions(-)

5076

5077

commit 7c0535692bcdc2c3cc0614ebd06e2bf24cdfd921

5078

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

5079

Date: Mon Feb 21 10:17:13 2011 +0100

5080

5081

use champlain_view_ensure_layers_visible()

5082

5083

libempathy-gtk/empathy-individual-widget.c | 4 +---

5084

src/empathy-map-view.c | 4 +---

5085

2 files changed, 2 insertions(+), 6 deletions(-)

5086

5087

commit 72b084c00c702917f32cc3f750fb648d9e191d2c

5088

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

5089

Date: Mon Feb 21 10:11:33 2011 +0100

5090

5091

use champlain_marker_layer_new()

5092

5093

libempathy-gtk/empathy-contact-widget.c | 2 +-

5094

libempathy-gtk/empathy-individual-widget.c | 2 +-

5095

src/empathy-map-view.c | 3 +--

5096

3 files changed, 3 insertions(+), 4 deletions(-)

5097

5098

commit 1629b3b04f38eb748ae8385e407e01bfaf312a63

5099

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

5100

Date: Thu Feb 17 15:29:03 2011 +0100

5101

5102

Port to champlain 0.10 (#642010)

5103

5104

configure.ac | 9 +--

5105

libempathy-gtk/empathy-contact-widget.c | 15 ++--

5106

libempathy-gtk/empathy-individual-widget.c | 29 ++++-----

5107

src/empathy-map-view.c | 96

5108

+++++++++++++---------------

5109

4 files changed, 68 insertions(+), 81 deletions(-)

5110

5111

commit 932d46f051bbfbf144dcb063849e4f285daa8586

5112

Author: Yaron Shahrabani <sh.yaron@gmail.com>

5113

Date: Mon Feb 21 09:19:33 2011 +0200

5114

5115

Updated Hebrew translation.

5116

5117

po/he.po | 166

5118

++++++++++++++++++++++++++++++++------------------------------

5119

1 files changed, 85 insertions(+), 81 deletions(-)

5120

5121

commit a415776354fb947c6a42abecae405009c7e1b6b6

5122

Author: Khaled Hosny <khaledhosny@eglug.org>

5123

Date: Sun Feb 20 23:47:26 2011 +0200

5124

5125

Updated Arabic translation

5126

5127

po/ar.po | 168

5128

++++++++++++++++++++++++++++++++------------------------------

5129

1 files changed, 86 insertions(+), 82 deletions(-)

5130

5131

commit 31352fc1bd675fdda5d75b44429b4067bd0f626b

5132

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

5133

Date: Sun Feb 20 15:50:19 2011 +0000

5134

5135

Check for GLib

5136

5137

Since we obviously use it.

5138

5139

configure.ac | 1 +

5140

1 files changed, 1 insertions(+), 0 deletions(-)

5141

5142

commit adda2aa529b3d7a275b54a95afe0201aee1e6783

5143

Author: Daniel Mustieles <daniel.mustieles@gmail.com>

5144

Date: Sun Feb 20 13:58:39 2011 +0100

5145

5146

Updated Spanish translation

5147

5148

help/es/es.po | 108

5149

+++++++++++++++++++++++++++-----------------------------

5150

1 files changed, 52 insertions(+), 56 deletions(-)

5151

5152

commit 4b167f7717f6a2008cb8178861d5436bd6a4f9aa

5153

Author: Daniel Mustieles <daniel.mustieles@gmail.com>

5154

Date: Sun Feb 20 13:58:18 2011 +0100

5155

5156

Updated Spanish translation

5157

5158

po/es.po | 168

5159

+++++++++++++++++++++++++++++++-------------------------------

5160

1 files changed, 84 insertions(+), 84 deletions(-)

5161

5162

commit cc1893624f843ba363b1bd3cceb5e4cc709cada7

5163

Author: Mahyar Moghimi <mahyar.moqimi@gmail.com>

5164

Date: Fri Feb 18 23:49:56 2011 +0330

5165

5166

Adding Persian Translation

5167

5168

po/LINGUAS | 1 +

5169

po/fa.po | 3829

5170

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

5171

2 files changed, 3830 insertions(+), 0 deletions(-)

5172

5173

commit 03bbe3de832ab35a928e43bf05e3df099301cd67

5174

Author: Friedel Wolff <friedel@translate.org.za>

5175

Date: Fri Feb 18 18:06:01 2011 +0200

5176

5177

New translation for Zulu (zu)

5178

5179

po/LINGUAS | 1 +

5180

po/zu.po | 3973

5181

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

5182

2 files changed, 3974 insertions(+), 0 deletions(-)

5183

5184

commit df72fd00377a9aaed2b532c84eb0c25383991b72

5185

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

5186

Date: Fri Feb 18 11:00:26 2011 +0100

5187

5188

empathy-chat: ensure that the theme manager stay alive

5189

5190

src/empathy-chat.c | 7 +++++++

5191

1 files changed, 7 insertions(+), 0 deletions(-)

5192

5193

commit df6a382a635251a6c86d81af128d4f1187491c5f

2440

5194

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

2441

5195

Date: Fri Feb 18 10:57:11 2011 +0100

2442

5196

2446

5200

libempathy-gtk/empathy-theme-manager.c | 7 +++++--

2447

5201

1 files changed, 5 insertions(+), 2 deletions(-)

2448

5202

2449

commit 7365b5426c1e281f49bd67506c09ce76ffb67e2c

5203

commit 753a1862257d4c14fb2475a73ec08aeabdb7d907

2450

5204

Author: Philip Withnall <philip.withnall@collabora.co.uk>

2451

5205

Date: Sat Jan 29 16:16:29 2011 +0000

2452

5206

2462

5216

Closes: bgo#637151

2463

5217

2464

5218

configure.ac | 2 +-

2465

libempathy-gtk/empathy-individual-dialogs.c | 2 +-

2466

5219

.../empathy-individual-information-dialog.c | 2 +-

2467

5220

libempathy-gtk/empathy-individual-menu.c | 8 +++---

2468

5221

libempathy-gtk/empathy-individual-store.c | 4 +-

2469

libempathy-gtk/empathy-individual-view.c | 19

2470

++++++++++++++--

5222

libempathy-gtk/empathy-individual-view.c | 21

5223

+++++++++++++++---

2471

5224

libempathy-gtk/empathy-individual-widget.c | 20

2472

5225

+++++++++---------

2473

5226

libempathy-gtk/empathy-linking-dialog.c | 2 +-

2475

5228

libempathy/empathy-utils.c | 22

2476

5229

++++++++++++++++++-

2477

5230

libempathy/empathy-utils.h | 1 +

2478

11 files changed, 59 insertions(+), 27 deletions(-)

5231

10 files changed, 59 insertions(+), 27 deletions(-)

2479

5232

2480

commit 6103b13b462a07a8b508ee2223ef1e5acfc8dd47

5233

commit d008f215bc41f4e69ff01879047ec946a4370148

2481

5234

Author: Philip Withnall <philip.withnall@collabora.co.uk>

2482

5235

Date: Sun Feb 6 12:14:28 2011 +0000

2483

5236

2490

5243

2491

5244

libempathy/empathy-individual-manager.c | 33

2492

5245

+++++++++++++++++++++++++++++-

2493

1 files changed, 31 insertions(+), 2 deletions(-)

2494

2495

commit 0289a301599c10bdf5a1946276ed62bd3bfe93bc

5246

libempathy/empathy-utils.c | 2 +-

5247

2 files changed, 32 insertions(+), 3 deletions(-)

5248

5249

commit 8e789be3d95d5e232bbde41094f5e0e426109132

5250

Author: Xandru Armesto <xandru@softastur.org>

5251

Date: Thu Feb 17 18:12:11 2011 +0100

5252

5253

Updating Asturian translation

5254

5255

po/ast.po | 2872

5256

+++++++++++++++++++++++++++++++------------------------------

5257

1 files changed, 1459 insertions(+), 1413 deletions(-)

5258

5259

commit 014148a2b30d9b77e29abb565e0450fa9f88e5c7

2496

5260

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

2497

5261

Date: Thu Feb 17 12:55:00 2011 +0100

2498

5262

2501

5265

src/empathy-accounts.c | 1 +

2502

5266

1 files changed, 1 insertions(+), 0 deletions(-)

2503

5267

2504

commit 6cf142d1a902e1799abe66a5813f2f3978025f6c

5268

commit 73c9a3dba54975438ac127cc8020386ae5ed8e93

2505

5269

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

2506

5270

Date: Thu Feb 17 12:54:10 2011 +0100

2507

5271

2510

5274

libempathy/empathy-account-settings.c | 2 +-

2511

5275

1 files changed, 1 insertions(+), 1 deletions(-)

2512

5276

2513

commit 4ee8d2a57e3165f036edf53e336282c1cab88b89

5277

commit 84b316b42725de82000353a9650e9304f5d4f825

5278

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

5279

Date: Thu Feb 17 11:59:21 2011 +0100

5280

5281

empathy_protocol_chooser_create_account_settings: ensure that cm is

5282

always unrefed

5283

5284

libempathy-gtk/empathy-protocol-chooser.c | 9 +++++----

5285

1 files changed, 5 insertions(+), 4 deletions(-)

5286

5287

commit 9cae8fb44d9d76ad88d09527f48192dffba57711

2514

5288

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

2515

5289

Date: Thu Feb 17 11:15:48 2011 +0100

2516

5290

2525

5299

libempathy-gtk/empathy-theme-manager.h | 2 +-

2526

5300

4 files changed, 11 insertions(+), 5 deletions(-)

2527

5301

2528

commit e42a54e9e1bfe9a16ad319dc182b3e55caf69f90

5302

commit 382bb4914eb08c7c1472350633b1fe91bba50c05

5303

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

5304

Date: Thu Feb 17 10:54:08 2011 +0100

5305

5306

chatroom_manager_parse_chatroom: don't leak chatroom

5307

5308

libempathy/empathy-chatroom-manager.c | 1 +

5309

1 files changed, 1 insertions(+), 0 deletions(-)

5310

5311

commit de93890f23fa987bcd5d78b6833dedbee7537eb8

2529

5312

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

2530

5313

Date: Thu Feb 17 14:47:05 2011 +0100

2531

5314

2534

5317

libempathy-gtk/empathy-individual-view.c | 4 ++--

2535

5318

1 files changed, 2 insertions(+), 2 deletions(-)

2536

5319

2537

commit 46d6989afcf9964e80d1e6a7b5e0f623da1b2f77

5320

commit 6011de2aa9fc4427acfa42ffe423fb166a165058

2538

5321

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

2539

5322

Date: Thu Nov 11 12:28:41 2010 +0100

2540

5323

2543

5326

libempathy-gtk/empathy-individual-view.c | 5 ++++-

2544

5327

1 files changed, 4 insertions(+), 1 deletions(-)

2545

5328

2546

commit f8f7ac21055e4f5f6ebe90c0e9c0605739cefe73

5329

commit 600abe1e8b0f010484c7f1bdf185b4948660908e

5330

Merge: a1579c8 313c508

5331

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

5332

Date: Thu Feb 17 14:37:14 2011 +0100

5333

5334

Merge branch 'expander-642098'

5335

5336

commit 313c5081cb99cd116d51353f13827fa8c8e9e289

5337

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

5338

Date: Thu Feb 17 14:27:26 2011 +0100

5339

5340

empathy_cell_renderer_expander_render: draw using the proper state

5341

(#642098)

5342

5343

libempathy-gtk/empathy-cell-renderer-expander.c | 15 +++++++++++++--

5344

1 files changed, 13 insertions(+), 2 deletions(-)

5345

5346

commit 8c99779e5b055bc407ac2b8bf6bb26f4df63d555

5347

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

5348

Date: Fri Feb 11 12:30:28 2011 +0100

5349

5350

update copyright

5351

5352

libempathy-gtk/empathy-cell-renderer-expander.c | 1 +

5353

1 files changed, 1 insertions(+), 0 deletions(-)

5354

5355

commit 81fe71399ae0fea7e5a522e998e129e5cb9e756f

5356

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

5357

Date: Fri Feb 11 12:15:12 2011 +0100

5358

5359

cell-renderer-expander: remove animation code

5360

5361

It's broken and useless any way.

5362

5363

libempathy-gtk/empathy-cell-renderer-expander.c | 163

5364

-----------------------

5365

1 files changed, 0 insertions(+), 163 deletions(-)

5366

5367

commit a1579c86e5ff333a78dbafb6c196d39035284d07

5368

Author: Kjartan Maraas <kmaraas@gnome.org>

5369

Date: Thu Feb 17 13:13:06 2011 +0100

5370

5371

Updated Norwegian bokmål translation.

5372

5373

po/nb.po | 128

5374

++++++++++++++++++++++++++++++++------------------------------

5375

1 files changed, 66 insertions(+), 62 deletions(-)

5376

5377

commit 0f4470c3e892cdbb0e6fdda9d300d0a84b6ff62e

5378

Author: Asia Słowik <asiaslowik@gmail.com>

5379

Date: Wed Feb 16 22:06:09 2011 +0100

5380

5381

Updated Polish translation

5382

5383

po/pl.po | 11 +++--------

5384

1 files changed, 3 insertions(+), 8 deletions(-)

5385

5386

commit ef4f45ba4d629437d49fc73a7bde6ef4022b189c

5387

Author: Asia Słowik <asiaslowik@gmail.com>

5388

Date: Wed Feb 16 19:14:21 2011 +0100

5389

5390

Updated Polish translation

5391

5392

po/pl.po | 1962

5393

++++++++++++++++++++++++++++++++------------------------------

5394

1 files changed, 999 insertions(+), 963 deletions(-)

5395

5396

commit a44c73c2e1a57ce59a7eba6d547da2f76ecda430

5397

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

5398

Date: Wed Feb 16 15:49:04 2011 +0100

5399

5400

disconnect the activate cb before detaching the menu

5401

5402

libempathy-gtk/empathy-contact-list-view.c | 4 ++--

5403

libempathy-gtk/empathy-individual-view.c | 4 ++--

5404

libempathy-gtk/empathy-ui-utils.c | 4 ++--

5405

3 files changed, 6 insertions(+), 6 deletions(-)

5406

5407

commit 89c2a14e5eba2921b4ee6264f2a218eb3d93717f

5408

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

5409

Date: Wed Feb 16 15:42:17 2011 +0100

5410

5411

debug-window: use empathy_context_menu_new()

5412

5413

src/empathy-debug-window.c | 5 ++---

5414

1 files changed, 2 insertions(+), 3 deletions(-)

5415

5416

commit ea092fdf3fd0a50acaa77c3768478169a7da589d

5417

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

5418

Date: Wed Feb 16 15:39:30 2011 +0100

5419

5420

accounts-dialog: use empathy_context_menu_new()

5421

5422

src/empathy-accounts-dialog.c | 2 +-

5423

1 files changed, 1 insertions(+), 1 deletions(-)

5424

5425

commit a5685443623cf5be33ff0223c63621eda577c4d7

5426

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

5427

Date: Wed Feb 16 15:34:26 2011 +0100

5428

5429

individual-widget: use empathy_context_menu_new()

5430

5431

libempathy-gtk/empathy-individual-widget.c | 5 +----

5432

1 files changed, 1 insertions(+), 4 deletions(-)

5433

5434

commit 867b57fdd04d230c205b2657b4ffa47db22af62a

5435

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

5436

Date: Wed Feb 16 15:34:08 2011 +0100

5437

5438

individual-view: use empathy_context_menu_new()

5439

5440

libempathy-gtk/empathy-individual-view.c | 5 +----

5441

1 files changed, 1 insertions(+), 4 deletions(-)

5442

5443

commit 57c8169491a65eb284984a252859e39c0272db91

5444

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

5445

Date: Wed Feb 16 15:25:23 2011 +0100

5446

5447

contact-widget: use empathy_context_menu_new()

5448

5449

libempathy-gtk/empathy-contact-widget.c | 4 +---

5450

1 files changed, 1 insertions(+), 3 deletions(-)

5451

5452

commit 1a76481fbfc909010ff8fc79bc04ebca7330a40d

5453

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

5454

Date: Wed Feb 16 15:18:06 2011 +0100

5455

5456

contact-list-view: use empathy_context_menu_new() (#642461)

5457

5458

libempathy-gtk/empathy-contact-list-view.c | 6 +-----

5459

1 files changed, 1 insertions(+), 5 deletions(-)

5460

5461

commit b93ebf9d9f42e4de478b63b9219efcdf516e630e

5462

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

5463

Date: Wed Feb 16 15:10:24 2011 +0100

5464

5465

theme-adium: use empathy_context_menu_new() and remove our hack

5466

5467

It ensures that the popup is destroyed as soon as we're done with it.

5468

(#642461)

5469

5470

libempathy-gtk/empathy-theme-adium.c | 4 +---

5471

1 files changed, 1 insertions(+), 3 deletions(-)

5472

5473

commit 33fec6ea1836eaa5ba39bd233a5b81e4f6998a18

5474

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

5475

Date: Wed Feb 16 15:09:09 2011 +0100

5476

5477

add empathy_context_menu_new()

5478

5479

That's basically the same trick as we did in

5480

individual_view_popup_menu_idle_cb(). We can't unfortunatelly not

5481

use this

5482

function there as the popup may be reused in some cases.

5483

5484

libempathy-gtk/empathy-ui-utils.c | 34

5485

++++++++++++++++++++++++++++++++++

5486

libempathy-gtk/empathy-ui-utils.h | 2 ++

5487

2 files changed, 36 insertions(+), 0 deletions(-)

5488

5489

commit 404871f95d42c41f01af2fdff862a877e624675b

2547

5490

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

2548

5491

Date: Fri Feb 4 16:40:15 2011 +0100

2549

5492

2553

5496

src/empathy-accounts-dialog.c | 16 +++++++++++++++-

2554

5497

1 files changed, 15 insertions(+), 1 deletions(-)

2555

5498

2556

commit 4363d4c0d778b924b12f294636ca108a15d93aec

5499

commit 6ea60bb165253f1355d9fbfa1a5a010fb79c2c06

2557

5500

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

2558

5501

Date: Thu Dec 16 10:48:52 2010 +0100

2559

5502

2562

5505

libempathy/empathy-ft-factory.c | 12 ++++++++++++

2563

5506

1 files changed, 12 insertions(+), 0 deletions(-)

2564

5507

2565

commit 5f504abee583ca0e8ec6721a5d2e305b59003d04

5508

commit 52269e4ffc18cd85d3bec8970192e104e7fc0898

2566

5509

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

2567

5510

Date: Thu Dec 16 10:43:06 2010 +0100

2568

5511

2571

5514

libempathy/empathy-ft-factory.c | 29 ++++++++++++++++-------------

2572

5515

1 files changed, 16 insertions(+), 13 deletions(-)

2573

5516

2574

commit b94a66a9ebc4ae1465b65ee4c2dbb76a78745e28

5517

commit a49b8d190c999195a68b0d2043894b8425a96edc

2575

5518

Author: Debarshi Ray <debarshir@src.gnome.org>

2576

5519

Date: Tue Feb 15 17:28:09 2011 +0200

2577

5520

2585

5528

libempathy/irc-networks.xml | 9 +++++++--

2586

5529

1 files changed, 7 insertions(+), 2 deletions(-)

2587

5530

2588

commit a98b91f97661f7a94ef44f957f1edbfebf680fc2

5531

commit d4cc2c6f60ba99c5e7772b08af6407b983f4b7a0

2589

5532

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

2590

5533

Date: Tue Feb 15 11:20:59 2011 +0100

2591

5534

2597

5540

src/empathy-account-assistant.c | 2 +-

2598

5541

4 files changed, 31 insertions(+), 5 deletions(-)

2599

5542

2600

commit 2d295e9cc7b2ce7a173144624e7226765a125c65

5543

commit f19e015dc6bc1b62805dd37159176b591a7f9676

5544

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

5545

Date: Wed Feb 16 10:44:20 2011 +0100

5546

5547

set 'Empathy' as program class in all binaries

5548

5549

This will make all the empathy apps windows appear as the same

5550

application

5551

in gnome-shell. (#642440)

5552

5553

Thanks to Owen Taylor for this trick.

5554

5555

src/empathy-accounts.c | 2 ++

5556

src/empathy-auth-client.c | 3 +++

5557

src/empathy-av.c | 2 ++

5558

src/empathy-chat.c | 2 ++

5559

src/empathy-debugger.c | 2 ++

5560

5 files changed, 11 insertions(+), 0 deletions(-)

5561

5562

commit 9c59bb18947a31362ded4c9e5ec5c4ea8c4d0b83

5563

Author: Daniel Mustieles <daniel.mustieles@gmail.com>

5564

Date: Tue Feb 15 21:30:54 2011 +0100

5565

5566

Updated Spanish translation

5567

5568

po/es.po | 19 +++++++++++--------

5569

1 files changed, 11 insertions(+), 8 deletions(-)

5570

5571

commit 6ab8e70515bcf91c79b78701ce5358d6beb0bd10

5572

Merge: 1c70d6e c7e246e

5573

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

5574

Date: Tue Feb 15 09:19:43 2011 +0100

5575

5576

Merge remote branch 'glassrose/Reset-network-list-button-642264'

5577

5578

commit 1c70d6e3ea5a6a7a7d286ab1fd3163d804f736f9

5579

Author: Bruno Brouard <annoa.b@gmail.com>

5580

Date: Mon Feb 14 18:13:24 2011 +0100

5581

5582

Updated French translation

5583

5584

po/fr.po | 1503

5585

++++++++++++++++++++++++++++++++++----------------------------

5586

1 files changed, 818 insertions(+), 685 deletions(-)

5587

5588

commit c7e246e02d143268e0e8fc310c2078d312e4b91a

2601

5589

Author: Chandni Verma <chandniverma2112@gmail.com>

2602

5590

Date: Mon Feb 14 07:41:30 2011 +0530

2603

5591

2613

5601

libempathy/empathy-irc-network.h | 2 +

2614

5602

5 files changed, 110 insertions(+), 12 deletions(-)

2615

5603

2616

commit b3399c7cdfc007245179797e44f5edae1fc27dd3

2617

Merge: 9060de5 2a2ff64

2618

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

2619

Date: Tue Feb 15 08:22:33 2011 +1100

2620

2621

Merge branch 'report-abuse' into gnome-2-34

2622

2623

commit 2a2ff64bde87c68a256f2c6ddacc559668ddd265

2624

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

2625

Date: Tue Feb 15 08:19:46 2011 +1100

2626

2627

Use tp_g_signal_connect_object for Tp proxies that outlive the

2628

CB dialog

2629

2630

libempathy-gtk/empathy-contact-blocking-dialog.c | 10 ++++++----

2631

1 files changed, 6 insertions(+), 4 deletions(-)

2632

2633

commit 9060de5a495ec7afc49c08299c9b060c0abaae56

5604

commit 9458d4eb2a490693a1a64f486ced58e0ec58369c

5605

Author: Ivar Smolin <okul@linux.ee>

5606

Date: Mon Feb 14 17:58:41 2011 +0200

5607

5608

[l10n] Updated Estonian translation

5609

5610

po/et.po | 10 +++++-----

5611

1 files changed, 5 insertions(+), 5 deletions(-)

5612

5613

commit 94b8532b6cc83fa8924d5f734d3a92db5feac479

2634

5614

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

2635

5615

Date: Mon Feb 14 16:33:10 2011 +0100

2636

5616

2640

5620

libempathy-gtk/empathy-password-dialog.c | 9 +++++++++

2641

5621

1 files changed, 9 insertions(+), 0 deletions(-)

2642

5622

2643

commit 7a649b8764d0db04a57e0c1b004fb691a08113ab

5623

commit 6a7796336de7c9a5f6834253c8862d1e752ef5f7

5624

Author: Cheng-Chia Tseng <pswo10680@gmail.com>

5625

Date: Mon Feb 14 19:39:16 2011 +0800

5626

5627

Updated Traditional Chinese translation(Hong Kong and Taiwan)

5628

5629

po/zh_HK.po | 951

5630

++++++++++++++++++++++++++++++++---------------------------

5631

po/zh_TW.po | 954

5632

++++++++++++++++++++++++++++++++---------------------------

5633

2 files changed, 1027 insertions(+), 878 deletions(-)

5634

5635

commit 1432ec6d6943ed7d8a5b6d2176924fef7cd517b5

2644

5636

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

2645

5637

Date: Fri Feb 11 11:29:15 2011 +0100

2646

5638

2650

5642

libempathy-gtk/empathy-irc-network-chooser.c | 19 ++++++++++++++++++-

2651

5643

1 files changed, 18 insertions(+), 1 deletions(-)

2652

5644

2653

commit 33d5de140c27ee3c9caa8182426829a944a5b64c

2654

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

2655

Date: Mon Feb 14 12:44:34 2011 +1100

2656

2657

Use Conn.I.CB to report contacts as abusive when blocking them

2658

2659

libempathy/empathy-tp-contact-list.c | 13 +++++++++++--

2660

1 files changed, 11 insertions(+), 2 deletions(-)

2661

2662

commit a848bc5256e4c80371a11f5eae20679df11d0fc1

2663

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

2664

Date: Mon Feb 14 12:36:22 2011 +1100

2665

2666

Only destroy block confirmation dialogs after we've read out the

2667

abusive state

2668

2669

libempathy-gtk/empathy-contact-dialogs.c | 3 +--

2670

libempathy-gtk/empathy-individual-dialogs.c | 3 ++-

2671

2 files changed, 3 insertions(+), 3 deletions(-)

2672

2673

commit d48aea8bdaed274dfec7a46e092550067d7bd2ac

2674

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

2675

Date: Mon Feb 14 12:24:58 2011 +1100

2676

2677

Determine whether a connection supports reporting abuse, set the

2678

connection flag

2679

2680

libempathy/empathy-tp-contact-list.c | 36

2681

++++++++++++++++++++++++++++++++++

2682

1 files changed, 36 insertions(+), 0 deletions(-)

2683

2684

commit 8997acba567ca85e20c57c289f26caacaaef7d68

2685

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

2686

Date: Mon Feb 14 12:10:35 2011 +1100

2687

2688

Add draft Conn.I.ContactBlocking (danni's version) to extensions

2689

2690

.../Connection_Interface_Contact_Blocking.xml | 172

2691

++++++++++++++++++++

2692

extensions/Makefile.am | 1 +

2693

extensions/misc.xml | 1 +

2694

3 files changed, 174 insertions(+), 0 deletions(-)

2695

2696

commit 89546bb514ec002bfddf7a13998398efa89a5cb5

2697

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

2698

Date: Mon Feb 14 12:00:56 2011 +1100

2699

2700

Hook up abusive argument into TpContactList backend

2701

2702

libempathy-gtk/empathy-contact-dialogs.c | 6 ++++--

2703

libempathy-gtk/empathy-contact-menu.c | 6 +++---

2704

libempathy-gtk/empathy-individual-view.c | 7 +++++--

2705

libempathy/empathy-contact-list.c | 5 +++--

2706

libempathy/empathy-contact-list.h | 6 ++++--

2707

libempathy/empathy-contact-manager.c | 6 ++++--

2708

libempathy/empathy-individual-manager.c | 5 +++--

2709

libempathy/empathy-individual-manager.h | 3 ++-

2710

libempathy/empathy-tp-contact-list.c | 3 ++-

2711

9 files changed, 30 insertions(+), 17 deletions(-)

2712

2713

commit 20700ef6d7f72e7211195016335cac43ea2195e2

2714

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

2715

Date: Wed Sep 29 14:09:26 2010 +0200

2716

2717

use TP_PROP_*

2718

2719

libempathy/empathy-tp-chat.c | 10 +++++-----

2720

1 files changed, 5 insertions(+), 5 deletions(-)

2721

2722

commit 57f786d197c61bf5bc914cadb33d9f1bfd50f264

2723

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

2724

Date: Wed Sep 29 14:02:07 2010 +0200

2725

2726

Stop generating Conference API

2727

2728

extensions/Channel_Interface_Conference.xml | 635

2729

---------------------------

2730

extensions/Makefile.am | 1 -

2731

extensions/misc.xml | 1 -

2732

3 files changed, 0 insertions(+), 637 deletions(-)

2733

2734

commit 461d2796da725e10c02dfd7767ac3ebd38261dfc

2735

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

2736

Date: Wed Sep 29 14:04:15 2010 +0200

2737

2738

use tp-glib API for Conference (#630709)

2739

2740

libempathy/empathy-tp-chat.c | 8 ++++----

2741

1 files changed, 4 insertions(+), 4 deletions(-)

2742

2743

commit 17e69195176edfa854e1d62cc3e6bd322128ce37

2744

Merge: d23ec3d 49a44a4

2745

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

2746

Date: Fri Feb 11 20:31:32 2011 +1100

2747

2748

Merge branch 'contact-blocking-3' into gnome-2-34

2749

2750

commit 49a44a405f845bdb1cb76c6d0b073c257342bf53

2751

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

2752

Date: Fri Feb 11 20:30:56 2011 +1100

2753

2754

Style fixes from review

2755

2756

libempathy-gtk/empathy-individual-dialogs.c | 4 +++-

2757

libempathy-gtk/empathy-individual-dialogs.h | 3 ++-

2758

2 files changed, 5 insertions(+), 2 deletions(-)

2759

2760

commit 068551e68046f42a8278c01186e10fb1142493f9

2761

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

2762

Date: Fri Feb 11 16:17:48 2011 +1100

2763

2764

Add confirmation dialog to Remove

2765

2766

Also includes the future Report Abusive check box, so that all

2767

the strings

2768

are in place now.

2769

2770

libempathy-gtk/empathy-individual-dialogs.c | 94

2771

+++++++++++++++++++++++++++

2772

libempathy-gtk/empathy-individual-dialogs.h | 2 +

2773

libempathy-gtk/empathy-individual-view.c | 16 ++++-

2774

libempathy/empathy-individual-manager.c | 2 +

2775

libempathy/empathy-individual-manager.h | 1 +

2776

5 files changed, 112 insertions(+), 3 deletions(-)

2777

2778

commit ca4aa4562c34e3f5c95a2bc39c7279c6ee3ae724

2779

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

2780

Date: Fri Feb 11 15:27:05 2011 +1100

2781

2782

Add block confirmation to the authorise publication dialog

2783

2784

libempathy-gtk/empathy-contact-dialogs.c | 22 +++++++++++++++++-----

2785

1 files changed, 17 insertions(+), 5 deletions(-)

2786

2787

commit 56100a85fb2986ed04436a5988791f235215d402

2788

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

2789

Date: Fri Feb 11 13:46:07 2011 +1100

2790

2791

Add UI to blocking confirmation dialog for future "report as abusive"

2792

function

2793

2794

libempathy-gtk/empathy-contact-dialogs.c | 33

2795

+++++++++++++++++++++++++++--

2796

libempathy/empathy-contact-list.h | 1 +

2797

2 files changed, 31 insertions(+), 3 deletions(-)

2798

2799

commit 7311c2623170a0271d14da46d5b2ee0163ed46e5

2800

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

2801

Date: Fri Feb 11 13:31:26 2011 +1100

2802

2803

Factor out common blocking confirmation dialog

2804

2805

libempathy-gtk/empathy-contact-dialogs.c | 43

2806

++++++++++++++++++++++++++++++

2807

libempathy-gtk/empathy-contact-dialogs.h | 3 ++

2808

libempathy-gtk/empathy-contact-menu.c | 33 +++++------------------

2809

3 files changed, 53 insertions(+), 26 deletions(-)

2810

2811

commit d23ec3dc8820592c390adec4de712a570a3c06c7

5645

commit afe6426f268f5ba7b20f989bbd19f41ccb19b182

5646

Author: Fran Diéguez <fran.dieguez@mabishu.com>

5647

Date: Sun Feb 13 14:01:57 2011 +0100

5648

5649

Updated Galician translations

5650

5651

po/gl.po | 299

5652

+++++++++++++++++++++++++++++++------------------------------

5653

1 files changed, 152 insertions(+), 147 deletions(-)

5654

5655

commit d95f48409ba9a1a6815619bb085ba50b6eea5311

5656

Author: Kjartan Maraas <kmaraas@gnome.org>

5657

Date: Sat Feb 12 13:49:15 2011 +0100

5658

5659

Updated Norwegian bokmål translation.

5660

5661

po/nb.po | 296

5662

+++++++++++++++++++++++++++++++-------------------------------

5663

1 files changed, 148 insertions(+), 148 deletions(-)

5664

5665

commit f2b315fe100c9292492c7a37221be11dd87d3e10

5666

Author: Daniel Mustieles <daniel.mustieles@gmail.com>

5667

Date: Sat Feb 12 09:59:33 2011 +0100

5668

5669

Updated Spanish translation

5670

5671

po/es.po | 374

5672

+++++++++++++++++++++++++++++++-------------------------------

5673

1 files changed, 188 insertions(+), 186 deletions(-)

5674

5675

commit de7532516985cf487da00abbe8bdc3025c669961

5676

Author: Yaron Shahrabani <sh.yaron@gmail.com>

5677

Date: Sat Feb 12 00:23:24 2011 +0200

5678

5679

Updated Hebrew translation.

5680

5681

po/he.po | 292

5682

+++++++++++++++++++++++++++++++-------------------------------

5683

1 files changed, 146 insertions(+), 146 deletions(-)

5684

5685

commit 9314023680793975ddd928ca3f7b672b605da760

5686

Author: Khaled Hosny <khaledhosny@eglug.org>

5687

Date: Thu Feb 10 21:23:27 2011 +0200

5688

5689

Updated Arabic translation

5690

5691

po/ar.po | 292

5692

+++++++++++++++++++++++++++++++-------------------------------

5693

1 files changed, 146 insertions(+), 146 deletions(-)

5694

5695

commit a4ed316c8c6a786d4ac1cb8d969a3f27b6a57a04

5696

Author: Daniel Nylander <po@danielnylander.se>

5697

Date: Thu Feb 10 18:13:07 2011 +0100

5698

5699

Updated Swedish translation

5700

5701

po/sv.po | 394

5702

+++++++++++++++++++++++++++++++-------------------------------

5703

1 files changed, 197 insertions(+), 197 deletions(-)

5704

5705

commit 5324201651b4be5a164ab2f3af2f7d4a8348e4a9

5706

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

5707

Date: Thu Feb 10 13:21:09 2011 +0100

5708

5709

account-settings: cope with g_regex_new returning NULL

5710

5711

libempathy/empathy-account-settings.c | 10 +++++++++-

5712

1 files changed, 9 insertions(+), 1 deletions(-)

5713

5714

commit ef8d5543ab390b62c99a0fc17e1ef30cdb08f6a5

2812

5715

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

2813

5716

Date: Thu Feb 10 13:18:12 2011 +0100

2814

5717

2817

5720

libempathy-gtk/empathy-string-parser.c | 14 +++++++++++++-

2818

5721

1 files changed, 13 insertions(+), 1 deletions(-)

2819

5722

2820

commit 7c9f3c83e7abdf4c3a5dfc6b7dc91e671e79b662

5723

commit 3272874ae2d8cf8e53dd939fb590fbf63c9dc6fa

2821

5724

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

2822

5725

Date: Fri Nov 12 13:52:30 2010 +0100

2823

5726

2831

5734

libempathy/empathy-channel-factory.h | 58 ++++++++++++++++

2832

5735

3 files changed, 186 insertions(+), 0 deletions(-)

2833

5736

2834

commit 39ff96975fe694db89e96574a256db64f6fa365b

5737

commit 356be50ba481e0046c0ade43032de78322f3eaa8

2835

5738

Author: Rob Bradford <rob@linux.intel.com>

2836

5739

Date: Thu Feb 10 00:00:33 2011 +0000

2837

5740

2847

5750

libempathy/empathy-connectivity.c | 4 ++--

2848

5751

1 files changed, 2 insertions(+), 2 deletions(-)

2849

5752

2850

commit 79be987eee4d7e2156c0b4e765923831038815b1

5753

commit 189ac2ece4abcd095d94ec015154e50d13f46e02

2851

5754

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

2852

5755

Date: Thu Feb 10 11:57:34 2011 +0100

2853

5756

2854

5757

improve phrasing of the subscription request message

2855

5758

2856

src/empathy-event-manager.c | 5 +++--

2857

1 files changed, 3 insertions(+), 2 deletions(-)

2858

2859

commit a64acd193522eb034dc650fccfbe0b1d8f66c57e

2860

Author: Alex Launi <alex.launi@gmail.com>

2861

Date: Tue Nov 2 21:11:56 2010 -0400

2862

2863

Reword subscription request dialog to be less technical

2864

2865

src/empathy-event-manager.c | 4 ++--

2866

1 files changed, 2 insertions(+), 2 deletions(-)

2867

2868

commit b144dca066162f1ece8de8c9762be8f5c19bcfa3

5759

src/empathy-event-manager.c | 2 +-

5760

1 files changed, 1 insertions(+), 1 deletions(-)

5761

5762

commit add7f929cb12b88b2d3c4810b2d7b034196ddbdf

2869

5763

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

2870

5764

Date: Wed Feb 9 17:06:31 2011 +0000

2871

5765

2875

5769

src/Makefile.am | 3 +++

2876

5770

2 files changed, 9 insertions(+), 2 deletions(-)

2877

5771

2878

commit 8838f0c8bc0d835b4b76f8d28d5846e835b12496

5772

commit 07460f755936ac04bbe4a2ffc30914b840b9861b

2879

5773

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

2880

5774

Date: Wed Feb 9 17:01:32 2011 +0000

2881

5775

2897

5791

+++++++++++++++++++++++++++

2898

5792

src/empathy-streamed-media-handler.h | 106 +++

2899

5793

src/empathy-streamed-media-window.h | 3 +-

2900

12 files changed, 1393 insertions(+), 1388 deletions(-)

5794

12 files changed, 1391 insertions(+), 1390 deletions(-)

2901

5795

2902

commit 4d42a0eb3600ef6577ab96c7251cc45da4dfb989

5796

commit 2104fdf4bd3b020e2dca0d397ce445423f463704

2903

5797

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

2904

5798

Date: Wed Feb 9 16:48:34 2011 +0000

2905

5799

2919

5813

libempathy/empathy-utils.h | 11 ++++-

2920

5814

7 files changed, 80 insertions(+), 91 deletions(-)

2921

5815

2922

commit fd52278cc48cc8fb0a69d61d35eb59e96077e13a

5816

commit f22e466ab6e525a148145f66aed3ce4a0f23128a

2923

5817

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

2924

5818

Date: Wed Feb 9 16:29:24 2011 +0000

2925

5819

2939

5833

libempathy/empathy-streamed-media-factory.h | 82 +++++++

2940

5834

libempathy/empathy-streamed-media-handler.c | 8 +-

2941

5835

libempathy/empathy-streamed-media-handler.h | 2 +-

2942

src/empathy-av.c | 10 +-

5836

src/empathy-av.c | 12 +-

2943

5837

src/empathy-event-manager.c | 1 -

2944

5838

src/empathy-streamed-media-window.c | 1 -

2945

15 files changed, 442 insertions(+), 447 deletions(-)

5839

15 files changed, 443 insertions(+), 448 deletions(-)

2946

5840

2947

commit 42a6c594b066bb28ee7ccfe66837562caf72254d

5841

commit e4d6dc647732a895dbf6c1b0983ccad39ed3a61c

2948

5842

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

2949

5843

Date: Wed Feb 9 16:12:32 2011 +0000

2950

5844

2953

5847

src/Makefile.am | 23 ++++++++++++++++++++++-

2954

5848

1 files changed, 22 insertions(+), 1 deletions(-)

2955

5849

2956

commit 51f8d1fb607505c8ae9390fe081e72945130290b

5850

commit 3fc3cb87f63dfbf4a33bc5512073600688729dd2

5851

Author: Cosimo Cecchi <cosimoc@gnome.org>

5852

Date: Tue Feb 8 14:47:33 2011 -0500

5853

5854

accounts: fill in the right categories to show up in control-center

5855

5856

https://bugzilla.gnome.org/show_bug.cgi?id=641868

5857

5858

data/empathy-accounts.desktop.in.in | 2 +-

5859

1 files changed, 1 insertions(+), 1 deletions(-)

5860

5861

commit fd7763a53b2e67de8676d34f6a755202832bf363

5862

Author: Cosimo Cecchi <cosimoc@gnome.org>

5863

Date: Tue Feb 8 14:44:58 2011 -0500

5864

5865

cc-panel: make sure to always pack a widget during construction

5866

5867

The CC library expects the panel to have a child widget after it's

5868

constructed, otherwise it segfaults.

5869

5870

https://bugzilla.gnome.org/show_bug.cgi?id=641867

5871

5872

src/cc-empathy-accounts-panel.c | 11 ++++++++++-

5873

1 files changed, 10 insertions(+), 1 deletions(-)

5874

5875

commit c61ceefda501caad3efc8cad84662972d3652baa

2957

5876

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

2958

5877

Date: Thu Feb 3 15:30:39 2011 +0000

2959

5878

2963

5882

src/empathy-av.c | 2 +-

2964

5883

2 files changed, 2 insertions(+), 2 deletions(-)

2965

5884

2966

commit 5e6f399b45abc712ff5379ae7dbb53675ad12165

5885

commit 6e2db2cf4831d586d3db73ea431d6c6d18668286

5886

Author: Sweta Kothari <swkothar@redhat.com>

5887

Date: Wed Feb 9 14:58:02 2011 +0530

5888

5889

Updated Gujarati Translations

5890

5891

po/gu.po | 3386

5892

++++++++++++++++++++++++++++++++++++++++++-------------------

5893

1 files changed, 2331 insertions(+), 1055 deletions(-)

5894

5895

commit be3b9622582ca5abc86532019e7563a37010b5ed

5896

Author: Laurent Bigonville <bigon@bigon.be>

5897

Date: Tue Feb 8 10:40:54 2011 +0100

5898

5899

GNOME is not using CVS for a while

5900

5901

autogen.sh | 2 +-

5902

1 files changed, 1 insertions(+), 1 deletions(-)

5903

5904

commit 1d32cd41ebb142f313fde508aedde89f3c20d32d

5905

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

5906

Date: Mon Feb 7 14:06:44 2011 +0100

5907

5908

always color the room label when we are highlighted

5909

5910

src/empathy-chat-window.c | 3 ++-

5911

1 files changed, 2 insertions(+), 1 deletions(-)

5912

5913

commit cf25437b4330f128f0d35e97a353824177736c53

5914

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

5915

Date: Mon Feb 7 13:13:20 2011 +0100

5916

5917

use tp_clear_object()

5918

5919

libempathy/empathy-tp-file.c | 21 ++++-----------------

5920

1 files changed, 4 insertions(+), 17 deletions(-)

5921

5922

commit b07ca79425096c6e6f1cafda1be19b85cc2983a2

5923

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

5924

Date: Mon Feb 7 13:11:20 2011 +0100

5925

5926

tp-file: use the self->priv pattern

5927

5928

libempathy/empathy-tp-file.c | 399

5929

+++++++++++++++++++-----------------------

5930

libempathy/empathy-tp-file.h | 3 +-

5931

2 files changed, 182 insertions(+), 220 deletions(-)

5932

5933

commit 8846f4598c605911fa1c8bee6b5dd4e6aacb9a53

5934

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

5935

Date: Mon Feb 7 12:48:49 2011 +0100

5936

5937

depends on telepathy-glib 0.13.12

5938

5939

We need it for FileTransfer.URI API.

5940

5941

configure.ac | 2 +-

5942

1 files changed, 1 insertions(+), 1 deletions(-)

5943

5944

commit 4f54a4e0ecb21b56c22efb1756f174eacd8c17f5

5945

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

5946

Date: Mon Feb 7 11:33:39 2011 +0100

5947

5948

Set FileTransfer.URI when accepting a file (#641707)

5949

5950

libempathy/empathy-tp-file.c | 49

5951

+++++++++++++++++++++++++++++++++--------

5952

1 files changed, 39 insertions(+), 10 deletions(-)

5953

5954

commit 7e67efc0b94e62d2a5f48412abc5f71c43ca764b

5955

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

5956

Date: Mon Jan 31 14:11:57 2011 +0100

5957

5958

set FileTransfer.URI on outgoing FT

5959

5960

libempathy/empathy-ft-handler.c | 5 +++++

5961

1 files changed, 5 insertions(+), 0 deletions(-)

5962

5963

commit e80937f80044e5125139dd4e6aeb5fac3019bcb8

5964

Author: Kjartan Maraas <kmaraas@gnome.org>

5965

Date: Sun Feb 6 19:16:39 2011 +0100

5966

5967

Updated Norwegian bokmål translation.

5968

5969

po/nb.po | 635

5970

++++++++++++++++++++++++++++++++------------------------------

5971

1 files changed, 329 insertions(+), 306 deletions(-)

5972

5973

commit fb57016c81a53579af803f8ffd82756225a72391

5974

Author: Khaled Hosny <khaledhosny@eglug.org>

5975

Date: Sat Feb 5 17:00:27 2011 +0200

5976

5977

Updated Arabic translation

5978

5979

po/ar.po | 477

5980

+++++++++++++++++++++++++++++++++-----------------------------

5981

1 files changed, 256 insertions(+), 221 deletions(-)

5982

5983

commit 14e738d67444e05342802fb1ed841d217bd00cf1

5984

Author: Yaron Shahrabani <sh.yaron@gmail.com>

5985

Date: Fri Feb 4 09:04:27 2011 +0200

5986

5987

Updated Hebrew translation.

5988

5989

po/he.po | 392

5990

+++++++++++++++++++++++++++++++++----------------------------

5991

1 files changed, 212 insertions(+), 180 deletions(-)

5992

5993

commit 7f58b46964f9ec00abfac3beb5356ab7fdb88cb4

2967

5994

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

2968

5995

Date: Thu Feb 3 14:03:26 2011 +0000

2969

5996

2979

6006

src/empathy-streamed-media-window.c | 28 +-

2980

6007

6 files changed, 401 insertions(+), 401 deletions(-)

2981

6008

2982

commit bcbd239c96127d53f3617cef3f3b423c692c4558

6009

commit 4b985ad97ad2cfee604394c5b7c6fb47d87cab39

2983

6010

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

2984

6011

Date: Thu Feb 3 13:57:28 2011 +0000

2985

6012

2987

6014

2988

6015

po/POTFILES.in | 2 +-

2989

6016

src/Makefile.am | 2 +-

2990

src/empathy-av.c | 8 +-

6017

src/empathy-av.c | 6 +-

2991

6018

src/empathy-call-window-fullscreen.c | 4 +-

2992

6019

src/empathy-call-window-fullscreen.h | 4 +-

2993

src/empathy-call-window.c | 3324

6020

src/empathy-call-window.c | 3323

2994

6021

----------------------------------

2995

6022

src/empathy-call-window.h | 64 -

2996

src/empathy-streamed-media-window.c | 3324

6023

src/empathy-streamed-media-window.c | 3323

2997

6024

++++++++++++++++++++++++++++++++++

2998

6025

src/empathy-streamed-media-window.h | 64 +

2999

9 files changed, 3398 insertions(+), 3398 deletions(-)

6026

9 files changed, 3396 insertions(+), 3396 deletions(-)

3000

6027

3001

commit cc91c3f32b15f6a8f1a0d38b8878f27fca412647

6028

commit 734d2d4314edc2302dc8e1edb74dc58d6d16d908

3002

6029

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

3003

6030

Date: Thu Feb 3 13:45:45 2011 +0000

3004

6031

3018

6045

src/empathy-call-window.h | 4 +-

3019

6046

10 files changed, 1072 insertions(+), 1072 deletions(-)

3020

6047

3021

commit 2766ed3e19cc8032eedef5cf5cb6ab302a57f63a

6048

commit d8d937bd964bda813cc2b33389f464d1dfbcb95f

3022

6049

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

3023

6050

Date: Thu Feb 3 12:15:12 2011 +0000

3024

6051

3039

6066

src/empathy-event-manager.c | 22 +-

3040

6067

11 files changed, 1030 insertions(+), 1019 deletions(-)

3041

6068

3042

commit 2327d4810445c2e3975cc69fae61bddf471abda2

3043

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

3044

Date: Thu Feb 10 16:23:58 2011 +1100

3045

3046

contact-blocking-dialog: report errors to the user

3047

3048

libempathy-gtk/empathy-contact-blocking-dialog.c | 55

3049

++++++++++++++++++++-

3050

1 files changed, 52 insertions(+), 3 deletions(-)

3051

3052

commit a9f69666a58de8145e3236485cff83b9d0e246ec

3053

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

3054

Date: Thu Feb 10 15:56:02 2011 +1100

3055

3056

Don't leak EmpathyContact

3057

3058

libempathy/empathy-individual-manager.c | 2 ++

3059

1 files changed, 2 insertions(+), 0 deletions(-)

3060

3061

commit bbd1ebc8ae5c785b6a4c5458155c90a05981000e

3062

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

3063

Date: Thu Feb 10 15:45:17 2011 +1100

3064

3065

Add Block button to the subscription authorization dialog

3066

3067

libempathy-gtk/empathy-contact-dialogs.c | 21 +++++++++++-

3068

libempathy-gtk/empathy-contact-dialogs.ui | 54

3069

++++++++++++++++++++++-------

3070

2 files changed, 61 insertions(+), 14 deletions(-)

3071

3072

commit 9b421ab4f0806be9bfb841286fa991204aaa4780

3073

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

3074

Date: Thu Feb 10 13:19:35 2011 +1100

3075

3076

Add a confirmation dialog when you block a contact from the Contact

3077

menu

3078

3079

libempathy-gtk/empathy-contact-menu.c | 43

3080

++++++++++++++++++++++++++++++++-

3081

src/empathy-chat-window.c | 4 +++

3082

2 files changed, 46 insertions(+), 1 deletions(-)

3083

3084

commit be7fff958c4327450dcc170e6387cdc2a284f065

3085

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

3086

Date: Wed Feb 9 17:29:18 2011 +1100

3087

3088

Add 'Delete and Block' as an option to the Remove Contact dialog

3089

3090

libempathy-gtk/empathy-individual-view.c | 38

3091

++++++++++++++++++++---------

3092

1 files changed, 26 insertions(+), 12 deletions(-)

3093

3094

commit e0bc8ed3281f53e526823affb01396546c5e36b1

3095

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

3096

Date: Wed Feb 9 17:24:27 2011 +1100

3097

3098

Add contact blocking support to EmpathyIndividualManager

3099

3100

libempathy/empathy-individual-manager.c | 74

3101

+++++++++++++++++++++++++++++++

3102

libempathy/empathy-individual-manager.h | 9 ++++

3103

2 files changed, 83 insertions(+), 0 deletions(-)

3104

3105

commit 317493d0a14718d5f1df6fb8738743146b69388e

3106

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

3107

Date: Wed Feb 9 13:05:20 2011 +1100

3108

3109

Add 'Block Contact' to empathy-contact-menu

3110

3111

libempathy-gtk/empathy-chat.c | 3 +-

3112

libempathy-gtk/empathy-contact-menu.c | 71

3113

+++++++++++++++++++++++++++++++++

3114

libempathy-gtk/empathy-contact-menu.h | 3 +-

3115

3 files changed, 75 insertions(+), 2 deletions(-)

3116

3117

commit 61572ce5a33a31ec2d36ac676384a7a6d246d7b4

3118

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

3119

Date: Mon Feb 7 13:41:40 2011 +1100

3120

3121

Add contact blocking to EmpathyContactList and friends

3122

3123

libempathy/empathy-contact-list.c | 23 ++++++++++++

3124

libempathy/empathy-contact-list.h | 12 ++++++

3125

libempathy/empathy-contact-manager.c | 41 +++++++++++++++++++++

3126

libempathy/empathy-tp-contact-list.c | 64

3127

++++++++++++++++++++++++++++++---

3128

libempathy/empathy-tp-contact-list.h | 1 +

3129

5 files changed, 135 insertions(+), 6 deletions(-)

3130

3131

commit e86fa5ff0136af2458971a4e8e309b862b35b11a

3132

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

3133

Date: Tue Feb 8 13:53:11 2011 +1100

3134

3135

Handle the case where there are no accounts with deny channels

3136

3137

libempathy-gtk/empathy-contact-blocking-dialog.c | 88

3138

+++++++++++++++-------

3139

1 files changed, 62 insertions(+), 26 deletions(-)

3140

3141

commit 3b38e04da561f15963156302cac923e22a895936

3142

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

3143

Date: Tue Feb 8 12:16:15 2011 +1100

3144

3145

Don't need to prepare accounts separately

3146

3147

libempathy-gtk/empathy-contact-blocking-dialog.c | 41

3148

++++++----------------

3149

1 files changed, 11 insertions(+), 30 deletions(-)

3150

3151

commit 155c260f5a7ef39c5f1403e024363844cc67a0f2

3152

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

3153

Date: Mon Feb 7 13:13:20 2011 +0100

3154

3155

use tp_clear_object()

3156

3157

libempathy/empathy-tp-file.c | 21 ++++-----------------

3158

1 files changed, 4 insertions(+), 17 deletions(-)

3159

3160

commit b2e3fe2be77ea14d5354bfd9eec9b62f007daa1b

3161

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

3162

Date: Mon Feb 7 13:11:20 2011 +0100

3163

3164

tp-file: use the self->priv pattern

3165

3166

libempathy/empathy-tp-file.c | 399

3167

+++++++++++++++++++-----------------------

3168

libempathy/empathy-tp-file.h | 3 +-

3169

2 files changed, 182 insertions(+), 220 deletions(-)

3170

3171

commit bc19e0f15b2aaba0a5a95ffa20ef70ea63b6fd2a

3172

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

3173

Date: Mon Feb 7 12:48:49 2011 +0100

3174

3175

depends on telepathy-glib 0.13.12

3176

3177

We need it for FileTransfer.URI API.

3178

3179

configure.ac | 2 +-

3180

1 files changed, 1 insertions(+), 1 deletions(-)

3181

3182

commit f4b9ea4f2748b0c9e69133d10ded0c0a8d594667

3183

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

3184

Date: Mon Feb 7 11:33:39 2011 +0100

3185

3186

Set FileTransfer.URI when accepting a file (#641707)

3187

3188

libempathy/empathy-tp-file.c | 49

3189

+++++++++++++++++++++++++++++++++--------

3190

1 files changed, 39 insertions(+), 10 deletions(-)

3191

3192

commit 8ca89fda5872c87e2c4264748d722b8edda957be

3193

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

3194

Date: Mon Jan 31 14:11:57 2011 +0100

3195

3196

set FileTransfer.URI on outgoing FT

3197

3198

libempathy/empathy-ft-handler.c | 59

3199

++++++++++++++------------------------

3200

1 files changed, 22 insertions(+), 37 deletions(-)

3201

3202

commit 02cc922c2b3b8c0a511c95c0da5f4536ed94142c

3203

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

3204

Date: Mon Feb 7 10:59:33 2011 +1100

3205

3206

Add blocked contacts dialog to Empathy main window menu

3207

3208

src/empathy-main-window.c | 17 ++++++++++++++++-

3209

src/empathy-main-window.ui | 7 +++++++

3210

2 files changed, 23 insertions(+), 1 deletions(-)

3211

3212

commit 71d24b1424c861483f92a0e2d6412fc5633ec322

3213

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

3214

Date: Mon Feb 7 10:59:14 2011 +1100

3215

3216

Prepare EmpathyContactManager in test

3217

3218

.../test-empathy-contact-blocking-dialog.c | 7 +++++++

3219

1 files changed, 7 insertions(+), 0 deletions(-)

3220

3221

commit aa2cc94253279160b3ddc7db612068f0755c50e5

3222

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

3223

Date: Mon Feb 7 10:58:32 2011 +1100

3224

3225

Provide autocompletion of known contacts in the entry box

3226

3227

libempathy-gtk/empathy-contact-blocking-dialog.c | 52

3228

+++++++++++++++++++--

3229

1 files changed, 47 insertions(+), 5 deletions(-)

3230

3231

commit 09deedd52880ab343d8a95e1c6ff058c55bbc8c4

3232

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

3233

Date: Sun Feb 6 12:13:43 2011 +1100

3234

3235

Add and remove contacts from deny list

3236

3237

libempathy-gtk/empathy-contact-blocking-dialog.c | 171

3238

++++++++++++++++++++-

3239

libempathy-gtk/empathy-contact-blocking-dialog.ui | 24 ++--

3240

2 files changed, 183 insertions(+), 12 deletions(-)

3241

3242

commit f9a27436cb73c57ac0fce1fdcae5d50fb5a6c111

3243

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

3244

Date: Sun Feb 6 11:04:11 2011 +1100

3245

3246

Connect ::response in test

3247

3248

.../test-empathy-contact-blocking-dialog.c | 3 +++

3249

1 files changed, 3 insertions(+), 0 deletions(-)

3250

3251

commit 8d92d06bdbf9f7b60dba39ff77480ad30f56a1c7

3252

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

3253

Date: Fri Feb 4 17:55:24 2011 +1100

3254

3255

Test for contact blocking dialog

3256

3257

tests/interactive/.gitignore | 1 +

3258

tests/interactive/Makefile.am | 2 +

3259

.../test-empathy-contact-blocking-dialog.c | 45

3260

++++++++++++++++++++

3261

3 files changed, 48 insertions(+), 0 deletions(-)

3262

3263

commit c485dc5d389f80edd6e425333228dc306da186c6

3264

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

3265

Date: Fri Feb 4 17:47:31 2011 +1100

3266

3267

Beginning of contact blocking dialog

3268

3269

Can currently select an account and view the contact blocking

3270

'deny' list.

3271

List reponds to changes in the group membership.

3272

3273

Add/Remove buttons do not yet do anything.

3274

3275

libempathy-gtk/Makefile.am | 3 +

3276

libempathy-gtk/empathy-contact-blocking-dialog.c | 514

3277

+++++++++++++++++++++

3278

libempathy-gtk/empathy-contact-blocking-dialog.h | 60 +++

3279

libempathy-gtk/empathy-contact-blocking-dialog.ui | 145 ++++++

3280

4 files changed, 722 insertions(+), 0 deletions(-)

3281

3282

commit c1aff983fed1a1fab92585fb7a4ccf5f643e048d

6069

commit 9e808134b2d3770c1e23e1b7c3938b6ac2061ffb

3283

6070

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

3284

6071

Date: Thu Feb 3 14:44:44 2011 +0100

3285

6072

3289

6076

libempathy-gtk/empathy-individual-view.c | 8 ++------

3290

6077

1 files changed, 2 insertions(+), 6 deletions(-)

3291

6078

3292

commit eabb53baaadb3d1cab2f4e1a08a275c0b47df70b

6079

commit 7cbe28b6cfc22744a0a6079213b9614d87bf22ad

3293

6080

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

3294

Date: Thu Feb 3 11:44:34 2011 +0100

3295

3296

contact_list_view_popup_menu_idle_cb: remove useless sink/unref

3297

3298

libempathy-gtk/empathy-contact-list-view.c | 2 --

3299

1 files changed, 0 insertions(+), 2 deletions(-)

3300

3301

commit 175dcba889d04e5322047611c33eefbeab153017

6081

Date: Thu Feb 3 11:07:06 2011 +0100

6082

6083

contact-list-view: backport fixes from

6084

individual_view_popup_menu_idle_cb

6085

6086

libempathy-gtk/empathy-contact-list-view.c | 22 ++++++++++++++++++++--

6087

1 files changed, 20 insertions(+), 2 deletions(-)

6088

6089

commit 8978c0d955186405e291a7ff2ac71a063cdb9e68

3302

6090

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

3303

6091

Date: Thu Feb 3 11:02:35 2011 +0100

3304

6092

3308

6096

libempathy-gtk/empathy-individual-menu.c | 6 ++++--

3309

6097

1 files changed, 4 insertions(+), 2 deletions(-)

3310

6098

3311

commit 087abca96d4dcf3a00eeab826678060090656cb4

6099

commit 8859363aee3d81abd6fb84f8d54f78e782d90425

6100

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

6101

Date: Thu Feb 3 10:58:57 2011 +0100

6102

6103

individual-view: detach the individual menu once it has been displayed

6104

6105

libempathy-gtk/empathy-individual-view.c | 20 ++++++++++++++++++++

6106

1 files changed, 20 insertions(+), 0 deletions(-)

6107

6108

commit f7b205167a4b7e11f1eed687852cb253b1ce1a23

3312

6109

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

3313

6110

Date: Thu Feb 3 10:53:43 2011 +0100

3314

6111

3320

6117

libempathy-gtk/empathy-individual-view.c | 2 --

3321

6118

1 files changed, 0 insertions(+), 2 deletions(-)

3322

6119

3323

commit 3b7f89ff3839d3da9b44736ded081e8f84ae4e0b

3324

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

3325

Date: Wed Feb 2 12:47:14 2011 +0100

3326

3327

update last_tag_pattern

3328

3329

release.py | 2 +-

3330

1 files changed, 1 insertions(+), 1 deletions(-)

3331

3332

commit 08e072c1a83419c2c1ff0e905ffc82a6329b41e5

3333

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

3334

Date: Wed Feb 2 12:46:33 2011 +0100

3335

3336

remove released flag

3337

3338

configure.ac | 2 +-

3339

1 files changed, 1 insertions(+), 1 deletions(-)

3340

3341

commit f5592aa499f7e66e33af5f320af6417b0f322599

3342

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

3343

Date: Wed Feb 2 12:14:27 2011 +0100

3344

3345

coding style fix

3346

3347

libempathy-gtk/empathy-contact-menu.c | 8 ++++----

3348

1 files changed, 4 insertions(+), 4 deletions(-)

3349

3350

commit 8537532a0176bc64680912d57f24fe39e8e404ec

3351

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

3352

Date: Wed Feb 2 11:57:53 2011 +0100

3353

3354

prepare 2.33.1

6120

commit 46be255840a0adb42dd0efa5378ceeecf8411edf

6121

Author: Fran Diéguez <fran.dieguez@mabishu.com>

6122

Date: Thu Feb 3 10:55:31 2011 +0100

6123

6124

Updated Galician translations

6125

6126

po/gl.po | 205

6127

+++++++++++++++++++++++++++++++++++---------------------------

6128

1 files changed, 117 insertions(+), 88 deletions(-)

6129

6130

commit 2dc6d1116520e0f6fc9f4f6470271f137c0eef5f

6131

Author: Ivar Smolin <okul@linux.ee>

6132

Date: Thu Feb 3 09:44:57 2011 +0200

6133

6134

[l10n] Updated Estonian translation

6135

6136

po/et.po | 4 ++--

6137

1 files changed, 2 insertions(+), 2 deletions(-)

6138

6139

commit 824d9f0c61898d3e4125c24b9ab6c3fd6cc0f8a0

6140

Author: A S Alam <aalam@users.sf.net>

6141

Date: Thu Feb 3 08:10:59 2011 +0530

6142

6143

update Punjabi Translation by A S Alam

6144

6145

po/pa.po | 711

6146

++++++++++++++++++++++++++++++++++---------------------------

6147

1 files changed, 396 insertions(+), 315 deletions(-)

6148

6149

commit 8dfdeb48b7e558b9e0d6e8b29292367f0bdba020

6150

Author: Daniel Mustieles <daniel.mustieles@gmail.com>

6151

Date: Wed Feb 2 19:28:43 2011 +0100

6152

6153

Updated Spanish translation

6154

6155

po/es.po | 140

6156

+++++++++++++++++++++++++++++++++++++------------------------

6157

1 files changed, 85 insertions(+), 55 deletions(-)

6158

6159

commit 8914d8cdfdd984398e348fa4b666da05a5418722

6160

Author: Ivar Smolin <okul@linux.ee>

6161

Date: Wed Feb 2 18:27:58 2011 +0200

6162

6163

[l10n] Updated Estonian translation

6164

6165

po/et.po | 32 +++++++++++++++++++++++++++-----

6166

1 files changed, 27 insertions(+), 5 deletions(-)

6167

6168

commit 7803366218ee4b09782394985ffc0d31cb1b8a78

6169

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

6170

Date: Tue Feb 1 17:33:27 2011 +0100

6171

6172

individual-widget: use priv->contact as that's our pointer on the

6173

TpContact now

6174

6175

libempathy-gtk/empathy-individual-widget.c | 3 +--

6176

1 files changed, 1 insertions(+), 2 deletions(-)

6177

6178

commit 91386d401d9385cf334cf4d879f97d7e49540bb1

6179

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

6180

Date: Tue Feb 1 16:48:24 2011 +0100

6181

6182

empathy_contact_get_presence_message: use the tp_contact if there

6183

is no persona for the contact

6184

6185

This is needed in muc as channel specific contacts don't have

6186

a persona

6187

associated with them (#640914).

6188

6189

libempathy/empathy-contact.c | 9 +++++----

6190

1 files changed, 5 insertions(+), 4 deletions(-)

6191

6192

commit 796ab375f5ff84b118320f71ea0d1a54f9dcb221

6193

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

6194

Date: Tue Feb 1 16:24:49 2011 +0100

6195

6196

remove released flag

6197

6198

configure.ac | 2 +-

6199

1 files changed, 1 insertions(+), 1 deletions(-)

6200

6201

commit ae51279486457b96bb746799fbb79b3e4b8518e6

6202

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

6203

Date: Tue Feb 1 14:51:06 2011 +0000

6204

6205

Fix distcheck

6206

6207

extensions/Makefile.am | 3 +++

6208

1 files changed, 3 insertions(+), 0 deletions(-)

6209

6210

commit 2c101f2718ae343a833e6f1885e11f45db8bc010

6211

Merge: 1081451 c9dae1a

6212

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

6213

Date: Tue Feb 1 15:31:19 2011 +0100

6214

6215

Merge branch 'release'

6216

6217

commit 108145120d9c320c81ee276770b2c63abd53ac99

6218

Author: Daniel Nylander <po@danielnylander.se>

6219

Date: Tue Feb 1 15:27:02 2011 +0100

6220

6221

Updated Swedish translation

6222

6223

po/sv.po | 593

6224

++++++++++++++++++++++++++++++++------------------------------

6225

1 files changed, 306 insertions(+), 287 deletions(-)

6226

6227

commit c9dae1a810f67c37e1218fc42b7364e0e2f91fc2

6228

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

6229

Date: Tue Feb 1 15:24:06 2011 +0100

6230

6231

prepare 2.91.6.1

6232

6233

NEWS | 11 +++++++++++

6234

configure.ac | 4 ++--

6235

2 files changed, 13 insertions(+), 2 deletions(-)

6236

6237

commit 621bbbb8631f4b149d0478a3423687e4e973b04f

6238

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

6239

Date: Tue Feb 1 13:47:58 2011 +0000

6240

6241

Update tools from telepathy-glib

6242

6243

extensions/Makefile.am | 12 +-

6244

tools/Makefile.am | 14 +-

6245

tools/c-constants-gen.py | 84 +++++---

6246

tools/check-coding-style.mk | 4 +-

6247

tools/git-which-branch.sh | 25 +++

6248

tools/glib-client-gen.py | 283 +++++++++++++++----------

6249

tools/glib-errors-check-gen.py | 58 +++++

6250

tools/glib-errors-enum-body-gen.py | 62 ------

6251

tools/glib-errors-enum-header-gen.py | 75 -------

6252

tools/glib-errors-str-gen.py | 82 +++++++

6253

tools/glib-ginterface-gen.py | 293 +++++++++++++++++---------

6254

tools/glib-gtypes-generator.py | 214 ++++++++++++-------

6255

tools/glib-interfaces-gen.py | 138 +++++++++++--

6256

tools/gobject-foo.py | 23 ++-

6257

tools/identity.xsl | 7 -

6258

tools/libglibcodegen.py | 5 +-

6259

tools/libtpcodegen.py | 36 +---

6260

tools/make-release-mail.py | 76 +++++++

6261

tools/manager-file.py | 175 +++++++++++++++

6262

tools/shave.mk | 1 +

6263

tools/telepathy-glib.supp | 390

6264

++++++++++++++++++++++++++++++++++

6265

tools/test-wrapper.sh | 30 +++

6266

tools/valgrind.mk | 13 ++

6267

tools/with-session-bus.sh | 10 +-

6268

tools/xincludator.py | 39 ++++

6269

25 files changed, 1623 insertions(+), 526 deletions(-)

6270

6271

commit 9503c4aa28b9a4215e3e325a31b500f2c78b712a

6272

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

6273

Date: Tue Feb 1 11:34:37 2011 +0100

6274

6275

individual-widget: connect on the notify::client-types only once

6276

6277

Reconnecting a signal while you are handling it isn't exactly a good

6278

idea as

6279

it will result in an infinite loop eating all your memory (#635105).

6280

6281

libempathy-gtk/empathy-individual-widget.c | 24

6282

++++++++++++++----------

6283

1 files changed, 14 insertions(+), 10 deletions(-)

6284

6285

commit 21321727a45ac859405638ba034dc4212f1374b8

6286

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

6287

Date: Tue Feb 1 10:44:21 2011 +0100

6288

6289

remove released flag

6290

6291

configure.ac | 2 +-

6292

1 files changed, 1 insertions(+), 1 deletions(-)

6293

6294

commit a1ce2e226d0d78f2e94ee3f6588341c3db6b6793

6295

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

6296

Date: Tue Feb 1 10:26:08 2011 +0100

6297

6298

prepare 2.91.6

3355

6299

3356

6300

NEWS | 39 +++++++++++++++++++++++++++++++++++++++

3357

configure.ac | 4 ++--

3358

2 files changed, 41 insertions(+), 2 deletions(-)

3359

3360

commit 36eebcaac08dc60f64f05b883bc6a94a8468561b

3361

Author: Kushal Das <kushal@fedoraproject.org>

3362

Date: Tue Jan 11 17:49:18 2011 +0530

3363

3364

Pressing F2 opens the Edit Contact Information window for #586257

3365

3366

libempathy-gtk/empathy-individual-view.c | 23 ++++++++++++++++++++++-

3367

1 files changed, 22 insertions(+), 1 deletions(-)

3368

3369

commit 70f1296e9b6a73cbaf0e0c2748df412c1152338a

6301

configure.ac | 6 +++---

6302

2 files changed, 42 insertions(+), 3 deletions(-)

6303

6304

commit 6085b66ce169a5b7a9b6df6afac9a07290c733d3

6305

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

6306

Date: Tue Feb 1 10:18:06 2011 +0100

6307

6308

coding style fix

6309

6310

libempathy-gtk/empathy-chat.c | 2 +-

6311

1 files changed, 1 insertions(+), 1 deletions(-)

6312

6313

commit 88c215486143dc4887b1016540d090c78027ddfa

6314

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

6315

Date: Tue Feb 1 10:18:00 2011 +0100

6316

6317

add empathy-contact-search-dialog.c to POTFILES.in

6318

6319

po/POTFILES.in | 1 +

6320

1 files changed, 1 insertions(+), 0 deletions(-)

6321

6322

commit 38a7c551fb07d72dd7b6744a8d1a345466b011d2

6323

Merge: 7f5c02a b03dfef

6324

Author: Jonny Lamb <jonnylamb@gnome.org>

6325

Date: Tue Feb 1 08:50:22 2011 +0000

6326

6327

Merge branch 'muc-password'

6328

6329

commit b03dfefd8103ea41f61407df122021a6d14d5a19

6330

Author: Jonny Lamb <jonnylamb@gnome.org>

6331

Date: Tue Feb 1 08:41:39 2011 +0000

6332

6333

keyring: use the recently added finish macros

6334

6335

Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

6336

6337

libempathy/empathy-keyring.c | 79

6338

+++++-------------------------------------

6339

1 files changed, 9 insertions(+), 70 deletions(-)

6340

6341

commit 267fb729f0536843bcb7c42858bd3d6a6d029411

6342

Author: Jonny Lamb <jonnylamb@gnome.org>

6343

Date: Tue Feb 1 08:41:24 2011 +0000

6344

6345

utils: add the _finish macros from wocky

6346

6347

Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

6348

6349

libempathy/empathy-utils.h | 45

6350

++++++++++++++++++++++++++++++++++++++++++++

6351

1 files changed, 45 insertions(+), 0 deletions(-)

6352

6353

commit 7f5c02a63be19988ab199e497e22cd93880ae0bd

3370

6354

Author: Travis Reitter <travis.reitter@collabora.co.uk>

3371

Date: Mon Jan 31 20:57:40 2011 -0800

3372

3373

Bump Folks requirement.

3374

3375

configure.ac | 2 --

3376

1 files changed, 0 insertions(+), 2 deletions(-)

3377

3378

commit 2ef91742f4fedf3dfb398021619ac437dd4f3def

6355

Date: Mon Jan 31 20:58:37 2011 -0800

6356

6357

Bump the Folks requirement to match reality.

6358

6359

configure.ac | 2 +-

6360

1 files changed, 1 insertions(+), 1 deletions(-)

6361

6362

commit 19bfb625b0301e6412c77aaccc2faf471d4fbff6

6363

Author: Fran Diéguez <fran.dieguez@mabishu.com>

6364

Date: Tue Feb 1 02:29:26 2011 +0100

6365

6366

Updating Galician translations

6367

6368

po/gl.po | 322

6369

+++++++++++++++++++++++++++++++-------------------------------

6370

1 files changed, 163 insertions(+), 159 deletions(-)

6371

6372

commit 41f5717611c6bb3236ae78a187fd5753bbd9ccf3

3379

6373

Author: Travis Reitter <travis.reitter@collabora.co.uk>

3380

6374

Date: Wed Dec 22 17:22:59 2010 -0800

3381

6375

3383

6377

3384

6378

Fixes bgo#637847.

3385

6379

3386

libempathy-gtk/empathy-individual-store.c | 17 ++++++++++++-----

6380

libempathy-gtk/empathy-individual-store.c | 31

6381

+++++++++++++++------------

3387

6382

libempathy-gtk/empathy-individual-view.c | 2 +-

3388

libempathy-gtk/empathy-individual-widget.c | 9 ++++++---

3389

libempathy-gtk/empathy-persona-store.c | 16 +++++++++-------

3390

libempathy-gtk/empathy-ui-utils.c | 4 +++-

3391

libempathy/empathy-contact.c | 20 ++++++++++++--------

3392

6 files changed, 43 insertions(+), 25 deletions(-)

6383

libempathy-gtk/empathy-individual-widget.c | 24 ++++++++++----------

6384

libempathy-gtk/empathy-persona-store.c | 16 ++++++++------

6385

libempathy-gtk/empathy-ui-utils.c | 4 +-

6386

libempathy/empathy-contact.c | 20 +++++++++---------

6387

6 files changed, 51 insertions(+), 46 deletions(-)

3393

6388

3394

commit 5b04829ea31a9d18f92f76061aea3eb4d1571531

6389

commit dfffa71d1d33714b331faaac367110716d56c72c

3395

6390

Author: Travis Reitter <travis.reitter@collabora.co.uk>

3396

6391

Date: Wed Dec 22 17:46:06 2010 -0800

3397

6392

3399

6394

3400

6395

Helps bgo#637847.

3401

6396

3402

libempathy-gtk/empathy-ui-utils.c | 3 ++-

3403

1 files changed, 2 insertions(+), 1 deletions(-)

3404

3405

commit 1450f98d3cde8ff3dc162eb01de670b2d314138e

3406

Author: Philip Withnall <philip.withnall@collabora.co.uk>

3407

Date: Sun Dec 12 18:51:07 2010 +0000

3408

3409

Bug 637097 — Port to latest folks API changes

3410

3411

Catch up with three interface renamings which have happened in

3412

folks master.

3413

This bumps Empathy's folks dependency to 0.3.3. Closes: bgo#637097

3414

3415

configure.ac | 4 ++--

3416

libempathy-gtk/empathy-contact-widget.c | 10 +++++-----

3417

libempathy-gtk/empathy-individual-menu.c | 4 ++--

3418

libempathy-gtk/empathy-individual-store.c | 4 ++--

3419

libempathy-gtk/empathy-individual-view.c | 6 +++---

3420

libempathy-gtk/empathy-individual-widget.c | 9 +++++----

3421

libempathy-gtk/empathy-persona-store.c | 6 ++++--

3422

libempathy/empathy-individual-manager.c | 4 ++--

3423

8 files changed, 25 insertions(+), 22 deletions(-)

3424

3425

commit bf9f9573d03048050d602bf822b17aeb1ab5414d

3426

Author: Philip Withnall <philip@tecnocode.co.uk>

3427

Date: Sat Nov 13 14:07:46 2010 +0000

3428

3429

Stop using removed Individual convenience methods from folks

3430

3431

They were removed from folks with commit

3432

def47dffa31a95ec6bd333f43c69822416098283. This doesn't require

3433

a dependency

3434

bump, since they're being replaced with calls to methods which exist

3435

in folks

3436

0.3.1. See: bgo#629078. Closes: bgo#634754

3437

3438

.../empathy-individual-information-dialog.c | 2 +-

3439

libempathy-gtk/empathy-individual-store.c | 30

3440

++++++++++----------

3441

libempathy-gtk/empathy-individual-view.c | 4 +-

3442

libempathy-gtk/empathy-linking-dialog.c | 2 +-

3443

libempathy/empathy-individual-manager.c | 2 +-

3444

5 files changed, 20 insertions(+), 20 deletions(-)

3445

3446

commit 6e09b2b2639253549f890702cb811c10cc0d5167

3447

Author: Philip Withnall <philip.withnall@collabora.co.uk>

3448

Date: Wed Sep 15 15:23:14 2010 +0100

3449

3450

Port Empathy to use FolksAliasable and FolksGroupable

3451

3452

FolksAliasable is the new name for FolksAlias, and FolksGroupable

3453

is the new name for FolksGroups.

3454

3455

libempathy-gtk/empathy-contact-widget.c | 4 +-

3456

libempathy-gtk/empathy-groups-widget.c | 48

3457

++++++++++++++--------------

3458

libempathy-gtk/empathy-groups-widget.h | 6 ++--

3459

libempathy-gtk/empathy-individual-view.c | 8 ++--

3460

libempathy-gtk/empathy-individual-widget.c | 12 +++---

3461

libempathy-gtk/empathy-persona-store.c | 16 +++++----

3462

libempathy/empathy-contact.c | 14 ++++----

3463

libempathy/empathy-individual-manager.c | 6 ++--

3464

libempathy/empathy-utils.c | 2 +-

3465

libempathy/empathy-utils.h | 2 +-

3466

10 files changed, 60 insertions(+), 58 deletions(-)

3467

3468

commit bf97e2a3a2a557e7c68ff6e7d1eabbfdc04799e3

3469

Author: William Jon McCann <jmccann@redhat.com>

3470

Date: Tue Oct 12 02:15:51 2010 -0400

3471

3472

Port to libnotify 0.7.0

3473

3474

https://bugzilla.gnome.org/show_bug.cgi?id=631944

3475

3476

configure.ac | 5 ++---

3477

src/empathy-chat-window.c | 2 +-

3478

src/empathy-status-icon.c | 4 ++--

3479

3 files changed, 5 insertions(+), 6 deletions(-)

3480

3481

commit b9d9c5d90b62b0005b609ca3db30162498422c55

3482

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

3483

Date: Tue Feb 1 16:48:24 2011 +0100

3484

3485

empathy_contact_get_presence_message: use the tp_contact if there

3486

is no persona for the contact

3487

3488

This is needed in muc as channel specific contacts don't have

3489

a persona

3490

associated with them (#640914).

3491

3492

libempathy/empathy-contact.c | 3 +++

3493

1 files changed, 3 insertions(+), 0 deletions(-)

3494

3495

commit e33077e282cd1c5b727a69fc3c48b8445d3752b4

3496

Author: Robert Sajdok <robert.sajdok@gmail.com>

3497

Date: Mon Dec 13 10:40:23 2010 +0100

3498

3499

main-window: add a tooltip on connection error info bars (#626507)

3500

3501

configure.ac | 2 +-

3502

src/empathy-main-window.c | 1 +

3503

2 files changed, 2 insertions(+), 1 deletions(-)

3504

3505

commit 33cf25114711e510eba6510a1c6f4ee87daf67a8

3506

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

3507

Date: Mon Jan 24 13:39:15 2011 +0100

3508

3509

account-widget-yahoo: remove server field (#634853)

3510

3511

libempathy-gtk/empathy-account-widget-yahoo.ui | 36

3512

++---------------------

3513

libempathy-gtk/empathy-account-widget.c | 1 -

3514

2 files changed, 4 insertions(+), 33 deletions(-)

3515

3516

commit 34aa039f9a2ff39a5912f8dbc012b43e4a99ef40

3517

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

3518

Date: Mon Jan 24 14:11:01 2011 +0100

3519

3520

account-dialog: keep a proper weak ref on setting_widget_object

3521

3522

This prevent us of trying to use it after it has been disposed. For

3523

example,

3524

when switching to an Haze account, we have to wait that the

3525

EmpathyAccountSettings is ready before getting the new

3526

setting_widget_object

3527

but we can't try using the old one while waiting (#640411).

3528

3529

src/empathy-accounts-dialog.c | 19 ++++++++++++++++---

3530

1 files changed, 16 insertions(+), 3 deletions(-)

3531

3532

commit ab30e5cff24a01f75cb0f08b138b13504253e2c0

3533

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

3534

Date: Tue Nov 30 14:58:09 2010 +0100

3535

3536

chat-window: don't display notifications for pending messages

3537

(#635513)

3538

3539

src/empathy-chat-window.c | 6 +++++-

3540

1 files changed, 5 insertions(+), 1 deletions(-)

3541

3542

commit d0af8490d944fc16124768917be17059010e9b1a

3543

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

3544

Date: Tue Nov 30 14:56:39 2010 +0100

3545

3546

EmpathyChat::new-message: tell if the message is a pending one or not

3547

3548

libempathy-gtk/empathy-chat.c | 16 ++++++++++------

3549

src/empathy-chat-window.c | 1 +

3550

2 files changed, 11 insertions(+), 6 deletions(-)

3551

3552

commit adf13d5860f11caa6956d8d4453b6728d9dd486c

3553

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

3554

Date: Fri Jan 14 09:53:04 2011 +0100

3555

3556

Improve connected/disconnected notifications (#639352)

3557

3558

src/empathy-event-manager.c | 14 ++++++++------

3559

1 files changed, 8 insertions(+), 6 deletions(-)

3560

3561

commit c44e78331c5099b8187d676cbd01e84c96a9da6e

3562

Author: Vitaly Minko <vitaly.minko@gmail.com>

3563

Date: Fri Oct 22 20:58:57 2010 +0400

3564

3565

Disable meaningless popup menu items in the contact menu (#573283).

3566

3567

libempathy-gtk/empathy-contact-menu.c | 16 +++++++++++++---

3568

1 files changed, 13 insertions(+), 3 deletions(-)

3569

3570

commit c81b16e1c9a58720cac7ecd3e526e76158656910

3571

Author: Vitaly Minko <vitaly.minko@gmail.com>

3572

Date: Mon Oct 11 15:51:38 2010 +0200

3573

3574

enable imported Pidgin accounts if needed (#594145)

3575

3576

src/empathy-import-pidgin.c | 53

3577

+++++++++++++++++++++++++++++++++++++++---

3578

src/empathy-import-utils.c | 1 +

3579

src/empathy-import-utils.h | 2 +

3580

src/empathy-import-widget.c | 11 ++++++++-

3581

4 files changed, 62 insertions(+), 5 deletions(-)

3582

3583

commit 66c018746b98cd5f75a5a82e5c3caaa323197c70

3584

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

3585

Date: Fri Jan 28 10:09:02 2011 +0000

3586

3587

Add Contact Search support

3588

3589

https://bugzilla.gnome.org/show_bug.cgi?id=606947

3590

3591

configure.ac | 2 +-

3592

libempathy-gtk/Makefile.am | 2 +

3593

libempathy-gtk/empathy-contact-search-dialog.c | 571

3594

++++++++++++++++++++++++

3595

libempathy-gtk/empathy-contact-search-dialog.h | 58 +++

3596

po/POTFILES.in | 1 +

3597

src/empathy-main-window.c | 11 +

3598

src/empathy-main-window.ui | 8 +

3599

7 files changed, 652 insertions(+), 1 deletions(-)

3600

3601

commit 5be47bde51c996bbb0be0d90f87e86ae982286a4

3602

Author: Vitaly Minko <vitaly.minko@gmail.com>

3603

Date: Wed Nov 10 20:23:39 2010 +0300

3604

3605

Make AccountChooser filters asynchronous to let them handle newly

3606

connected accounts properly (#633481).

3607

3608

libempathy-gtk/empathy-account-chooser.c | 87

3609

++++++++++++++-----

3610

libempathy-gtk/empathy-account-chooser.h | 26 +++++-

3611

libempathy-gtk/empathy-contact-dialogs.c | 16 ++--

3612

libempathy-gtk/empathy-contact-selector-dialog.c | 12 ++-

3613

libempathy-gtk/empathy-contact-selector-dialog.h | 6 +-

3614

libempathy-gtk/empathy-individual-dialogs.c | 11 ++-

3615

libempathy-gtk/empathy-new-call-dialog.c | 86

3616

++++++++++++++----

3617

libempathy-gtk/empathy-new-message-dialog.c | 85

3618

++++++++++++++----

3619

src/empathy-new-chatroom-dialog.c | 103

3620

++++++++++++++++-----

3621

tests/interactive/test-empathy-account-chooser.c | 6 +-

3622

10 files changed, 336 insertions(+), 102 deletions(-)

3623

3624

commit 6bad52391b6cc7a0c0d5c8e011fc9d6f2df973dd

3625

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

3626

Date: Fri Jan 28 09:34:43 2011 +0000

3627

3628

Require folks <= 0.2

3629

3630

Folks 0.3 has the same pkgconfig name but a different API

3631

which we don't support yet.

3632

3633

configure.ac | 2 ++

3634

1 files changed, 2 insertions(+), 0 deletions(-)

3635

3636

commit 9bdf2c3108ac904a284904ed19720fe48a79240e

6397

libempathy-gtk/empathy-ui-utils.c | 2 +-

6398

1 files changed, 1 insertions(+), 1 deletions(-)

6399

6400

commit 8643ff0acdf20596dd233e93db6c83c6ba598d07

6401

Author: Yaron Shahrabani <sh.yaron@gmail.com>

6402

Date: Sun Jan 30 23:19:45 2011 +0200

6403

6404

Updated Hebrew translation.

6405

6406

po/he.po | 480

6407

+++++++++++++++++++++++++++++++-------------------------------

6408

1 files changed, 240 insertions(+), 240 deletions(-)

6409

6410

commit 25a552a5eda176c376ec3cce7ab85aaa1eda2f82

6411

Author: Ivar Smolin <okul@linux.ee>

6412

Date: Sat Jan 29 23:01:41 2011 +0200

6413

6414

[l10n] Updated Estonian translation

6415

6416

po/et.po | 41 +++++++++++++++++++++--------------------

6417

1 files changed, 21 insertions(+), 20 deletions(-)

6418

6419

commit 498a3e516c4ca9b8e02b283e81050d4cc8a6f04c

6420

Author: Daniel Mustieles <daniel.mustieles@gmail.com>

6421

Date: Fri Jan 28 19:38:23 2011 +0100

6422

6423

Updated Spanish translation

6424

6425

po/es.po | 487

6426

+++++++++++++++++++++++++++++++-------------------------------

6427

1 files changed, 243 insertions(+), 244 deletions(-)

6428

6429

commit 935d2f62ebc72edfe86ccf4449b7d95ef758bb74

6430

Author: Jonny Lamb <jonnylamb@gnome.org>

6431

Date: Fri Jan 28 16:44:56 2011 +0000

6432

6433

chat: save room passwords in the keyring if requested

6434

6435

Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

6436

6437

libempathy-gtk/empathy-chat.c | 12 +++++++++++-

6438

1 files changed, 11 insertions(+), 1 deletions(-)

6439

6440

commit 2e70e2fef401bcbe38d9caf8281992be7d0f6413

6441

Author: Jonny Lamb <jonnylamb@gnome.org>

6442

Date: Fri Jan 28 16:44:44 2011 +0000

6443

6444

keyring: add set_room_password functions

6445

6446

Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

6447

6448

libempathy/empathy-keyring.c | 62

6449

++++++++++++++++++++++++++++++++++++++++++

6450

libempathy/empathy-keyring.h | 7 +++++

6451

2 files changed, 69 insertions(+), 0 deletions(-)

6452

6453

commit cfab69400457247ece6cd9baf1d49e70d7d9ce9b

6454

Author: Jonny Lamb <jonnylamb@gnome.org>

6455

Date: Fri Jan 28 16:44:35 2011 +0000

6456

6457

keyring: fix typo

6458

6459

Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

6460

6461

libempathy/empathy-keyring.c | 2 +-

6462

1 files changed, 1 insertions(+), 1 deletions(-)

6463

6464

commit 4da8f83072b0a08d892a093bfab836bda29e1266

6465

Author: Jonny Lamb <jonnylamb@gnome.org>

6466

Date: Fri Jan 28 16:29:31 2011 +0000

6467

6468

chat: try to use a room password from the keyring or offer to save

6469

the password

6470

6471

Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

6472

6473

libempathy-gtk/empathy-chat.c | 167

6474

+++++++++++++++++++++++++++++++++++++++--

6475

1 files changed, 159 insertions(+), 8 deletions(-)

6476

6477

commit 0bc660b874d8c04e22f7601dc5a3de428253d9c3

6478

Author: Jonny Lamb <jonnylamb@gnome.org>

6479

Date: Fri Jan 28 16:29:12 2011 +0000

6480

6481

keyring: add get_room_password_{async,finish} functions

6482

6483

Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

6484

6485

libempathy/empathy-keyring.c | 55

6486

++++++++++++++++++++++++++++++++++++++++++

6487

libempathy/empathy-keyring.h | 7 +++++

6488

2 files changed, 62 insertions(+), 0 deletions(-)

6489

6490

commit 1cbcfd3eda00fa93d081ef37c609103d84663941

6491

Author: Jonny Lamb <jonnylamb@gnome.org>

6492

Date: Fri Jan 28 16:28:58 2011 +0000

6493

6494

keyring: add is_available function

6495

6496

Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

6497

6498

libempathy/empathy-keyring.c | 6 ++++++

6499

libempathy/empathy-keyring.h | 2 ++

6500

2 files changed, 8 insertions(+), 0 deletions(-)

6501

6502

commit f829b8e42bd93a53067c06d8ea52de2ba2632938

6503

Author: Marek Černocký <marek@manet.cz>

6504

Date: Fri Jan 28 16:24:42 2011 +0100

6505

6506

Updated Czech translation

6507

6508

po/cs.po | 307

6509

+++++++++++++++++++++++++++++++-------------------------------

6510

1 files changed, 155 insertions(+), 152 deletions(-)

6511

6512

commit a8e29279f323a5a1f4fc66a450a633b3415bea4d

6513

Author: Jonny Lamb <jonnylamb@gnome.org>

6514

Date: Fri Jan 28 13:52:26 2011 +0000

6515

6516

keyring: rename current functions to be more specifically about

6517

account passwords

6518

6519

Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

6520

6521

libempathy/empathy-account-settings.c | 16 +++++++-------

6522

libempathy/empathy-auth-factory.c | 4 +-

6523

libempathy/empathy-keyring.c | 34

6524

+++++++++++++++++------------

6525

libempathy/empathy-keyring.h | 12 +++++-----

6526

libempathy/empathy-server-sasl-handler.c | 8 +++---

6527

5 files changed, 40 insertions(+), 34 deletions(-)

6528

6529

commit fe7c6ed34c96c0b57b0294ccebdab20dd0b702ba

6530

Author: Jonny Lamb <jonnylamb@gnome.org>

6531

Date: Fri Jan 28 13:18:59 2011 +0000

6532

6533

chat: add clear secondary icon to password entry

6534

6535

Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

6536

6537

libempathy-gtk/empathy-chat.c | 31 +++++++++++++++++++++++++++++++

6538

1 files changed, 31 insertions(+), 0 deletions(-)

6539

6540

commit 703d75010df79a51d0781fec8b30cd8588769c10

6541

Author: Jonny Lamb <jonnylamb@gnome.org>

6542

Date: Fri Jan 28 13:13:04 2011 +0000

6543

6544

chat: make the password entry grow

6545

6546

Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

6547

6548

libempathy-gtk/empathy-chat.c | 8 ++++----

6549

1 files changed, 4 insertions(+), 4 deletions(-)

6550

6551

commit f195c0248cff2258fadca246d94f114c0fa2d685

6552

Author: Jonny Lamb <jonnylamb@gnome.org>

6553

Date: Fri Jan 28 11:31:38 2011 +0000

6554

6555

chat: display a spinner when attempting a MUC password

6556

6557

Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

6558

6559

libempathy-gtk/empathy-chat.c | 130

6560

++++++++++++++++++++++++++--------------

6561

1 files changed, 84 insertions(+), 46 deletions(-)

6562

6563

commit f8f82f5ce0aa87ac4bbde36ece2fb4d8fa2559eb

3637

6564

Author: Will Thompson <will.thompson@collabora.co.uk>

3638

6565

Date: Thu Jan 27 19:04:55 2011 +0000

3639

6566

3660

6587

src/empathy-main-window.ui | 2 +-

3661

6588

1 files changed, 1 insertions(+), 1 deletions(-)

3662

6589

3663

commit 82d700bf4d5654a67631525e7d781d995c4282f0

3664

Author: Jonny Lamb <jonnylamb@gnome.org>

3665

Date: Wed Jan 26 14:16:28 2011 +0000

3666

3667

password-dialog: add missing include

3668

3669

Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

3670

3671

libempathy-gtk/empathy-password-dialog.c | 2 ++

6590

commit 598dd64034b56c84463580f248f5b54dcda361f2

6591

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

6592

Date: Thu Jan 27 23:37:46 2011 +0000

6593

6594

Add Contact Search support

6595

6596

https://bugzilla.gnome.org/show_bug.cgi?id=606947

6597

6598

configure.ac | 2 +-

6599

libempathy-gtk/Makefile.am | 2 +

6600

libempathy-gtk/empathy-account-chooser.h | 1 +

6601

libempathy-gtk/empathy-contact-search-dialog.c | 572

6602

++++++++++++++++++++++++

6603

libempathy-gtk/empathy-contact-search-dialog.h | 58 +++

6604

src/empathy-main-window.c | 11 +

6605

src/empathy-main-window.ui | 8 +

6606

7 files changed, 653 insertions(+), 1 deletions(-)

6607

6608

commit e1f1a8556be4ec33ec496c58f9d466026641133f

6609

Author: Yanko Kaneti <yaneti@declera.com>

6610

Date: Fri Jan 28 00:58:32 2011 +0200

6611

6612

Remove EMPATHY_PREFS_ACCOUNTS_SCHEMA leftovers

6613

6614

data/org.gnome.Empathy.gschema.xml.in | 1 -

6615

libempathy/empathy-gsettings.h | 2 --

6616

2 files changed, 0 insertions(+), 3 deletions(-)

6617

6618

commit 716d990b17c0d74ec255a2f5bfa258df3caca128

6619

Author: Khaled Hosny <khaledhosny@eglug.org>

6620

Date: Thu Jan 27 10:40:25 2011 +0200

6621

6622

Updated Arabic translation

6623

6624

po/ar.po | 1767

6625

++++++++++++++++++++++++++------------------------------------

6626

1 files changed, 742 insertions(+), 1025 deletions(-)

6627

6628

commit d87e605b55a9c1f70c30b8a47d9ffd301364842a

6629

Author: Fran Diéguez <fran.dieguez@mabishu.com>

6630

Date: Thu Jan 27 00:00:53 2011 +0100

6631

6632

QA of Galician translations

6633

6634

po/gl.po | 214

6635

+++++++++++++++++++++++++++++++-------------------------------

6636

1 files changed, 106 insertions(+), 108 deletions(-)

6637

6638

commit 71e8203ac15682c88cd2313c16a2e793d90312ce

6639

Merge: 1570d9b 08d9529

6640

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

6641

Date: Wed Jan 26 09:30:07 2011 +0100

6642

6643

Merge branch 'presence-manager-640532'

6644

6645

commit 08d9529b553d70b3fb4b422f2453fc2247a15f20

6646

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

6647

Date: Tue Jan 25 12:25:12 2011 +0100

6648

6649

use tp_g_signal_connect_object()

6650

6651

libempathy/empathy-presence-manager.c | 28 ++++++----------------------

6652

1 files changed, 6 insertions(+), 22 deletions(-)

6653

6654

commit 273fee5fe68846380765235aae3d9761c349f50c

6655

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

6656

Date: Tue Jan 25 12:21:48 2011 +0100

6657

6658

presence-manager: add a dispose function and use tp_clear_*

6659

6660

libempathy/empathy-presence-manager.c | 37

6661

++++++++++++++++++++------------

6662

1 files changed, 23 insertions(+), 14 deletions(-)

6663

6664

commit 1c3a8da098c9efdd7ece9c8375473f584a374aae

6665

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

6666

Date: Tue Jan 25 12:17:40 2011 +0100

6667

6668

presence_manager_finalize: chain up

6669

6670

libempathy/empathy-presence-manager.c | 2 ++

3672

6671

1 files changed, 2 insertions(+), 0 deletions(-)

3673

6672

3674

commit be94217540e1b927afabd3b2ff1dbfe0655e7aff

3675

Author: Jonny Lamb <jonnylamb@gnome.org>

3676

Date: Wed Dec 8 18:24:47 2010 +0000

3677

3678

status-icon: don't show notifications for auth events

3679

3680

Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

3681

3682

src/empathy-status-icon.c | 12 ++++++++++++

3683

1 files changed, 12 insertions(+), 0 deletions(-)

3684

3685

commit 8e6b4e72bedc7c864722543d81645af0c80ffb79

6673

commit 7e877988467139f1d2bee59a68f28436620d0a0f

6674

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

6675

Date: Tue Jan 25 12:16:28 2011 +0100

6676

6677

use the self->priv pattern rather than GET_PRIV()

6678

6679

libempathy/empathy-presence-manager.c | 279

6680

+++++++++++++--------------------

6681

libempathy/empathy-presence-manager.h | 3 +-

6682

2 files changed, 111 insertions(+), 171 deletions(-)

6683

6684

commit 4c2cba97c84799564a7b0efb14bbff1f75b5c427

6685

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

6686

Date: Tue Jan 25 11:50:35 2011 +0100

6687

6688

presence-manager: port to new coding style

6689

6690

libempathy/empathy-presence-manager.c | 1048

6691

+++++++++++++++++----------------

6692

libempathy/empathy-presence-manager.h | 62 ++-

6693

2 files changed, 570 insertions(+), 540 deletions(-)

6694

6695

commit c9f2cd4f71e619f5a418090981afebbef43226c1

6696

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

6697

Date: Tue Jan 25 11:13:51 2011 +0100

6698

6699

rename EmpathyIdle to EmpathyPresenceManager (#640532)

6700

6701

It's doing more than idle management now.

6702

6703

libempathy-gtk/empathy-presence-chooser.c | 22 +-

6704

libempathy-gtk/empathy-ui-utils.c | 1 -

6705

libempathy/Makefile.am | 4 +-

6706

libempathy/empathy-account-settings.c | 11 +-

6707

libempathy/empathy-idle.c | 732

6708

----------------------------

6709

libempathy/empathy-idle.h | 74 ---

6710

libempathy/empathy-presence-manager.c | 733

6711

+++++++++++++++++++++++++++++

6712

libempathy/empathy-presence-manager.h | 74 +++

6713

libempathy/empathy-utils.c | 10 +-

6714

src/empathy-chat.c | 8 +-

6715

src/empathy-event-manager.c | 10 +-

6716

src/empathy-main-window.c | 1 -

6717

src/empathy.c | 26 +-

6718

13 files changed, 854 insertions(+), 852 deletions(-)

6719

6720

commit 1570d9b4827b5e24540960564bb1c487d3f062ae

6721

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

6722

Date: Tue Jan 25 10:04:38 2011 +0100

6723

6724

empathy-chat: disable file transfer for now

6725

6726

It's broken so better disabling it than crashing (#637322).

6727

6728

libempathy-gtk/empathy-chat.c | 1 -

6729

1 files changed, 0 insertions(+), 1 deletions(-)

6730

6731

commit cfaa4c875c382545b06162854c286d1b5b3f0497

6732

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

6733

Date: Tue Jan 25 10:03:33 2011 +0100

6734

6735

add EMPATHY_CONTACT_FEATURE_FT

6736

6737

libempathy-gtk/empathy-chat.c | 1 +

6738

libempathy-gtk/empathy-contact-menu.c | 8 +++++---

6739

libempathy-gtk/empathy-contact-menu.h | 3 ++-

6740

src/empathy-map-view.c | 1 +

6741

4 files changed, 9 insertions(+), 4 deletions(-)

6742

6743

commit 8b4a09ed7450b0b3d806d0996d174f911e4c3352

6744

Author: Diego Escalante Urrelo <descalante@igalia.com>

6745

Date: Sat Jan 22 17:44:55 2011 -0500

6746

6747

main-window: use line-wrap for "no match" label

6748

6749

On narrow contact lists, the ellipsizing makes the "No match" message

6750

disappear, users are forced to resize the window to know what's

6751

hidden beyond

6752

the ….

6753

6754

Wrapping takes advantage of all the vertical space available.

6755

6756

Bug #640295

6757

6758

src/empathy-main-window.c | 4 ++--

6759

1 files changed, 2 insertions(+), 2 deletions(-)

6760

6761

commit e64970236bda77f049d23c890a590bdab8414705

6762

Author: Inaki Larranaga Murgoitio <dooteo@zundan.com>

6763

Date: Mon Jan 24 18:38:54 2011 +0100

6764

6765

Updated Basque language

6766

6767

po/eu.po | 208

6768

++++++++++++++++++++++++++------------------------------------

6769

1 files changed, 88 insertions(+), 120 deletions(-)

6770

6771

commit a95eadd6866a511e5a8e2574156bf767a4361918

6772

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

6773

Date: Mon Jan 24 16:44:00 2011 +0100

6774

6775

use action_camera_on when using the camera action items

6776

6777

We just need one item of the action group to interact with the whole

6778

group, so

6779

best to use the one we already have.

6780

6781

src/empathy-call-window.c | 14 ++++++--------

6782

1 files changed, 6 insertions(+), 8 deletions(-)

6783

6784

commit f18f2746690b0ceae80c3b362529decc112ca77f

6785

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

6786

Date: Mon Jan 24 16:41:11 2011 +0100

6787

6788

call-window: sync the sensitivity of the button and "send video"

6789

menu (#637839)

6790

6791

src/empathy-call-window.c | 5 +++++

6792

src/empathy-call-window.ui | 1 +

6793

2 files changed, 6 insertions(+), 0 deletions(-)

6794

6795

commit 1cb2462f5793d99ad42decfbcc34bc22474ccbdc

6796

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

6797

Date: Mon Jan 24 16:32:55 2011 +0100

6798

6799

call-window: remove unused priv->action_camera_preview

6800

6801

src/empathy-call-window.c | 2 --

6802

1 files changed, 0 insertions(+), 2 deletions(-)

6803

6804

commit 6924c640f01c5ca55d1001ddc5c44a46d7baf948

6805

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

6806

Date: Wed Jan 12 13:09:28 2011 +0100

6807

6808

chat-window: don't play sound for pending messages (#639302)

6809

6810

They have already be notified by the Approver.

6811

6812

src/empathy-chat-window.c | 11 ++++++-----

6813

1 files changed, 6 insertions(+), 5 deletions(-)

6814

6815

commit f8d4856794d8bf6ba951586fe2e196a00743c764

6816

Merge: ce51e07 aade7b7

6817

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

6818

Date: Mon Jan 24 15:35:50 2011 +0100

6819

6820

Merge remote branch 'glassrose/remove-typing-icon-in-muc-tabs-609420'

6821

6822

commit aade7b7e2006666d2af51016e1090bce5855edaf

6823

Author: Chandni Verma <chandniverma2112@gmail.com>

6824

Date: Mon Jan 24 19:41:43 2011 +0530

6825

6826

Do not display typing icon in MUC tabs

6827

6828

Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=609420

6829

6830

src/empathy-chat-window.c | 4 ++--

6831

1 files changed, 2 insertions(+), 2 deletions(-)

6832

6833

commit ce51e074a4b2bf286980cad803239bd5e96e749b

6834

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

6835

Date: Mon Jan 24 13:39:15 2011 +0100

6836

6837

account-widget-yahoo: remove server field (#634853)

6838

6839

libempathy-gtk/empathy-account-widget-yahoo.ui | 36

6840

++---------------------

6841

libempathy-gtk/empathy-account-widget.c | 1 -

6842

2 files changed, 4 insertions(+), 33 deletions(-)

6843

6844

commit c06e987f5bccc63f2cf54567850d36f59a51a5f6

6845

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

6846

Date: Mon Jan 24 14:11:01 2011 +0100

6847

6848

account-dialog: keep a proper weak ref on setting_widget_object

6849

6850

This prevent us of trying to use it after it has been disposed. For

6851

example,

6852

when switching to an Haze account, we have to wait that the

6853

EmpathyAccountSettings is ready before getting the new

6854

setting_widget_object

6855

but we can't try using the old one while waiting (#640411).

6856

6857

src/empathy-accounts-dialog.c | 19 ++++++++++++++++---

6858

1 files changed, 16 insertions(+), 3 deletions(-)

6859

6860

commit 760fc904f7b1cb1df34bcee3cfbb57291ccc811c

6861

Author: Vitaly Minko <vitaly.minko@gmail.com>

6862

Date: Tue Nov 2 21:51:28 2010 +0300

6863

6864

Add calendar to the contact widget in order to simplify birthday

6865

selection (#631101).

6866

6867

libempathy-gtk/empathy-contact-widget.c | 72

6868

+++++++++++++++++++++++++++----

6869

1 files changed, 63 insertions(+), 9 deletions(-)

6870

6871

commit 97b44882aafe0b900433cce84b72eea2d542e875

6872

Author: Mario Blättermann <mariobl@gnome.org>

6873

Date: Fri Jan 21 10:14:30 2011 +0100

6874

6875

[l10n] Updated German translation

6876

6877

po/de.po | 1372

6878

++++++++++++++++++++++++++++++++++----------------------------

6879

1 files changed, 755 insertions(+), 617 deletions(-)

6880

6881

commit e7500dd3bb047233c7a66523f16330e9279ee9ce

6882

Author: Inaki Larranaga Murgoitio <dooteo@zundan.com>

6883

Date: Thu Jan 20 23:58:26 2011 +0100

6884

6885

Updated Basque language

6886

6887

po/eu.po | 1536

6888

++++++++++++++++++++++++++++++++++----------------------------

6889

1 files changed, 838 insertions(+), 698 deletions(-)

6890

6891

commit 1c78ba6bdffcf3ad90ac7c634b2ac62c2a275f92

6892

Author: Yuri Myasoedov <omerta13@yandex.ru>

6893

Date: Thu Jan 20 23:27:41 2011 +0300

6894

6895

Updated Russian translation

6896

6897

po/ru.po | 1442

6898

++++++++++++++++++++++++++++++++++----------------------------

6899

1 files changed, 790 insertions(+), 652 deletions(-)

6900

6901

commit 73215d93ed358d8aa257efb9822dafe9f82e0f3e

6902

Author: Marek Černocký <marek@manet.cz>

6903

Date: Wed Jan 19 20:28:58 2011 +0100

6904

6905

Updated Czech translation

6906

6907

po/cs.po | 1383

6908

+++++++++++++++++++++++++++++++++-----------------------------

6909

1 files changed, 746 insertions(+), 637 deletions(-)

6910

6911

commit dbb95ed92ec1acc6d6bbf7b4a1dbcaf931070e4f

6912

Merge: 8eb3671 1acf899

6913

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

6914

Date: Tue Jan 18 16:12:40 2011 +0100

6915

6916

Merge remote branch

6917

'glassrose/Display-typing-icon-in-muc-contacts-list-609419'

6918

6919

commit 8eb3671bdebf2b31323d8ad26a0e89f9907cb828

6920

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

6921

Date: Tue Jan 18 16:09:53 2011 +0100

6922

6923

remove released flag

6924

6925

configure.ac | 2 +-

6926

1 files changed, 1 insertions(+), 1 deletions(-)

6927

6928

commit 5685283601ab2b184797c569eaa1bf3c49ad1812

6929

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

6930

Date: Tue Jan 18 15:45:59 2011 +0100

6931

6932

prepare 2.91.5.1

6933

6934

NEWS | 18 ++++++++++++++++++

6935

configure.ac | 4 ++--

6936

2 files changed, 20 insertions(+), 2 deletions(-)

6937

6938

commit 1acf8998707505a367ef27e04730907b56408b3d

6939

Author: Chandni Verma <chandniverma2112@gmail.com>

6940

Date: Sun Jan 16 20:19:49 2011 +0530

6941

6942

Display typing icon in MUC contact-list

6943

6944

Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=609419

6945

6946

libempathy-gtk/empathy-contact-list-store.c | 60

6947

++++++++++++++++++++++++++-

6948

libempathy/empathy-tp-chat.c | 9 ++++

6949

libempathy/empathy-tp-chat.h | 3 +

6950

src/empathy-chat-manager.c | 4 +-

6951

4 files changed, 74 insertions(+), 2 deletions(-)

6952

6953

commit e09aaef167833f45492fa2df70f7d4563a5d9b66

3686

6954

Author: Jonny Lamb <jonnylamb@gnome.org>

3687

6955

Date: Tue Jan 18 07:20:38 2011 +0000

3688

6956

3693

6961

data/Empathy.Auth.client | 4 ++--

3694

6962

1 files changed, 2 insertions(+), 2 deletions(-)

3695

6963

3696

commit 7533ed40284fe574e0752b12a723b4af99c8ff3d

6964

commit 59a145f0076fd39b5ff624e936dbe3d4dbc49d5b

6965

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

6966

Date: Fri Jan 14 09:53:04 2011 +0100

6967

6968

Improve connected/disconnected notifications (#639352)

6969

6970

src/empathy-event-manager.c | 14 ++++++++------

6971

1 files changed, 8 insertions(+), 6 deletions(-)

6972

6973

commit 8f96f1f11ae5f8407127d5438e75c67426ec6368

6974

Author: Andrej Žnidaršič <andrej.znidarsic@gmail.com>

6975

Date: Thu Jan 13 20:40:52 2011 +0100

6976

6977

Updated Slovenian translation

6978

6979

po/sl.po | 6 +++---

6980

1 files changed, 3 insertions(+), 3 deletions(-)

6981

6982

commit 03bb22ef948638473e71839d149101e63c926d96

6983

Author: Michael Kotsarinis <mk73628@gmail.com>

6984

Date: Thu Jan 13 12:34:54 2011 +0200

6985

6986

Updated Greek translation

6987

6988

po/el.po | 1384

6989

++++++++++++++++++++++++++++++++++----------------------------

6990

1 files changed, 760 insertions(+), 624 deletions(-)

6991

6992

commit 876df65bb9a150cffcd67f22ade017d3dd7fcb6a

6993

Author: Chandni Verma <chandniverma2112@gmail.com>

6994

Date: Wed Jan 12 16:58:27 2011 +0530

6995

6996

Chat command nick modified to use RequestRename instead of SetAliases

6997

6998

libempathy-gtk/empathy-chat.c | 26 +++++++++++++++-----------

6999

1 files changed, 15 insertions(+), 11 deletions(-)

7000

7001

commit 3de1ceb50c21c2ccc34bf44cd2b6abec3853239b

7002

Author: Chandni Verma <chandniverma2112@gmail.com>

7003

Date: Wed Jan 12 14:31:34 2011 +0530

7004

7005

Allow /nick command only in chatrooms that support nick renaming

7006

7007

Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=638766

7008

7009

libempathy-gtk/empathy-chat.c | 57

7010

+++++++++++++++++++++++++++++++----------

7011

1 files changed, 43 insertions(+), 14 deletions(-)

7012

7013

commit dc2525a1840bd029dd79709cdbe0de3a3cad7d37

7014

Author: Chandni Verma <chandniverma2112@gmail.com>

7015

Date: Thu Jan 6 01:44:23 2011 +0530

7016

7017

Added Connection.Interface.Renaming to /extensions

7018

7019

extensions/Connection_Interface_Renaming.xml | 98

7020

++++++++++++++++++++++++++

7021

extensions/Makefile.am | 1 +

7022

extensions/misc.xml | 1 +

7023

3 files changed, 100 insertions(+), 0 deletions(-)

7024

7025

commit 4a8f54fdba23d9addb4d6c014423bc3f2619aafd

7026

Author: Gabor Kelemen <kelemeng@gnome.hu>

7027

Date: Wed Jan 12 12:59:45 2011 +0100

7028

7029

Updated Hungarian translation

7030

7031

po/hu.po | 1373

7032

+++++++++++++++++++++++++++++++++-----------------------------

7033

1 files changed, 739 insertions(+), 634 deletions(-)

7034

7035

commit 81a3d8288500cd4a2fd94cf562e6aaf9f5e031e0

7036

Author: Kjartan Maraas <kmaraas@gnome.org>

7037

Date: Wed Jan 12 11:31:54 2011 +0100

7038

7039

Updated Norwegian bokmål translation

7040

7041

po/nb.po | 113

7042

++++++++++++++++++++++++++++++-------------------------------

7043

1 files changed, 56 insertions(+), 57 deletions(-)

7044

7045

commit 983bdf7866b88fd9585197671d99a748a8683055

7046

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

7047

Date: Tue Jan 11 15:33:30 2011 +0100

7048

7049

account-chooser: setup the combobox once the object has been

7050

constructed (#639214)

7051

7052

See bgo #639139 for details, but basically that's because the

7053

cell_area is now

7054

created in a constructor instead of an init function.

7055

7056

libempathy-gtk/empathy-account-chooser.c | 10 +++++++++-

7057

1 files changed, 9 insertions(+), 1 deletions(-)

7058

7059

commit c4a806bea01fcb3862ab43e88eede77fca1ce7e0

7060

Author: Kushal Das <kushal@fedoraproject.org>

7061

Date: Tue Jan 11 17:49:18 2011 +0530

7062

7063

Pressing F2 opens the Edit Contact Information window for #586257

7064

7065

libempathy-gtk/empathy-individual-view.c | 23 ++++++++++++++++++++++-

7066

1 files changed, 22 insertions(+), 1 deletions(-)

7067

7068

commit 2392932b2eed456f7d5b39d0a9eb839194dfb0e1

7069

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

7070

Date: Mon Jan 10 17:12:47 2011 +0000

7071

7072

Don't use deprecated gdk_app_launch_context_new()

7073

7074

libempathy-gtk/empathy-account-widget.c | 6 +++---

7075

src/empathy-accounts-dialog.c | 5 +++--

7076

src/empathy-main-window.c | 8 +++-----

7077

3 files changed, 9 insertions(+), 10 deletions(-)

7078

7079

commit 41274d6973eef4628c1a1e26c281b703ecf8f980

7080

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

7081

Date: Mon Jan 10 16:38:16 2011 +0000

7082

7083

Connect to style-updated signal

7084

7085

... instead of to the deprecated style-set one.

7086

7087

src/empathy-chat-window.c | 9 ++++-----

7088

1 files changed, 4 insertions(+), 5 deletions(-)

7089

7090

commit 4dab5e45e10c4aa8d305a7cc5be62cee243f029b

7091

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

7092

Date: Mon Jan 10 16:23:25 2011 +0000

7093

7094

Don't use deprecated gtk_widget_get_style()

7095

7096

src/empathy-chat-window.c | 6 +++++-

7097

1 files changed, 5 insertions(+), 1 deletions(-)

7098

7099

commit 05047bfdd596bf6010d09f9409ff13a74190ed4c

7100

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

7101

Date: Mon Jan 10 15:03:44 2011 +0000

7102

7103

Don't use deprecated gdk_keyboard_grab/ungrab

7104

7105

libempathy-gtk/empathy-password-dialog.c | 35

7106

+++++++++++++++++++++++------

7107

1 files changed, 27 insertions(+), 8 deletions(-)

7108

7109

commit 0ffc53acc1c6993100c08e85180a10daf817556b

7110

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

7111

Date: Mon Jan 10 12:27:00 2011 +0000

7112

7113

Port to GtkStyleContext

7114

7115

configure.ac | 2 +-

7116

libempathy-gtk/empathy-cell-renderer-text.c | 18 ++++++++++++------

7117

2 files changed, 13 insertions(+), 7 deletions(-)

7118

7119

commit d7ef6ba2bb7daf43b5b05a25f314618a50710832

7120

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

7121

Date: Mon Jan 10 11:32:44 2011 +0000

7122

7123

Don't use deprecated gtk_paint_expander()

7124

7125

libempathy-gtk/empathy-cell-renderer-expander.c | 14 ++++++--------

7126

1 files changed, 6 insertions(+), 8 deletions(-)

7127

7128

commit 9b16b39e05f3f9428605d93f0e1e277660442117

7129

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

7130

Date: Mon Jan 10 18:57:14 2011 +0100

7131

7132

remove released flag

7133

7134

configure.ac | 2 +-

7135

1 files changed, 1 insertions(+), 1 deletions(-)

7136

7137

commit 8103d9d64d3fa440921ae58f05d9c42aed0fc5ee

7138

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

7139

Date: Mon Jan 10 15:57:13 2011 +0100

7140

7141

prepare 2.91.5

7142

7143

NEWS | 23 +++++++++++++++++++++++

7144

configure.ac | 4 ++--

7145

2 files changed, 25 insertions(+), 2 deletions(-)

7146

7147

commit 4fb31c94452dfb42dc7a83ee3f864daabbe60f48

7148

Author: Kushal Das <kushal@fedoraproject.org>

7149

Date: Mon Jan 10 18:46:06 2011 +0530

7150

7151

Patch to transfer window to allow opening file with double clicks

7152

for #637195

7153

7154

src/empathy-ft-manager.c | 34 +++++++++++++++++++++++++++-------

7155

1 files changed, 27 insertions(+), 7 deletions(-)

7156

7157

commit 363c9bdf35a11cde6ba7a0da3bc2cb7fcdb7a1b6

7158

Merge: d5f5cfa 98b73f3

7159

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

7160

Date: Mon Jan 10 11:02:02 2011 +0100

7161

7162

Merge remote branch

7163

'glassrose/accounts-supporting-chatrooms-only-603027'

7164

7165

commit d5f5cfab4704fad9fad29a1e69a230645f0a4aa5

7166

Author: Fran Diéguez <fran.dieguez@mabishu.com>

7167

Date: Sun Jan 9 00:34:19 2011 +0100

7168

7169

Updated Galician translations

7170

7171

po/gl.po | 400

7172

++++++++++++++++++++++++++++++++++----------------------------

7173

1 files changed, 220 insertions(+), 180 deletions(-)

7174

7175

commit 98b73f3620f3b2f94e7d2ce3cfd2cd07cc637d13

7176

Author: Chandni Verma <chandniverma2112@gmail.com>

7177

Date: Mon Jan 3 21:25:43 2011 +0530

7178

7179

Skip accounts which don't support rooms in "Manage Favorites" dialog

7180

7181

Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=603027

7182

7183

libempathy-gtk/empathy-account-chooser.c | 71

7184

++++++++++++++++++++++++++++++

7185

libempathy-gtk/empathy-account-chooser.h | 4 ++

7186

src/empathy-chatrooms-window.c | 2 +-

7187

src/empathy-new-chatroom-dialog.c | 71

7188

+-----------------------------

7189

4 files changed, 77 insertions(+), 71 deletions(-)

7190

7191

commit 9e70e42316ad1970c4508404baa86c69c81575b0

7192

Author: Kjartan Maraas <kmaraas@gnome.org>

7193

Date: Sun Jan 2 18:32:26 2011 +0100

7194

7195

Updated Norwegian bokmål translation from Torstein Adolf Winterseth

7196

7197

po/nb.po | 156

7198

++++++++++++++++++++++++++++++++++---------------------------

7199

1 files changed, 87 insertions(+), 69 deletions(-)

7200

7201

commit 4c19864b900fb571ce6db077812d3422a23df5db

7202

Author: Mattias Põldaru <mahfiaz gmail com>

7203

Date: Fri Dec 31 10:52:51 2010 +0200

7204

7205

[l10n] Updated Estonian translation

7206

7207

po/et.po | 11 +++++++++--

7208

1 files changed, 9 insertions(+), 2 deletions(-)

7209

7210

commit aa3df0b40d88a51f972f1c635b01402ad56a7946

7211

Author: Daniel Nylander <po@danielnylander.se>

7212

Date: Wed Dec 29 18:18:19 2010 +0100

7213

7214

Updated Swedish translation

7215

7216

po/sv.po | 1504

7217

+++++++++++++++++++++++++++++++++-----------------------------

7218

1 files changed, 810 insertions(+), 694 deletions(-)

7219

7220

commit 2404d3b7b273d4af4af02b3c0515421d31962046

7221

Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

7222

Date: Sun Dec 26 19:29:59 2010 +0100

7223

7224

Remove the chats_new_msg list from EmpathyChatWindow

7225

7226

src/empathy-chat-window.c | 26 +++++++++-----------------

7227

1 files changed, 9 insertions(+), 17 deletions(-)

7228

7229

commit d471250122f68adba8625fbc719614f927fa4103

7230

Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

7231

Date: Sun Dec 26 19:22:04 2010 +0100

7232

7233

Remove the composing list

7234

7235

libempathy-gtk/empathy-chat.c | 7 +++++++

7236

libempathy-gtk/empathy-chat.h | 2 ++

7237

src/empathy-chat-window.c | 17 ++---------------

7238

3 files changed, 11 insertions(+), 15 deletions(-)

7239

7240

commit f49b34ee571c0894ab4e85af27479c288b0560c1

7241

Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

7242

Date: Sun Dec 26 14:50:11 2010 +0100

7243

7244

Highlight both the tab and the menu label

7245

7246

src/empathy-chat-window.c | 8 ++++++--

7247

1 files changed, 6 insertions(+), 2 deletions(-)

7248

7249

commit 048bf784409bd5c40705e4169793b0951c709264

7250

Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

7251

Date: Mon Dec 27 14:55:56 2010 +0100

7252

7253

Fix lines > 80 chars

7254

7255

src/empathy-accounts-dialog.c | 6 ++++--

7256

1 files changed, 4 insertions(+), 2 deletions(-)

7257

7258

commit fff4889260ab902aeb409273e41c6f4c5078310c

7259

Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

7260

Date: Mon Dec 27 14:55:19 2010 +0100

7261

7262

Prevent potential freeing of unitialized data

7263

7264

src/empathy-accounts-dialog.c | 8 ++++----

7265

1 files changed, 4 insertions(+), 4 deletions(-)

7266

7267

commit 53a5a7f37188ffaf3e050c5ad2e0852095a85c4b

7268

Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

7269

Date: Sat Dec 25 20:47:24 2010 +0100

7270

7271

Simplify filter adding code by just using gdk_x11 functions instead

7272

of hoops

7273

7274

libempathy-gtk/empathy-avatar-image.c | 18 ++++++++----------

7275

1 files changed, 8 insertions(+), 10 deletions(-)

7276

7277

commit bfb7a859f932c540c4695ba5489ab135506e8494

7278

Author: David Laban <david.laban@collabora.co.uk>

7279

Date: Mon Dec 20 15:46:36 2010 +0000

7280

7281

Also turn off Access Unit Delimiters (aud)

7282

7283

AUDs are *completely* pointless in RTP and just waste packets/confuse

7284

people.

7285

7286

data/element-properties | 1 +

7287

1 files changed, 1 insertions(+), 0 deletions(-)

7288

7289

commit a8bbe125863cee9c8a857562f99899f800e96cdf

7290

Author: A S Alam <aalam@users.sf.net>

7291

Date: Wed Dec 29 07:36:25 2010 +0530

7292

7293

update Punjabi Translation

7294

7295

po/pa.po | 684

7296

++++++++++++++++++++++++++++++++++----------------------------

7297

1 files changed, 374 insertions(+), 310 deletions(-)

7298

7299

commit 92ca9d1a3c9fbe40b9f2d22d7377075e23cbecab

7300

Author: Matej Urbančič <mateju@svn.gnome.org>

7301

Date: Tue Dec 28 23:30:37 2010 +0100

7302

7303

Updated Slovenian translation

7304

7305

po/sl.po | 396

7306

++++++++++++++++++++++++++++++++++----------------------------

7307

1 files changed, 217 insertions(+), 179 deletions(-)

7308

7309

commit c6b58a76e119e7c5a9b57f5e216e72c000268165

7310

Author: Yaron Shahrabani <sh.yaron@gmail.com>

7311

Date: Sun Dec 26 19:55:05 2010 +0200

7312

7313

Updated Hebrew translation.

7314

7315

po/he.po | 69

7316

+++++++++++++++++++++++++++++++++++---------------------------

7317

1 files changed, 39 insertions(+), 30 deletions(-)

7318

7319

commit 3becee6fc229553a28149c9ebde7b14a775d6850

7320

Author: Daniel Mustieles <daniel.mustieles@gmail.com>

7321

Date: Fri Dec 24 18:15:01 2010 +0100

7322

7323

Updated Spanish translation

7324

7325

po/es.po | 79

7326

+++++++++++++++++++++++++++++++++----------------------------

7327

1 files changed, 43 insertions(+), 36 deletions(-)

7328

7329

commit 72a3058937bee67024b9bf87ff50f73409109c63

7330

Author: Stef Walter <stefw@collabora.co.uk>

7331

Date: Fri Dec 24 09:32:35 2010 -0600

7332

7333

libempathy: Fix free of uninitialized variables.

7334

7335

When a pinned certificate is present, these don't get initialized.

7336

7337

libempathy/empathy-tls-verifier.c | 3 +++

7338

1 files changed, 3 insertions(+), 0 deletions(-)

7339

7340

commit 36c700d49ac25f40e7ce47784fdf199c17ae8261

7341

Author: Stef Walter <stefw@collabora.co.uk>

7342

Date: Mon Dec 13 20:34:56 2010 +0000

7343

7344

libempathy: Store pinned certificate for end entity cert in the chain.

7345

7346

https://bugzilla.gnome.org/show_bug.cgi?id=636258

7347

7348

libempathy/empathy-tls-verifier.c | 27 +++++++++++++++++++++------

7349

1 files changed, 21 insertions(+), 6 deletions(-)

7350

7351

commit 00da7eadfe0ed7c4d080cc1ee076302c37ec0f7b

7352

Author: Stef Walter <stefw@collabora.co.uk>

7353

Date: Mon Dec 13 20:25:38 2010 +0000

7354

7355

tests: Fix memory leak of dbus connection

7356

7357

https://bugzilla.gnome.org/show_bug.cgi?id=636258#c3

7358

7359

tests/empathy-tls-test.c | 3 +++

7360

1 files changed, 3 insertions(+), 0 deletions(-)

7361

7362

commit f1bc5efbef341a2af2ebf0f9fc3f687503fe7e07

7363

Author: Stef Walter <stefw@collabora.co.uk>

7364

Date: Mon Dec 13 20:25:08 2010 +0000

7365

7366

libempathy: Fix memory leaks and use consistent naming for various

7367

arrays.

7368

7369

https://bugzilla.gnome.org/show_bug.cgi?id=636258#c3

7370

7371

libempathy/empathy-tls-verifier.c | 31 ++++++++++++++++---------------

7372

1 files changed, 16 insertions(+), 15 deletions(-)

7373

7374

commit de7d7bf967502778c927d80121e4aaf0a52a7461

7375

Author: Stef Walter <stefw@collabora.co.uk>

7376

Date: Mon Dec 13 17:46:03 2010 +0000

7377

7378

libempathy: Fix leak of certificate data.

7379

7380

https://bugzilla.gnome.org/show_bug.cgi?id=636258#c3

7381

7382

libempathy/empathy-tls-verifier.c | 1 +

7383

1 files changed, 1 insertions(+), 0 deletions(-)

7384

7385

commit 14baa8d05d72d94431b3422bf455835bd065707e

7386

Author: Stef Walter <stefw@collabora.co.uk>

7387

Date: Mon Dec 13 17:42:15 2010 +0000

7388

7389

libempathy, tests: Wrap new function arguments properly.

7390

7391

https://bugzilla.gnome.org/show_bug.cgi?id=636258#c3

7392

7393

libempathy/empathy-tls-verifier.c | 16 +++++++++++-----

7394

tests/empathy-tls-test.c | 35

7395

++++++++++++++++++++++++-----------

7396

2 files changed, 35 insertions(+), 16 deletions(-)

7397

7398

commit c9562e1613eac9ded3a3e211dbd2e5420a46602b

7399

Author: Stef Walter <stefw@collabora.co.uk>

7400

Date: Sat Dec 11 03:31:01 2010 +0000

7401

7402

tests: Lookup the pkcs11 standalone directory at run time.

7403

7404

Rather than cluttering up configure, lookup the relevant

7405

directory at runtime.

7406

7407

configure.ac | 6 ------

7408

tests/Makefile.am | 1 -

7409

tests/empathy-tls-test.c | 21 ++++++++++++++++++++-

7410

3 files changed, 20 insertions(+), 8 deletions(-)

7411

7412

commit e694852b60dd75c8fe25d167672ca647006a5e8d

7413

Author: Stef Walter <stefw@collabora.co.uk>

7414

Date: Sat Dec 11 03:16:16 2010 +0000

7415

7416

libempathy: Match changes in libgcr terminology and debug output.

7417

7418

Add debug output for certificate chain, and fix up for some changes

7419

in libgcr terminology.

7420

7421

libempathy/empathy-tls-verifier.c | 31 +++++++++++++++++++++++++++++--

7422

1 files changed, 29 insertions(+), 2 deletions(-)

7423

7424

commit ad51bca6104dc154fd1fdc3b177f160c8f05cd34

7425

Author: Stef Walter <stefw@collabora.co.uk>

7426

Date: Fri Dec 10 23:04:52 2010 +0000

7427

7428

libempathy: Use new certificate chain facilities in libgcr

7429

7430

Build the chain with new GcrCertificateChain and then use gnutls

7431

to verify it.

7432

7433

libempathy/empathy-tls-verifier.c | 291

7434

+++++++++++++------------------------

7435

1 files changed, 103 insertions(+), 188 deletions(-)

7436

7437

commit 02798920bfc26c86f0b4fb356f5635c3a20f203c

7438

Author: Stef Walter <stefw@collabora.co.uk>

7439

Date: Fri Dec 10 04:25:13 2010 +0000

7440

7441

test: Add tests which load PKCS#11 modules for TLS verification.

7442

7443

Add various tests which load gnome-keyring PKCS#11 modules and

7444

use them in the TLS verification. These are the standalone

7445

versions of the builtin gnome-keyring PKCS#11 modules.

7446

7447

configure.ac | 6 +

7448

tests/Makefile.am | 2 +

7449

tests/certificates/collabora-ca/collabora-ca.cer | Bin 0 -> 1536 bytes

7450

tests/empathy-tls-test.c | 279

7451

++++++++++++++++++----

7452

4 files changed, 242 insertions(+), 45 deletions(-)

7453

7454

commit eb0e10eba858ed194ec5a6bb63670ed80245a76b

7455

Author: Stef Walter <stefw@collabora.co.uk>

7456

Date: Fri Dec 10 03:48:13 2010 +0000

7457

7458

libempathy: Complete successful verification properly.

7459

7460

Complete TLS verification properly in TLS verifier.

7461

7462

libempathy/empathy-tls-verifier.c | 1 +

7463

1 files changed, 1 insertions(+), 0 deletions(-)

7464

7465

commit 430516c8f22e26821a22868621e59ec201d6a805

7466

Author: Stef Walter <stefw@collabora.co.uk>

7467

Date: Thu Dec 9 22:14:38 2010 +0000

7468

7469

tests: Add test for basic verification.

7470

7471

This test depends on the certificates you have in gnome-keyring,

7472

will fix this dependency in later commits.

7473

7474

tests/empathy-tls-test.c | 60

7475

++++++++++++++++++++++++++++++++++++----------

7476

1 files changed, 47 insertions(+), 13 deletions(-)

7477

7478

commit d6cacab44d2c134688c79be7d62ab4307ce7f527

7479

Author: Stef Walter <stefw@collabora.co.uk>

7480

Date: Thu Dec 9 22:14:19 2010 +0000

7481

7482

libempathy: Fix reference counting of certs in verifier.

7483

7484

libempathy/empathy-tls-verifier.c | 6 ++++--

7485

1 files changed, 4 insertions(+), 2 deletions(-)

7486

7487

commit 34934197b7a1fb237c810c6de1aa498b4abbbc53

7488

Author: Stef Walter <stefw@collabora.co.uk>

7489

Date: Thu Dec 9 21:51:28 2010 +0000

7490

7491

tests: Add mock object and test infrastructure for testing tls.

7492

7493

Create a mock o.f.T.Authentication.TLSCertificate object and connect

7494

to it in various tests.

7495

7496

Loads certificate data from certificates/ subdir

7497

7498

tests/.gitignore | 1 +

7499

tests/Makefile.am | 6 +-

7500

tests/certificates/dhansak-collabora.cer | Bin 0 -> 1200 bytes

7501

tests/empathy-tls-test.c | 356

7502

++++++++++++++++++++++++++++++

7503

4 files changed, 362 insertions(+), 1 deletions(-)

7504

7505

commit 636f502149f77a80ef1b79cfc6d2da4b20c6ec7c

7506

Author: Stef Walter <stefw@collabora.co.uk>

7507

Date: Mon Dec 6 22:47:13 2010 +0000

7508

7509

libempathy: Use new gcr functions properly and fix build.

7510

7511

libgcr now uses single header include model.

7512

7513

libempathy/empathy-tls-verifier.c | 16 ++++++++++++----

7514

1 files changed, 12 insertions(+), 4 deletions(-)

7515

7516

commit 59384754d15dc9340466dbb69ad615ffc76ffb6a

7517

Author: Stef Walter <stefw@collabora.co.uk>

7518

Date: Thu Dec 2 19:55:54 2010 +0000

7519

7520

libempathy: Load complete certificate chain even when not sent.

7521

7522

Even when a complete certificate chain is not sent by the remote

7523

host, we can load a complete certificate chain based on the local

7524

certificates.

7525

7526

libempathy/empathy-tls-verifier.c | 186

7527

++++++++++++++++++++++++++-----------

7528

1 files changed, 133 insertions(+), 53 deletions(-)

7529

7530

commit edc69d9089b2d49570fa0644a4ef4f223c64550e

7531

Author: Stef Walter <stefw@collabora.co.uk>

7532

Date: Thu Dec 2 18:10:14 2010 +0000

7533

7534

configure: Remove option to specify system certificates.

7535

7536

These are now handled by gnome-keyring through libgcr.

7537

7538

configure.ac | 33 ---------------------------------

7539

1 files changed, 0 insertions(+), 33 deletions(-)

7540

7541

commit 8d72b18028c35d887c2352e3f08aacd9b7096f4c

7542

Author: Stef Walter <stefw@collabora.co.uk>

7543

Date: Thu Dec 2 18:08:51 2010 +0000

7544

7545

libempathy: Store certificate exceptions in gnome-keyring.

7546

7547

Use libgcr to store certificate trust exceptions properly.

7548

7549

libempathy/empathy-tls-certificate.c | 127

7550

----------------------------------

7551

libempathy/empathy-tls-certificate.h | 2 -

7552

libempathy/empathy-tls-verifier.c | 21 ++++++

7553

libempathy/empathy-tls-verifier.h | 2 +

7554

src/empathy-auth-client.c | 14 +++-

7555

5 files changed, 33 insertions(+), 133 deletions(-)

7556

7557

commit c55c9a4dd8848f7257794dc9fc8f8138f1b47f43

7558

Author: Stef Walter <stefw@collabora.co.uk>

7559

Date: Thu Dec 2 17:46:47 2010 +0000

7560

7561

libempathy: Use trust assertions instead of certificate directories.

7562

7563

Initial implementation.

7564

7565

libempathy/Makefile.am | 2 +

7566

libempathy/empathy-tls-verifier.c | 460

7567

++++++++++---------------------------

7568

src/Makefile.am | 1 +

7569

3 files changed, 125 insertions(+), 338 deletions(-)

7570

7571

commit 0b44641cdd6fec4abe8c8ee96d6bdbe84db944da

7572

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

7573

Date: Fri Dec 24 11:57:03 2010 +0100

7574

7575

prepare 2.91.4.3

7576

7577

NEWS | 16 ++++++++++++++++

7578

configure.ac | 4 ++--

7579

2 files changed, 18 insertions(+), 2 deletions(-)

7580

7581

commit 23cabd47964ba2d692018dbf8f8b2e87f208254b

7582

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

7583

Date: Fri Dec 24 11:51:24 2010 +0100

7584

7585

Depends on gcr 2.91.4

7586

7587

We need it as we don't ship our own version of gcr-simple-certificate

7588

any

7589

more. I'm not sure we still need depending on gnome-keyring itself,

7590

I'll check

7591

with Stef; but for now I just want to make a release usable by

7592

the release

7593

team.

7594

7595

configure.ac | 3 ++-

7596

1 files changed, 2 insertions(+), 1 deletions(-)

7597

7598

commit 8f4bd49edcf38951072b9f12ce50ba9aaddac83d

7599

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

7600

Date: Fri Dec 24 11:42:57 2010 +0100

7601

7602

just include gcr.h

7603

7604

libempathy-gtk/empathy-tls-dialog.c | 2 +-

7605

1 files changed, 1 insertions(+), 1 deletions(-)

7606

7607

commit 89ed5197c3cf61971b8425b176ce71073add7360

7608

Author: Stef Walter <stefw@collabora.co.uk>

7609

Date: Thu Dec 2 17:21:38 2010 +0000

7610

7611

libempathy-gtk: No need to 'egg' gcr-simple-certificate.[ch]

7612

7613

These are now properly distributed by libgcr.

7614

7615

libempathy-gtk/Makefile.am | 1 -

7616

libempathy-gtk/empathy-tls-dialog.c | 2 +-

7617

libempathy-gtk/gcr-simple-certificate.c | 134

7618

-------------------------------

7619

libempathy-gtk/gcr-simple-certificate.h | 61 --------------

7620

4 files changed, 1 insertions(+), 197 deletions(-)

7621

7622

commit dfc08c3feee35e194fdb58441752ea82f79c166a

7623

Merge: b55050d 083af6c

7624

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

7625

Date: Fri Dec 24 17:04:05 2010 +1100

7626

7627

Merge remote branch 'glassrose/enable-disable-accounts-popup-609568'

7628

7629

commit 083af6c8057407a6b7895020339d19a3eb7257c7

7630

Author: Chandni Verma <chandniverma2112@gmail.com>

7631

Date: Sat Dec 18 01:52:12 2010 +0530

7632

7633

Popup menu feature to quickly enable/disable an account.

7634

7635

Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=609568

7636

7637

src/empathy-accounts-dialog.c | 95

7638

+++++++++++++++++++++++++++++++++++++++++

7639

1 files changed, 95 insertions(+), 0 deletions(-)

7640

7641

commit b55050dbfb73d4f724d5b04fd4ddeff21e4f7685

7642

Author: Gheyret T.Kenji <gheyret@gmail.com>

7643

Date: Thu Dec 23 18:32:01 2010 +0100

7644

7645

Added UG translation

7646

7647

po/ug.po | 831

7648

+++++++++++++++++++++++++++++++++-----------------------------

7649

1 files changed, 439 insertions(+), 392 deletions(-)

7650

7651

commit 6d801f75006f2cf60c17f0f3abd0f3ba26638702

7652

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

7653

Date: Thu Dec 23 16:12:09 2010 +0100

7654

7655

remove released flag

7656

7657

configure.ac | 2 +-

7658

1 files changed, 1 insertions(+), 1 deletions(-)

7659

7660

commit 6d722a39df3e480da2d500e47d754e0f9262893a

7661

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

7662

Date: Thu Dec 23 16:01:51 2010 +0100

7663

7664

prepare 2.91.4.2

7665

7666

NEWS | 5 +++++

7667

configure.ac | 2 +-

7668

release.py | 1 +

7669

3 files changed, 7 insertions(+), 1 deletions(-)

7670

7671

commit bc624045f0a4f4b1182efb3c6ec63c0de5a67c13

7672

Merge: 307a2f3 c5a0441

7673

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

7674

Date: Thu Dec 23 15:59:14 2010 +0100

7675

7676

Merge branch 'release.py'

7677

7678

commit 307a2f30b5a426ef97d7f566d3970d48e9a9613d

7679

Author: Xavier Claessens <xclaesse@gmail.com>

7680

Date: Thu Dec 23 15:53:27 2010 +0100

7681

7682

Fix build warnings for uninitialized variables

7683

7684

libempathy-gtk/empathy-account-widget.c | 2 +-

7685

src/empathy-accounts-dialog.c | 2 +-

7686

src/empathy-main-window.c | 2 +-

7687

3 files changed, 3 insertions(+), 3 deletions(-)

7688

7689

commit c5a04417666fa66dcf5502dd1a9f39ed15db1227

7690

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

7691

Date: Thu Dec 23 15:43:36 2010 +0100

7692

7693

prepare 2.91.4.1

7694

7695

NEWS | 11 +++++++++++

7696

configure.ac | 4 ++--

7697

2 files changed, 13 insertions(+), 2 deletions(-)

7698

7699

commit fdcf1b26fd44a44c0dfe882f19ec2782cccd542c

7700

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

7701

Date: Thu Dec 23 14:17:14 2010 +0100

7702

7703

account-widget: use g_app_info_launch() instead of

7704

gdk_spawn_on_screen() (#637854)

7705

7706

libempathy-gtk/empathy-account-widget.c | 44

7707

+++++++++++++++++++++----------

7708

1 files changed, 30 insertions(+), 14 deletions(-)

7709

7710

commit 8cf5f1c4f4224bc8863ab498c4d89082db6ceb7b

7711

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

7712

Date: Thu Dec 23 13:36:50 2010 +0100

7713

7714

main-window: use g_app_info_launch() instead of gdk_spawn_on_screen()

7715

(#637854)

7716

7717

src/empathy-main-window.c | 23 ++++++++++++++++-------

7718

1 files changed, 16 insertions(+), 7 deletions(-)

7719

7720

commit a5c7ff32a6f9672ca78a4aca5a4dcf7554fc24f1

7721

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

7722

Date: Thu Dec 23 13:31:01 2010 +0100

7723

7724

accounts-dialog: use g_app_info_launch() instead of

7725

gdk_spawn_on_screen() (#637854)

7726

7727

src/empathy-accounts-dialog.c | 39

7728

+++++++++++++++++++++++++--------------

7729

1 files changed, 25 insertions(+), 14 deletions(-)

7730

7731

commit 23a647a3dcb0109aadcb9a3f40d788754cd48767

7732

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

7733

Date: Thu Dec 23 11:39:03 2010 +0100

7734

7735

gdk_xid_table_lookup has been deprecated (#637855)

7736

7737

libempathy-gtk/empathy-avatar-image.c | 3 ++-

7738

1 files changed, 2 insertions(+), 1 deletions(-)

7739

7740

commit 1968b5ac26a4e2dac0220cb3203def2854de095d

7741

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

7742

Date: Wed Dec 22 14:14:47 2010 +0100

7743

7744

Don't display any contact menu for muc chats

7745

7746

It's confusing to have it in muc, even if a contact is selected. And

7747

we can

7748

still interact with the contact by right clicking on it if needed.

7749

7750

libempathy-gtk/empathy-chat.c | 6 ------

7751

1 files changed, 0 insertions(+), 6 deletions(-)

7752

7753

commit 432d3afbd187bc771a7b5577f3abb64ff39c8693

7754

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

7755

Date: Wed Dec 22 14:12:49 2010 +0100

7756

7757

chat-window: unsensitive the Contact menu if there is no submenu

7758

(#637799)

7759

7760

src/empathy-chat-window.c | 10 ++++++++--

7761

1 files changed, 8 insertions(+), 2 deletions(-)

7762

7763

commit 555c78e00939cf1ce2a4f410e231b0271b654ed0

3697

7764

Author: Jonny Lamb <jonnylamb@gnome.org>

3698

7765

Date: Wed Dec 22 12:08:08 2010 +0000

3699

7766

3706

7773

+++++++++++++++++++++++---------

3707

7774

1 files changed, 30 insertions(+), 12 deletions(-)

3708

7775

3709

commit bd5957d475411222883d93a87dd228a2ce20b2a0

7776

commit e6172665de111c2b32d6f16679add6f581c66a02

3710

7777

Author: Jonny Lamb <jonnylamb@gnome.org>

3711

7778

Date: Wed Dec 22 11:58:38 2010 +0000

3712

7779

3717

7784

libempathy/empathy-account-settings.c | 8 +++-----

3718

7785

1 files changed, 3 insertions(+), 5 deletions(-)

3719

7786

3720

commit e5af6097c501be691a8a0da4642e9e410f13800d

7787

commit 9f3eabf31f324237fd99fca8762a04bc98cd7630

3721

7788

Author: Jonny Lamb <jonnylamb@gnome.org>

3722

7789

Date: Wed Dec 22 11:57:38 2010 +0000

3723

7790

3729

7796

libempathy/empathy-account-settings.c | 3 ++-

3730

7797

1 files changed, 2 insertions(+), 1 deletions(-)

3731

7798

3732

commit 7e595f80583090026e8263c188e67d205caaed3a

7799

commit ae173323b5bc489f03fda053584dbcfe212836a2

3733

7800

Author: Jonny Lamb <jonnylamb@gnome.org>

3734

7801

Date: Wed Dec 22 11:56:20 2010 +0000

3735

7802

3741

7808

++++++++++++++++++---------------

3742

7809

1 files changed, 54 insertions(+), 45 deletions(-)

3743

7810

3744

commit 5ae2a942731d421ffa1b7cd6b3e12ea3edea8d90

7811

commit f2e6bb42906ad6cd5e11ee61fab64d3d2e7e879a

3745

7812

Author: Jonny Lamb <jonnylamb@gnome.org>

3746

7813

Date: Wed Dec 22 11:49:47 2010 +0000

3747

7814

3753

7820

+++++++++++++++++++++++++++++++++

3754

7821

1 files changed, 47 insertions(+), 0 deletions(-)

3755

7822

3756

commit 5b105c40c45bcf8be7d1489d224b1e0f4babadf8

7823

commit 218a0c003b0528423164b1670daf33ec360acd20

7824

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

7825

Date: Tue Dec 21 11:15:59 2010 +0100

7826

7827

disable maintainer mode for now

7828

7829

configure.ac | 5 +++--

7830

1 files changed, 3 insertions(+), 2 deletions(-)

7831

7832

commit 940bae9cc720a0c2f0284b2a900926637a1f760c

7833

Author: Xavier Claessens <xclaesse@gmail.com>

7834

Date: Tue Dec 21 10:05:39 2010 +0100

7835

7836

Fix build warning

7837

7838

libempathy-gtk/empathy-contact-list-view.c | 4 ++--

7839

1 files changed, 2 insertions(+), 2 deletions(-)

7840

7841

commit 1a9c70712750f38e10520b37e9452d75a55a45e9

7842

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

7843

Date: Mon Dec 20 16:57:38 2010 +0100

7844

7845

remove released flag

7846

7847

configure.ac | 2 +-

7848

1 files changed, 1 insertions(+), 1 deletions(-)

7849

7850

commit e2637fcafa862b69129027d9d79374b4309abe47

7851

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

7852

Date: Mon Dec 20 16:42:17 2010 +0100

7853

7854

prepare 2.91.4 release

7855

7856

NEWS | 25 +++++++++++++++++++++++++

7857

configure.ac | 6 +++---

7858

2 files changed, 28 insertions(+), 3 deletions(-)

7859

7860

commit 385cc631f856d933724aa5c726dfd956fc28bed0

7861

Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

7862

Date: Mon Dec 20 15:22:30 2010 +0000

7863

7864

Turn off sliced-threads, some implementations have problems with

7865

decoding it

7866

7867

data/element-properties | 1 +

7868

1 files changed, 1 insertions(+), 0 deletions(-)

7869

7870

commit 0cefa514f4e3be2572576acc017219991328ec61

7871

Author: Mattias Põldaru <mahfiaz gmail com>

7872

Date: Mon Dec 20 14:13:30 2010 +0200

7873

7874

[l10n] Updated Estonian translation

7875

7876

po/et.po | 96

7877

+++++++++++++++++++++++++++++++++++++++++--------------------

7878

1 files changed, 64 insertions(+), 32 deletions(-)

7879

7880

commit 98cdd44dfc25ca3424924fbaffaf131d0a65cf19

7881

Author: Kristjan SCHMIDT <kristjan.schmidt@googlemail.com>

7882

Date: Sun Dec 19 14:26:49 2010 +0100

7883

7884

Updated Esperanto translation

7885

7886

po/eo.po | 2467

7887

++++++++++++++++++++++++++++++++++++++------------------------

7888

1 files changed, 1505 insertions(+), 962 deletions(-)

7889

7890

commit cd1ac335ab5c0a76ee0b1a2148a0997be91a0ea1

7891

Author: Yaron Shahrabani <sh.yaron@gmail.com>

7892

Date: Sun Dec 19 01:00:22 2010 +0200

7893

7894

Updated Hebrew translation.

7895

7896

po/he.po | 249

7897

++++++++++++++++++++++++++++++++++----------------------------

7898

1 files changed, 136 insertions(+), 113 deletions(-)

7899

7900

commit 1a864c32e5c194f3ee07e5fa4874e97cbb0f5900

7901

Author: Daniel Mustieles <daniel.mustieles@gmail.com>

7902

Date: Sat Dec 18 09:50:13 2010 +0100

7903

7904

Updated Spanish Translation

7905

7906

po/es.po | 14 +++++---------

7907

1 files changed, 5 insertions(+), 9 deletions(-)

7908

7909

commit bcccb4db182e39ab9fed47f83fe90acae4bd1ef6

7910

Author: Kjartan Maraas <kmaraas@gnome.org>

7911

Date: Fri Dec 17 13:18:20 2010 +0100

7912

7913

Updated Norwegian bokmål translation

7914

7915

po/nb.po | 360

7916

+++++++++++++++++++++++++++++++++-----------------------------

7917

1 files changed, 194 insertions(+), 166 deletions(-)

7918

7919

commit 0bc496f9399912f0ed4f73aa55a335a340246d3b

3757

7920

Author: Jonny Lamb <jonnylamb@gnome.org>

3758

7921

Date: Fri Dec 17 10:05:00 2010 +0000

3759

7922

3764

7927

libempathy-gtk/empathy-password-dialog.c | 17 ++++++++++++-----

3765

7928

1 files changed, 12 insertions(+), 5 deletions(-)

3766

7929

3767

commit 1a475582dc526fe0d494d7e21efd17040d0784b1

7930

commit e007679385406659e5653f3b80d566c1d964535e

7931

Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

7932

Date: Fri Dec 17 10:05:55 2010 +0000

7933

7934

Make empathy-persona-view include empathy-ui-utils

7935

7936

libempathy-gtk/empathy-persona-view.c | 1 +

7937

1 files changed, 1 insertions(+), 0 deletions(-)

7938

7939

commit a482e027803c3f83dfb02f113d3bd5e15e22588c

7940

Author: Daniel Mustieles <daniel.mustieles@gmail.com>

7941

Date: Wed Dec 15 22:09:31 2010 +0100

7942

7943

Updated Spanish translation

7944

7945

po/es.po | 372

7946

++++++++++++++++++++++++++++++++++----------------------------

7947

1 files changed, 206 insertions(+), 166 deletions(-)

7948

7949

commit 119cc5f2451bac0ef8eec82a8ea746846327be0b

7950

Merge: d55a1e7 b10823a

7951

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

7952

Date: Wed Dec 15 17:01:37 2010 +0100

7953

7954

Merge branch 'gtk-style-636654'

7955

7956

commit b10823a453d7189c1b3515a8bd075a91d91e796b

7957

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

7958

Date: Wed Dec 15 16:56:32 2010 +0100

7959

7960

depends on GTK+ 2.91.6 as we use the new style API

7961

7962

configure.ac | 2 +-

7963

1 files changed, 1 insertions(+), 1 deletions(-)

7964

7965

commit 91aa125dff5bbd4e967aa4cbec4892b4158c2f5b

7966

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

7967

Date: Wed Dec 15 16:50:52 2010 +0100

7968

7969

remove useless paranthesis

7970

7971

libempathy-gtk/empathy-ui-utils.c | 6 +++---

7972

1 files changed, 3 insertions(+), 3 deletions(-)

7973

7974

commit 30f5f6ea4a935eaa5d68f9d68998bee4b5d1bcbb

7975

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

7976

Date: Wed Dec 15 14:55:29 2010 +0100

7977

7978

persona-view: use new GTK+ style API (#636500)

7979

7980

libempathy-gtk/empathy-persona-view.c | 21 ++++++++++-----------

7981

1 files changed, 10 insertions(+), 11 deletions(-)

7982

7983

commit 4b9243dc87b1e8659c3349d54c0f86b77c677876

7984

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

7985

Date: Wed Dec 15 14:53:11 2010 +0100

7986

7987

individual-view: use new GTK+ style API (#636500)

7988

7989

libempathy-gtk/empathy-individual-view.c | 21 ++++++++++-----------

7990

1 files changed, 10 insertions(+), 11 deletions(-)

7991

7992

commit f77a1b3b6b3ffa4b47cf2e3cfab2f25f8383a3c1

7993

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

7994

Date: Wed Dec 15 14:46:24 2010 +0100

7995

7996

contact-list-view: use new GTK+ style API (#636500)

7997

7998

libempathy-gtk/empathy-contact-list-view.c | 19 +++++++++----------

7999

1 files changed, 9 insertions(+), 10 deletions(-)

8000

8001

commit 676e1f544d851935cb2dc7781f4a5ff39c366b2f

8002

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

8003

Date: Wed Dec 15 14:43:31 2010 +0100

8004

8005

factor out empathy_make_color_whiter()

8006

8007

libempathy-gtk/empathy-account-widget.c | 5 +----

8008

libempathy-gtk/empathy-ui-utils.c | 10 ++++++++++

8009

libempathy-gtk/empathy-ui-utils.h | 3 +++

8010

3 files changed, 14 insertions(+), 4 deletions(-)

8011

8012

commit 46f7d3a0152fd23d15c707d851e9b1889fc512f0

8013

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

8014

Date: Wed Dec 15 14:28:19 2010 +0100

8015

8016

account-widget: use new GTK+ style API (#636500)

8017

8018

libempathy-gtk/empathy-account-widget.c | 28

8019

++++++++++++++++------------

8020

1 files changed, 16 insertions(+), 12 deletions(-)

8021

8022

commit 554b78890fd7c8c2b392c335ab3f49c7bc756b8a

8023

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

8024

Date: Tue Dec 7 09:53:48 2010 +0100

8025

8026

status-preset-dialog: use new GTK+ style API (#636500)

8027

8028

libempathy-gtk/empathy-status-preset-dialog.c | 8 ++++----

8029

1 files changed, 4 insertions(+), 4 deletions(-)

8030

8031

commit 3951d3a3c1a7181bee75cc963711ea1900949c02

8032

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

8033

Date: Tue Dec 7 09:52:40 2010 +0100

8034

8035

chat-text-view: use new GTK+ style API (#636500)

8036

8037

libempathy-gtk/empathy-chat-text-view.c | 2 +-

8038

1 files changed, 1 insertions(+), 1 deletions(-)

8039

8040

commit 06637c4ad0fcc8765c2388f9264db7b49b260eaa

8041

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

8042

Date: Mon Dec 6 15:08:29 2010 +0100

8043

8044

video-widget: use new GTK+ style API (#636500)

8045

8046

libempathy-gtk/empathy-video-widget.c | 10 ++++------

8047

1 files changed, 4 insertions(+), 6 deletions(-)

8048

8049

commit d55a1e75859e5aea911d2483fac21de714514163

8050

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

8051

Date: Wed Dec 15 15:57:52 2010 +0100

8052

8053

use tp_account_get_path_suffix()

8054

8055

src/empathy-accounts-dialog.c | 5 +----

8056

1 files changed, 1 insertions(+), 4 deletions(-)

8057

8058

commit f6f81b5b1c229e7f2e1806519ae065675d5ec183

8059

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

8060

Date: Wed Dec 15 15:57:41 2010 +0100

8061

8062

show the account UI even if the selected account doesn't exist

8063

8064

src/empathy-accounts.c | 2 ++

8065

1 files changed, 2 insertions(+), 0 deletions(-)

8066

8067

commit a1aab6e03da2d2e031ebf1c0f65f30dc967bd8eb

8068

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

8069

Date: Wed Dec 15 15:52:36 2010 +0100

8070

8071

always set account_manager_prepared

8072

8073

src/empathy-accounts.c | 3 ++-

8074

1 files changed, 2 insertions(+), 1 deletions(-)

8075

8076

commit 07c1e70246e3d01ccc1000e8bf624ad039b063a6

8077

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

8078

Date: Wed Dec 15 15:49:08 2010 +0100

8079

8080

get the value of selected_account_name in the callback (#637307)

8081

8082

There is no point to pass it as user_data as selected_account_name

8083

is global

8084

and it's not defined yet when calling

8085

tp_account_manager_prepare_async() as

8086

the GApplication has not be prepared yet.

8087

8088

src/empathy-accounts.c | 7 +++----

8089

1 files changed, 3 insertions(+), 4 deletions(-)

8090

8091

commit 79d91365e3f7d986d28441ad072567bd72b9c776

8092

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

8093

Date: Wed Dec 15 15:34:35 2010 +0100

8094

8095

empathy-accounts: no need to get argv, we don't use it

8096

8097

src/empathy-accounts.c | 7 -------

8098

1 files changed, 0 insertions(+), 7 deletions(-)

8099

8100

commit 86aa1501e7a76b92ba402dddc4ce85d403c609bf

3768

8101

Author: Jonny Lamb <jonnylamb@gnome.org>

3769

8102

Date: Wed Dec 15 13:57:02 2010 +0000

3770

8103

3775

8108

libempathy-gtk/empathy-password-dialog.c | 11 +++++++++++

3776

8109

1 files changed, 11 insertions(+), 0 deletions(-)

3777

8110

3778

commit 374be3ff3554cf95247edb89d577cb4c809917ca

8111

commit 275aa2505465bd2f1c5cf02427219a6ae54dfe93

3779

8112

Author: Jonny Lamb <jonnylamb@gnome.org>

3780

8113

Date: Wed Dec 15 09:17:15 2010 +0000

3781

8114

3796

8129

libempathy/empathy-keyring.c | 3 ++-

3797

8130

1 files changed, 2 insertions(+), 1 deletions(-)

3798

8131

3799

commit a15a84ff439be0a22ce2fb793ceb3b6220a4d574

8132

commit e63548aeb4d170976beea77c299a3575287ca048

3800

8133

Author: Jonny Lamb <jonnylamb@gnome.org>

3801

8134

Date: Wed Dec 15 09:10:56 2010 +0000

3802

8135

3812

8145

libempathy/empathy-server-sasl-handler.c | 6 +++++-

3813

8146

1 files changed, 5 insertions(+), 1 deletions(-)

3814

8147

3815

commit 294c9f88d88ebfb1d3eabc8a22ff66129811bcdf

8148

commit 2ec9b6e89141999f919f8a3bd4a44fd8abad86ff

8149

Merge: 2e38a9c 225ca2e

8150

Author: Jonny Lamb <jonnylamb@gnome.org>

8151

Date: Wed Dec 15 08:56:03 2010 +0000

8152

8153

Merge branch 'sasl-gui'

8154

8155

commit 225ca2e12b053a6c8ece18179d470f01ed1d6fb7

3816

8156

Author: Jonny Lamb <jonnylamb@gnome.org>

3817

8157

Date: Tue Dec 14 16:38:48 2010 +0000

3818

8158

3823

8163

src/empathy-main-window.c | 2 +-

3824

8164

1 files changed, 1 insertions(+), 1 deletions(-)

3825

8165

3826

commit 45e20879fc1d45665f4fd47364deb130ed18ba4c

8166

commit 01e02a165d271a155a4af0e79dd94c210b584cfa

3827

8167

Author: Jonny Lamb <jonnylamb@gnome.org>

3828

8168

Date: Tue Dec 14 16:38:19 2010 +0000

3829

8169

3834

8174

src/empathy-main-window.c | 5 +----

3835

8175

1 files changed, 1 insertions(+), 4 deletions(-)

3836

8176

3837

commit c16f5cc964a89d025beb71faaac76e6190218f88

8177

commit 932835ccd42c55d77017d6ffc77773db40385a27

3838

8178

Author: Jonny Lamb <jonnylamb@gnome.org>

3839

8179

Date: Tue Dec 14 16:37:18 2010 +0000

3840

8180

3845

8185

src/empathy-main-window.c | 4 ++++

3846

8186

1 files changed, 4 insertions(+), 0 deletions(-)

3847

8187

3848

commit 92b15cb0cf7de53be9417f342aff4c6ae53141dd

8188

commit 05e14d747fd88a260996c406a938a1bfdfbaca8f

3849

8189

Author: Jonny Lamb <jonnylamb@gnome.org>

3850

8190

Date: Tue Dec 14 16:33:46 2010 +0000

3851

8191

3856

8196

src/empathy-event-manager.c | 11 ++---------

3857

8197

1 files changed, 2 insertions(+), 9 deletions(-)

3858

8198

3859

commit fbcf062fd6e64122fe5727a8765585b0b68c1805

8199

commit 483c580a8b6aa2c0b4205e3cb2c674e80abe5ba7

3860

8200

Author: Jonny Lamb <jonnylamb@gnome.org>

3861

8201

Date: Tue Dec 14 16:31:57 2010 +0000

3862

8202

3867

8207

libempathy/empathy-auth-factory.c | 6 ++++++

3868

8208

1 files changed, 6 insertions(+), 0 deletions(-)

3869

8209

3870

commit 31adf5a1bef3cd290ac1eacebdfe20da1c235bbb

8210

commit 6093afb467c0c2ae855d8635d9a10e9bc5f072c4

3871

8211

Author: Jonny Lamb <jonnylamb@gnome.org>

3872

8212

Date: Tue Dec 14 16:30:41 2010 +0000

3873

8213

3878

8218

libempathy/empathy-account-settings.c | 24 +++++-------------------

3879

8219

1 files changed, 5 insertions(+), 19 deletions(-)

3880

8220

3881

commit 2363b938811486625cf570dbe5ca60ab008ca8e0

8221

commit 2e38a9c56cdac919f424107928dbbf35d69a41ed

8222

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

8223

Date: Tue Dec 14 16:43:03 2010 +0100

8224

8225

remove released flag

8226

8227

configure.ac | 2 +-

8228

1 files changed, 1 insertions(+), 1 deletions(-)

8229

8230

commit 1cf1fc435c4ce08b4d2c5085d1432066a95bcde8

8231

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

8232

Date: Tue Dec 14 16:04:51 2010 +0100

8233

8234

prepare 2.91.3.1

8235

8236

NEWS | 40 ++++++++++++++++++++++++++++++++++++++++

8237

configure.ac | 4 ++--

8238

2 files changed, 42 insertions(+), 2 deletions(-)

8239

8240

commit 814dfdd0924a7f0a216b0afbde16b5f114fd89b3

8241

Author: Yaron Shahrabani <sh.yaron@gmail.com>

8242

Date: Mon Dec 13 23:47:01 2010 +0200

8243

8244

Updated Hebrew translation.

8245

8246

po/he.po | 139

8247

+++++++++++++++++++++++++++++++++-----------------------------

8248

1 files changed, 74 insertions(+), 65 deletions(-)

8249

8250

commit c6371ec63c928c848cbb5474cb005af5cc414230

8251

Author: Philip Withnall <philip.withnall@collabora.co.uk>

8252

Date: Sun Dec 12 18:51:07 2010 +0000

8253

8254

Bug 637097 — Port to latest folks API changes

8255

8256

Catch up with three interface renamings which have happened in

8257

folks master.

8258

This bumps Empathy's folks dependency to 0.3.3. Closes: bgo#637097

8259

8260

configure.ac | 2 +-

8261

libempathy-gtk/empathy-contact-widget.c | 10 ++++----

8262

libempathy-gtk/empathy-individual-menu.c | 4 +-

8263

libempathy-gtk/empathy-individual-store.c | 27

8264

++++++++++++++-----------

8265

libempathy-gtk/empathy-individual-view.c | 6 ++--

8266

libempathy-gtk/empathy-individual-widget.c | 29

8267

++++++++++++++++-----------

8268

libempathy-gtk/empathy-persona-store.c | 12 ++++++----

8269

libempathy-gtk/empathy-ui-utils.c | 6 +++-

8270

libempathy/empathy-contact.c | 20 +++++++++++-------

8271

libempathy/empathy-individual-manager.c | 4 +-

8272

10 files changed, 68 insertions(+), 52 deletions(-)

8273

8274

commit 92ab34517a94d36ced95514e4fdbde17b2e6004f

8275

Author: Will Thompson <will.thompson@collabora.co.uk>

8276

Date: Wed Dec 8 18:59:41 2010 +0000

8277

8278

Compile with --without-ca-file

8279

8280

libempathy/empathy-tls-verifier.c | 2 ++

8281

1 files changed, 2 insertions(+), 0 deletions(-)

8282

8283

commit e5677e4dc098d563a5e2617e978c45335717b915

8284

Author: Philip Withnall <philip.withnall@collabora.co.uk>

8285

Date: Mon Dec 13 13:55:49 2010 +0000

8286

8287

Prevent premature finalisation of an EmpathyPersonaStore in certain

8288

cases

8289

8290

In the case that one of the GtkTreeRowReferences belonging to the

8291

Personas

8292

in an EmpathyPersonaStore holds the last reference to the persona

8293

store, the

8294

store can be prematurely finalised, causing Empathy to go into

8295

an infinite

8296

loop inside GHashTable code (the hash table is finalised with

8297

the persona

8298

store, and overwritten with 0xfff… — this happens to cause the

8299

next bit of

8300

hash table code to be called to go into an infinite loop).

8301

8302

This can be fixed by holding a reference to the persona store when

8303

changing

8304

its personas in response to a personas-changed signal.

8305

8306

libempathy-gtk/empathy-persona-store.c | 7 +++++++

8307

1 files changed, 7 insertions(+), 0 deletions(-)

8308

8309

commit 315675364ae3c5afb3bda08a7389d655112ad7a5

8310

Author: Philip Withnall <philip.withnall@collabora.co.uk>

8311

Date: Sun Dec 12 11:25:26 2010 +0000

8312

8313

Bug 631096 — Should not mention "meta contacts" in UI

8314

8315

Change all occurrences of “meta-contacts” in translatable strings

8316

to use the

8317

phrase “linked contacts” instead. Closes: bgo#631096

8318

8319

libempathy-gtk/empathy-individual-widget.c | 8 ++++++--

8320

libempathy-gtk/empathy-linking-dialog.c | 10 +++++-----

8321

2 files changed, 11 insertions(+), 7 deletions(-)

8322

8323

commit a2f8a7b9198d90f6a2e8e38c403e29c25b0b560c

8324

Author: Philip Withnall <philip.withnall@collabora.co.uk>

8325

Date: Sun Dec 12 18:15:51 2010 +0000

8326

8327

Bug 636700 — Add an extra warning when deleting a metacontact

8328

8329

libempathy-gtk/empathy-individual-view.c | 41

8330

+++++++++++++++++++++++++++---

8331

1 files changed, 37 insertions(+), 4 deletions(-)

8332

8333

commit 7e4103ab9ceebf9369e9684fbe6564f1f5238adb

8334

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

8335

Date: Mon Dec 13 13:15:10 2010 +0100

8336

8337

remove released flag accidentally set in previous commit

8338

8339

configure.ac | 2 +-

8340

1 files changed, 1 insertions(+), 1 deletions(-)

8341

8342

commit b51c1db854b9c367ea50d0a301fddca917486372

3882

8343

Author: Jonny Lamb <jonny.lamb@collabora.co.uk>

3883

8344

Date: Mon Dec 13 09:41:34 2010 +0000

3884

8345

3889

8350

configure.ac | 2 +-

3890

8351

1 files changed, 1 insertions(+), 1 deletions(-)

3891

8352

3892

commit 6d70f108f31d437f5a0092ebdc2be84768073c01

8353

commit b4930806a93a8b365400e563b8fa359c00c4016a

8354

Author: Robert Sajdok <robert.sajdok@gmail.com>

8355

Date: Mon Dec 13 10:40:23 2010 +0100

8356

8357

main-window: add a tooltip on connection error info bars (#626507)

8358

8359

configure.ac | 2 +-

8360

src/empathy-main-window.c | 1 +

8361

2 files changed, 2 insertions(+), 1 deletions(-)

8362

8363

commit f6180441540a3a19f4b61d5908c97ebc5b60e779

8364

Author: Kjartan Maraas <kmaraas@gnome.org>

8365

Date: Sun Dec 12 21:31:30 2010 +0100

8366

8367

Updated Norwegian bokmål translation

8368

8369

po/nb.po | 432

8370

++++++++++++++++++++++++++++++++------------------------------

8371

1 files changed, 225 insertions(+), 207 deletions(-)

8372

8373

commit cc04faff9afbffc10a5a1e82a78e073064219fc6

8374

Author: Philip Withnall <philip@tecnocode.co.uk>

8375

Date: Sun Dec 12 11:21:01 2010 +0000

8376

8377

Update British English translation

8378

8379

po/en_GB.po | 1256

8380

++++++++++++++++++++++++++++++++---------------------------

8381

1 files changed, 672 insertions(+), 584 deletions(-)

8382

8383

commit 4ce52c5fb8116e72a3b87c7a79f49ceefe355f9e

8384

Author: Matej Urbančič <mateju@svn.gnome.org>

8385

Date: Sat Dec 11 21:08:14 2010 +0100

8386

8387

Updated Slovenian translation

8388

8389

po/sl.po | 564

8390

++++++++++++++++++++++++++++++++------------------------------

8391

1 files changed, 291 insertions(+), 273 deletions(-)

8392

8393

commit 209dd3b22e18e6faf6956c03e711b70023c8a9ff

8394

Author: Daniel Mustieles <daniel.mustieles@gmail.com>

8395

Date: Sat Dec 11 15:28:44 2010 +0100

8396

8397

Updated Spanish translation

8398

8399

po/es.po | 426

8400

++++++++++++++++++++++++++++++++------------------------------

8401

1 files changed, 221 insertions(+), 205 deletions(-)

8402

8403

commit 698e6e591310e605ff204915637527985f379bf2

8404

Author: Fran Diéguez <fran.dieguez@mabishu.com>

8405

Date: Fri Dec 10 18:11:40 2010 +0100

8406

8407

Updated Galician translations

8408

8409

po/gl.po | 468

8410

++++++++++++++++++++++++++++++++------------------------------

8411

1 files changed, 242 insertions(+), 226 deletions(-)

8412

8413

commit a2dd862e0f2a262f61b4976148f6cc1e988ec66f

3893

8414

Author: Jonny Lamb <jonnylamb@gnome.org>

3894

8415

Date: Fri Dec 10 12:28:09 2010 +0000

3895

8416

3910

8431

libempathy-gtk/empathy-account-widget.c | 47 +++++++++++++

3911

8432

7 files changed, 281 insertions(+), 24 deletions(-)

3912

8433

3913

commit 99c44b531b4c562e9767e9b138954ef3ebaca9d8

8434

commit 40791c62c791c6ec697b494b421b1e68c8384769

3914

8435

Author: Jonny Lamb <jonnylamb@gnome.org>

3915

8436

Date: Fri Dec 10 12:24:40 2010 +0000

3916

8437

3922

8443

libempathy-gtk/empathy-account-widget.c | 8 +++++++-

3923

8444

1 files changed, 7 insertions(+), 1 deletions(-)

3924

8445

3925

commit 18bb89fb5a48eff9afb0e826feff740db5d8a479

8446

commit cf79884338c1a83eb3c7a18da9674f3563ed1829

3926

8447

Author: Jonny Lamb <jonnylamb@gnome.org>

3927

8448

Date: Fri Dec 10 12:23:08 2010 +0000

3928

8449

3934

8455

libempathy/empathy-account-settings.h | 2 ++

3935

8456

2 files changed, 10 insertions(+), 0 deletions(-)

3936

8457

3937

commit 09dfb1223c619498c4ef29567d34ba43b8c455b9

8458

commit e52ae339c601c4173b011ad28bcdca816649fd4c

3938

8459

Author: Jonny Lamb <jonnylamb@gnome.org>

3939

8460

Date: Fri Dec 10 12:02:17 2010 +0000

3940

8461

3951

8472

libempathy/empathy-account-settings.c | 25 ++++++++++++++++-----

3952

8473

2 files changed, 55 insertions(+), 6 deletions(-)

3953

8474

3954

commit 41433901d4d8aa182895a71c868c38dc16173573

8475

commit 41dd635842b27268454435c557b74ea32245c7ae

3955

8476

Author: Jonny Lamb <jonnylamb@gnome.org>

3956

8477

Date: Thu Dec 9 17:32:13 2010 +0000

3957

8478

3963

8484

src/empathy-status-icon.c | 2 +-

3964

8485

2 files changed, 6 insertions(+), 5 deletions(-)

3965

8486

3966

commit bbaaf66212149f16267b20646cd281f948670d90

8487

commit d7293eb2b362224a70ad1c8402691c987b1caf1c

3967

8488

Author: Jonny Lamb <jonnylamb@gnome.org>

3968

8489

Date: Thu Dec 9 11:14:16 2010 +0000

3969

8490

3978

8499

libempathy/empathy-auth-factory.h | 6 +-

3979

8500

3 files changed, 229 insertions(+), 57 deletions(-)

3980

8501

3981

commit f0a51dddd8192d0c4e8eca0dcbf1267a23f52a30

8502

commit db9e0a4a2394977b62f1034864365b1cae6f4714

3982

8503

Author: Jonny Lamb <jonnylamb@gnome.org>

3983

8504

Date: Wed Dec 8 18:34:26 2010 +0000

3984

8505

3992

8513

src/empathy-main-window.ui | 14 ++++-

3993

8514

2 files changed, 161 insertions(+), 1 deletions(-)

3994

8515

3995

commit e4c2ae8ff3e581f349caa36fe99680da047f3cac

8516

commit 1a85f1ae21dd6be86f6e15e424ece5302c8faa4d

8517

Author: Jonny Lamb <jonnylamb@gnome.org>

8518

Date: Wed Dec 8 18:24:47 2010 +0000

8519

8520

notifications-approver: don't show notifications for auth events

8521

8522

Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

8523

8524

src/empathy-notifications-approver.c | 10 ++++++++++

8525

1 files changed, 10 insertions(+), 0 deletions(-)

8526

8527

commit 071992a0704d43baa2a72b576401ea1f68b44de6

3996

8528

Author: Jonny Lamb <jonnylamb@gnome.org>

3997

8529

Date: Wed Dec 8 18:24:21 2010 +0000

3998

8530

4005

8537

src/empathy-event-manager.h | 1 +

4006

8538

2 files changed, 85 insertions(+), 6 deletions(-)

4007

8539

4008

commit b9bccbb48e82c1a431408a3d10931ac7c2c3e8e7

8540

commit d180fb24e4039659e5f731bbbf80a827aefe517f

4009

8541

Author: Jonny Lamb <jonnylamb@gnome.org>

4010

8542

Date: Wed Dec 8 16:04:00 2010 +0000

4011

8543

4017

8549

src/empathy-event-manager.h | 1 +

4018

8550

2 files changed, 23 insertions(+), 13 deletions(-)

4019

8551

4020

commit aa549c4790e7d7cdeb7f858008759faa5369b4df

8552

commit c98f95bcef9336d82d303fc10b4c60ff90270885

4021

8553

Author: Jonny Lamb <jonnylamb@gnome.org>

4022

8554

Date: Wed Dec 8 12:58:54 2010 +0000

4023

8555

4032

8564

++++++++++++++++--------

4033

8565

2 files changed, 57 insertions(+), 13 deletions(-)

4034

8566

4035

commit 95bf4742dea9bdb83dd1bc4cec9730ca6a091c24

8567

commit 216990096f7087f7e29c0fdf2c25c34274f83376

8568

Author: Cheng-Chia Tseng <pswo10680@gmail.com>

8569

Date: Thu Dec 9 19:54:27 2010 +0800

8570

8571

Updated Traditional Chinese translation(Hong Kong and Taiwan)

8572

8573

po/zh_HK.po | 905

8574

+++++++++++++++++++++++++++++++----------------------------

8575

po/zh_TW.po | 905

8576

+++++++++++++++++++++++++++++++----------------------------

8577

2 files changed, 960 insertions(+), 850 deletions(-)

8578

8579

commit 373bf0d7ca7373a45a71e46f161695cc951a7316

4036

8580

Author: Jonny Lamb <jonnylamb@gnome.org>

4037

8581

Date: Wed Dec 8 12:57:45 2010 +0000

4038

8582

4043

8587

4044

8588

Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

4045

8589

4046

libempathy/empathy-account-settings.c | 17 ++++++++++++++---

4047

1 files changed, 14 insertions(+), 3 deletions(-)

8590

libempathy/empathy-account-settings.c | 12 +++++++++---

8591

1 files changed, 9 insertions(+), 3 deletions(-)

4048

8592

4049

commit 75f150ca6ed3261cf06dad71cb9d0f4584a2eefc

8593

commit e1db9121d3018495f97bcb41caa3805b3672afbc

4050

8594

Author: Jonny Lamb <jonnylamb@gnome.org>

4051

8595

Date: Wed Dec 8 12:44:44 2010 +0000

4052

8596

4057

8601

libempathy-gtk/empathy-password-dialog.c | 7 -------

4058

8602

1 files changed, 0 insertions(+), 7 deletions(-)

4059

8603

4060

commit bdfa8609af4d7f2bc7cbf8e3b4e762e770fee192

8604

commit b2d04d8965c6fa63c6aa10a4c2197619f5234ef5

4061

8605

Author: Jonny Lamb <jonnylamb@gnome.org>

4062

8606

Date: Wed Dec 8 12:42:36 2010 +0000

4063

8607

4069

8613

+++++++++++++++++++++++++++++++

4070

8614

1 files changed, 38 insertions(+), 0 deletions(-)

4071

8615

4072

commit 734ec37772f59a96a581b54104e83b0d571c746e

8616

commit 5f2776557174cf952c465c9b13960238574c8481

4073

8617

Author: Jonny Lamb <jonnylamb@gnome.org>

4074

8618

Date: Wed Dec 8 12:01:53 2010 +0000

4075

8619

4080

8624

4081

8625

Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

4082

8626

4083

libempathy/empathy-account-settings.c | 168

8627

libempathy/empathy-account-settings.c | 164

4084

8628

++++++++++++++++++++++++++++++++-

4085

1 files changed, 165 insertions(+), 3 deletions(-)

8629

1 files changed, 161 insertions(+), 3 deletions(-)

4086

8630

4087

commit baa5833e00509339a9c650d1f09db9932aa6a6cb

8631

commit b1a60391b1ca744b3bd5c3218488ccd4cab9b86c

4088

8632

Author: Jonny Lamb <jonnylamb@gnome.org>

4089

8633

Date: Wed Dec 8 09:32:06 2010 +0000

4090

8634

4097

8641

+++++++++++++++++++++++++++++++--

4098

8642

1 files changed, 47 insertions(+), 3 deletions(-)

4099

8643

4100

commit 09b0b0823b06c9d5411fe930e7d05e158ae0a2b8

8644

commit fdfca8f9fa60962a6e808e8c9cdb2173205457b0

8645

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

8646

Date: Tue Dec 7 14:35:53 2010 +0100

8647

8648

empathy_subscription_dialog_show: show contact details

8649

8650

It makes sense to give as much info as possible on the contact when

8651

asking if

8652

we want to add him to our contact list (#608806).

8653

8654

libempathy-gtk/empathy-contact-dialogs.c | 3 ++-

8655

1 files changed, 2 insertions(+), 1 deletions(-)

8656

8657

commit 7ff5fadde643aa96b771dc57e47455ca761ed0f8

8658

Author: Yaron Shahrabani <sh.yaron@gmail.com>

8659

Date: Tue Dec 7 15:37:49 2010 +0200

8660

8661

Updated Hebrew translation.

8662

8663

po/he.po | 420

8664

++++++++++++++++++++++++++++++++------------------------------

8665

1 files changed, 218 insertions(+), 202 deletions(-)

8666

8667

commit 92c0e18861d5a8fd9b55e7385581ac961f615a5e

8668

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

8669

Date: Tue Dec 7 14:01:13 2010 +0100

8670

8671

Remove Ovi chat profile

8672

8673

Ovi services are about to change so best to wait for now.

8674

8675

libempathy-gtk/empathy-account-widget-jabber.ui | 105

8676

-----------------------

8677

libempathy-gtk/empathy-account-widget.c | 35 --------

8678

libempathy-gtk/empathy-protocol-chooser.c | 15 ---

8679

libempathy/empathy-utils.c | 1 -

8680

4 files changed, 0 insertions(+), 156 deletions(-)

8681

8682

commit 521662e23476ddc9bc9c96917bb04a06ff4479cc

8683

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

8684

Date: Thu Sep 30 11:05:59 2010 +0200

8685

8686

add services_infos containing infos regarding services

8687

8688

libempathy-gtk/empathy-account-widget.c | 45

8689

++++++++++++++++--------------

8690

1 files changed, 24 insertions(+), 21 deletions(-)

8691

8692

commit c5a45a77bcc3fc39bb4814f46deb994e1b29ddb5

8693

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

8694

Date: Thu Sep 30 10:52:02 2010 +0200

8695

8696

hide jabber example by default so we just have to show the one we want

8697

8698

libempathy-gtk/empathy-account-widget-jabber.ui | 1 -

8699

libempathy-gtk/empathy-account-widget.c | 9 ++++-----

8700

2 files changed, 4 insertions(+), 6 deletions(-)

8701

8702

commit 43070f934f712124c9b064c34021f42e09eb328e

8703

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

8704

Date: Thu Sep 30 10:32:15 2010 +0200

8705

8706

account_widget_get_service: check Service for Facebook and GTalk too

8707

8708

libempathy-gtk/empathy-account-widget.c | 17 +++++++++++------

8709

1 files changed, 11 insertions(+), 6 deletions(-)

8710

8711

commit 598db544a4d66a00aa45c036eb5bd6f591f0f996

8712

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

8713

Date: Thu Sep 30 10:27:30 2010 +0200

8714

8715

empathy_account_widget_get_default_display_name: special case Ovi

8716

as well

8717

8718

libempathy-gtk/empathy-account-widget.c | 8 ++++++++

8719

1 files changed, 8 insertions(+), 0 deletions(-)

8720

8721

commit 378fff47b595c21f802c0de3944cb520981a992d

8722

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

8723

Date: Thu Sep 30 10:25:19 2010 +0200

8724

8725

more use of account_widget_get_service()

8726

8727

libempathy-gtk/empathy-account-widget.c | 34

8728

+++---------------------------

8729

1 files changed, 4 insertions(+), 30 deletions(-)

8730

8731

commit 0087a5bd8ddd99a16288bd74a5e23da41c0d8dd1

8732

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

8733

Date: Thu Sep 30 10:20:15 2010 +0200

8734

8735

add account_widget_get_service() and an enum to represent services

8736

8737

libempathy-gtk/empathy-account-widget.c | 53

8738

+++++++++++++++++++++++-------

8739

1 files changed, 40 insertions(+), 13 deletions(-)

8740

8741

commit 7fa0c3b106c5d5d35cb86a75da047b8c7c5e2685

8742

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

8743

Date: Wed Sep 22 16:51:05 2010 +0200

8744

8745

add account widget for Ovi

8746

8747

libempathy-gtk/empathy-account-widget-jabber.ui | 105

8748

+++++++++++++++++++++++

8749

libempathy-gtk/empathy-account-widget.c | 47 ++++++++++-

8750

2 files changed, 149 insertions(+), 3 deletions(-)

8751

8752

commit d25db434c8871b871fb007c2e41a0da834587974

8753

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

8754

Date: Tue Sep 21 14:28:01 2010 +0200

8755

8756

account-widget: generalise facebook suffix code

8757

8758

libempathy-gtk/empathy-account-widget.c | 46

8759

+++++++++++++++++++++----------

8760

1 files changed, 31 insertions(+), 15 deletions(-)

8761

8762

commit 0b94b1427a34bc16d98c4c0622c637df8856adc4

8763

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

8764

Date: Tue Sep 21 14:13:37 2010 +0200

8765

8766

add Ovi chat profile (#630146)

8767

8768

libempathy-gtk/empathy-protocol-chooser.c | 15 +++++++++++++++

8769

libempathy/empathy-utils.c | 1 +

8770

2 files changed, 16 insertions(+), 0 deletions(-)

8771

8772

commit 6c5839c976407292715daf22cdddf6aca469fa75

8773

Merge: 9d40a77 eb3f7d2

8774

Author: Jonny Lamb <jonnylamb@gnome.org>

8775

Date: Tue Dec 7 11:54:33 2010 +0000

8776

8777

Merge branch 'sasl'

8778

8779

commit eb3f7d2fb30be62b801b6086143fb476b5368b5d

4101

8780

Author: Jonny Lamb <jonnylamb@gnome.org>

4102

8781

Date: Tue Dec 7 11:11:34 2010 +0000

4103

8782

4108

8787

libempathy/empathy-server-sasl-handler.c | 8 ++++----

4109

8788

1 files changed, 4 insertions(+), 4 deletions(-)

4110

8789

4111

commit cc1fb69ca228118fcddf5f80dc1a1ac7cd4cd456

8790

commit 436815408e8a159a56a4a5ce0ee4aa52b51a8800

4112

8791

Author: Jonny Lamb <jonnylamb@gnome.org>

4113

8792

Date: Tue Dec 7 11:10:20 2010 +0000

4114

8793

4120

8799

+++++++++++++----------------

4121

8800

1 files changed, 15 insertions(+), 18 deletions(-)

4122

8801

4123

commit 4b5a64796f740656f689d6289ad608788a85d35b

8802

commit bd7cb52a486f7f57d75070c28afd1f2b1b0dc017

4124

8803

Author: Jonny Lamb <jonnylamb@gnome.org>

4125

8804

Date: Tue Dec 7 11:10:15 2010 +0000

4126

8805

4131

8810

libempathy-gtk/empathy-password-dialog.c | 16 +++++++---------

4132

8811

1 files changed, 7 insertions(+), 9 deletions(-)

4133

8812

4134

commit 4ba3f6143c754159d00ce5c058ff6621b8ea59fc

8813

commit 52620257848947efee91e27819cdc8f685784ed8

4135

8814

Author: Jonny Lamb <jonnylamb@gnome.org>

4136

8815

Date: Tue Dec 7 11:02:14 2010 +0000

4137

8816

4142

8821

libempathy-gtk/empathy-password-dialog.c | 4 ++--

4143

8822

1 files changed, 2 insertions(+), 2 deletions(-)

4144

8823

4145

commit ea89a27ce34ec95c6b4315c50029e881ad2fdcea

8824

commit 2599834381f57b1370986e2a574cde6781f0b6bc

4146

8825

Author: Jonny Lamb <jonnylamb@gnome.org>

4147

8826

Date: Tue Dec 7 11:02:02 2010 +0000

4148

8827

4153

8832

po/POTFILES.in | 1 +

4154

8833

1 files changed, 1 insertions(+), 0 deletions(-)

4155

8834

4156

commit 98fd12fdae0101fee17883215f11eb941bdef9e7

8835

commit a5a3b01dcda00b938e6ce61d3b6dbf6b0d57abe0

4157

8836

Author: Jonny Lamb <jonny.lamb@collabora.co.uk>

4158

8837

Date: Mon Dec 6 16:24:38 2010 +0000

4159

8838

4164

8843

libempathy/empathy-keyring.c | 18 +++++++++---------

4165

8844

1 files changed, 9 insertions(+), 9 deletions(-)

4166

8845

4167

commit 64ee35e5448d1e1bc6cc317a9ade7431216bc4a2

8846

commit 4014b19321977ffd5700aa8d1df258393bb74521

4168

8847

Author: Jonny Lamb <jonny.lamb@collabora.co.uk>

4169

8848

Date: Mon Dec 6 15:58:30 2010 +0000

4170

8849

4175

8854

libempathy-gtk/empathy-password-dialog.c | 2 ++

4176

8855

1 files changed, 2 insertions(+), 0 deletions(-)

4177

8856

4178

commit dc7941ed458c5da3351ac88761ee46e44f8015b4

8857

commit 15426cd6aa437bc2772397b77dd0d59a345e004b

4179

8858

Author: Jonny Lamb <jonny.lamb@collabora.co.uk>

4180

8859

Date: Mon Dec 6 15:01:25 2010 +0000

4181

8860

4186

8865

libempathy-gtk/empathy-password-dialog.c | 7 +++++++

4187

8866

1 files changed, 7 insertions(+), 0 deletions(-)

4188

8867

4189

commit 844903bf649ddf67e065b0e64f9b14e23ab9d7e2

8868

commit 07921157f6d77826e474eac64a425736a92e2321

4190

8869

Author: Jonny Lamb <jonny.lamb@collabora.co.uk>

4191

8870

Date: Mon Dec 6 14:49:16 2010 +0000

4192

8871

4197

8876

libempathy/empathy-server-sasl-handler.c | 7 +++++++

4198

8877

1 files changed, 7 insertions(+), 0 deletions(-)

4199

8878

4200

commit bec9be034d439b51a5a81bbae54ce513e05d8cc3

8879

commit 66f79bec1ec6b59d362324fbfdf0335e60c1d8e6

4201

8880

Author: Jonny Lamb <jonny.lamb@collabora.co.uk>

4202

8881

Date: Mon Dec 6 12:28:13 2010 +0000

4203

8882

4208

8887

libempathy/empathy-keyring.c | 2 --

4209

8888

1 files changed, 0 insertions(+), 2 deletions(-)

4210

8889

4211

commit 80a9d33725a6b00d6ee486ccc97e9c137d43e3c4

8890

commit 9d40a77fae9175d7932c3af0e95cbdf1cfde433b

8891

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

8892

Date: Wed Dec 1 18:53:59 2010 +0100

8893

8894

Point to #empathy instead of #telepathy

8895

8896

TODO | 2 +-

8897

1 files changed, 1 insertions(+), 1 deletions(-)

8898

8899

commit 2c201cf276aa11b3ae1d1bedcf92eb29abf7f04d

4212

8900

Author: Jonny Lamb <jonny.lamb@collabora.co.uk>

4213

8901

Date: Mon Dec 6 11:35:26 2010 +0000

4214

8902

4221

8909

libempathy/empathy-keyring.h | 6 +++

4222

8910

2 files changed, 102 insertions(+), 0 deletions(-)

4223

8911

4224

commit 9c4cdfa994ecb28911b0fe714a99803b2e51f719

8912

commit b66750b8540761c03b935ff93d50c642c9d1f07c

4225

8913

Author: Jonny Lamb <jonny.lamb@collabora.co.uk>

4226

8914

Date: Mon Dec 6 10:06:51 2010 +0000

4227

8915

4232

8920

libempathy/empathy-server-sasl-handler.c | 22 +++++++++++++++++++++-

4233

8921

1 files changed, 21 insertions(+), 1 deletions(-)

4234

8922

4235

commit 4e3f8354165c37e1d8fc236b7d6417f77931bba3

8923

commit 085edd72db61d923a639d874f44c9ed2805e75a8

4236

8924

Author: Jonny Lamb <jonny.lamb@collabora.co.uk>

4237

8925

Date: Mon Dec 6 10:05:56 2010 +0000

4238

8926

4245

8933

libempathy/empathy-keyring.h | 7 +++

4246

8934

2 files changed, 87 insertions(+), 6 deletions(-)

4247

8935

4248

commit 5ddca5abc46c6adeb5870b592c77158f7da00ca5

8936

commit bc099434f22a78d09d0dad3d5006ad836ab11d02

4249

8937

Author: Jonny Lamb <jonny.lamb@collabora.co.uk>

4250

8938

Date: Mon Dec 6 09:43:34 2010 +0000

4251

8939

4260

8948

src/empathy-auth-client.c | 9 ++-

4261

8949

4 files changed, 193 insertions(+), 23 deletions(-)

4262

8950

4263

commit aeec506f710f2222c774e450dd79e0ef24bee6e7

8951

commit 4d487def1692d57aca987219fa1ff6f133c389f1

4264

8952

Author: Jonny Lamb <jonny.lamb@collabora.co.uk>

4265

8953

Date: Mon Dec 6 09:42:59 2010 +0000

4266

8954

4274

8962

libempathy/empathy-keyring.h | 37 +++++++++++++

4275

8963

3 files changed, 154 insertions(+), 0 deletions(-)

4276

8964

4277

commit b27c1b4e47d33b9f7bd902f8a770353bed372994

8965

commit ceff90e7c349418ed74c3bc2346fdb9270d534c0

8966

Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

8967

Date: Sat Dec 4 17:23:43 2010 +0000

8968

8969

Fix uninitialized use of a variable

8970

8971

libempathy/empathy-chatroom-manager.c | 2 +-

8972

1 files changed, 1 insertions(+), 1 deletions(-)

8973

8974

commit 5c2ae48c27de994ba418bf759bbf011c8101943d

4278

8975

Author: Jonny Lamb <jonnylamb@gnome.org>

4279

8976

Date: Fri Dec 3 15:58:05 2010 +0000

4280

8977

4289

8986

src/empathy-auth-client.c | 180 +-----------------

4290

8987

4 files changed, 390 insertions(+), 176 deletions(-)

4291

8988

4292

commit 6879c0e851ab62aed8e540bec3c3d598227ae4bf

8989

commit e1873eec13666db81e379eb591b771a5d4122505

8990

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

8991

Date: Fri Dec 3 15:32:49 2010 +0100

8992

8993

gdk_x11_drawable_get_xdisplay() has been renamed, so let's use the

8994

specific macro instead

8995

8996

libempathy-gtk/empathy-ui-utils.c | 2 +-

8997

1 files changed, 1 insertions(+), 1 deletions(-)

8998

8999

commit ee8f480f660963c7d26872a27ba9889bbed6a000

4293

9000

Author: Jonny Lamb <jonnylamb@gnome.org>

4294

9001

Date: Fri Dec 3 14:25:46 2010 +0000

4295

9002

4304

9011

+++++++++++++++++++++++++++++++++++++++++++++

4305

9012

1 files changed, 73 insertions(+), 0 deletions(-)

4306

9013

4307

commit 63d5f0091b40210b6e72eae9d83d02b308899cf3

9014

commit 5964bd5d8e7ba463e89e742701b006615d502a85

9015

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

9016

Date: Fri Dec 3 14:36:27 2010 +0100

9017

9018

chatroom-mamanger: monitor for file changes (#636360)

9019

9020

libempathy/empathy-chatroom-manager.c | 87

9021

++++++++++++++++++++++++++++-----

9022

1 files changed, 74 insertions(+), 13 deletions(-)

9023

9024

commit fd337e4163b26ea7e284473817a1d17946ab12d4

4308

9025

Author: Jonny Lamb <jonnylamb@gnome.org>

4309

9026

Date: Fri Dec 3 13:04:04 2010 +0000

4310

9027

4318

9035

+++++++++++++++++++++++++----

4319

9036

3 files changed, 74 insertions(+), 13 deletions(-)

4320

9037

4321

commit bde7600cd918d7654667f0543b2fc904b8a79680

9038

commit 2b5028d1ec652a136f30d7b3955562a6a07f9f42

4322

9039

Author: Jonny Lamb <jonnylamb@gnome.org>

4323

9040

Date: Fri Dec 3 13:03:28 2010 +0000

4324

9041

4332

9049

libempathy/empathy-server-sasl-handler.h | 5 +++-

4333

9050

3 files changed, 38 insertions(+), 4 deletions(-)

4334

9051

4335

commit 0b8d4b2aa09ea0a1e4829ced9a0ba626202bc069

9052

commit bdbece32463e83f646d0c031f4cb2a8557a7e76d

9053

Author: Gabor Kelemen <kelemeng@gnome.hu>

9054

Date: Fri Dec 3 12:40:53 2010 +0100

9055

9056

Fix another article

9057

9058

help/hu/hu.po | 2 +-

9059

1 files changed, 1 insertions(+), 1 deletions(-)

9060

9061

commit 0a84aa6ec9ab1ccf86e4d4d79a6f2fee8eaaa147

9062

Author: Gabor Kelemen <kelemeng@gnome.hu>

9063

Date: Fri Dec 3 12:38:07 2010 +0100

9064

9065

Fix article

9066

9067

help/hu/hu.po | 2 +-

9068

1 files changed, 1 insertions(+), 1 deletions(-)

9069

9070

commit 922b5acaf43a0653447622fc022d37757357dc36

9071

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

9072

Date: Thu Dec 2 16:07:05 2010 +0100

9073

9074

rename unused empathy_chatroom_manager_chat_handled()

9075

9076

libempathy/empathy-chatroom-manager.c | 33

9077

---------------------------------

9078

libempathy/empathy-chatroom-manager.h | 4 ----

9079

2 files changed, 0 insertions(+), 37 deletions(-)

9080

9081

commit b6376eb0eb55563b0ba8d063ad8fe139a704fbd7

9082

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

9083

Date: Thu Dec 2 16:05:35 2010 +0100

9084

9085

chatroom-manager: use a room channel Observer (#636202)

9086

9087

libempathy/empathy-chatroom-manager.c | 107

9088

+++++++++++++++++++++++++++++++++

9089

1 files changed, 107 insertions(+), 0 deletions(-)

9090

9091

commit b82b08de181b134cde387c0e634b8f5afc53a201

9092

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

9093

Date: Thu Dec 2 15:12:41 2010 +0100

9094

9095

chat-manager: stop telling the chat mgr about handled rooms

9096

9097

Now that the chat handler has moved to its own process this is

9098

no longer

9099

enough. The instance of the chat manager in empathy doesn't know

9100

about the

9101

handlded channels.

9102

9103

The chat manager should implement an Observer instead to know about

9104

all the

9105

rooms.

9106

9107

src/empathy-chat-manager.c | 18 ------------------

9108

1 files changed, 0 insertions(+), 18 deletions(-)

9109

9110

commit 3ea940ebbbc219521ce3674a703fe036aebd96bb

9111

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

9112

Date: Thu Dec 2 14:58:06 2010 +0100

9113

9114

remove empathy_chatroom_manager_get_count()

9115

9116

We don't use it any more.

9117

9118

libempathy/empathy-chatroom-manager.c | 28 ----------------------------

9119

libempathy/empathy-chatroom-manager.h | 3 ---

9120

2 files changed, 0 insertions(+), 31 deletions(-)

9121

9122

commit d8ecfc7dd920283a8e3c15b31a6b04087aef9936

9123

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

9124

Date: Thu Dec 2 11:53:51 2010 +0100

9125

9126

chatroom-manager: unify coding style

9127

9128

Most of the file was already using the new style so best stay

9129

coherent.

9130

9131

libempathy/empathy-chatroom-manager.c | 526

9132

+++++++++++++++++----------------

9133

libempathy/empathy-chatroom-manager.h | 67 +++--

9134

2 files changed, 304 insertions(+), 289 deletions(-)

9135

9136

commit b1782d8dea042c29a50152db4c3bd63da80f3c02

9137

Merge: a955dcb 228251c

9138

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

9139

Date: Wed Dec 1 15:50:11 2010 +0100

9140

9141

Merge branch 'irc-grab-636203'

9142

9143

commit 1994d674ad7b35e8b4a5db7f431c31414d1230f3

4336

9144

Author: Jonny Lamb <jonnylamb@gnome.org>

4337

9145

Date: Wed Dec 1 14:48:13 2010 +0000

4338

9146

4344

9152

+++++++++++++++++++++++++++++++++++++++++++-

4345

9153

1 files changed, 69 insertions(+), 2 deletions(-)

4346

9154

4347

commit 951b3bd8c26334d04b7824a29e036917f4ba09d4

9155

commit 81d9ab0e356681fb49c43c7bd7bf75bdf84122bc

4348

9156

Author: Jonny Lamb <jonnylamb@gnome.org>

4349

9157

Date: Wed Dec 1 14:47:39 2010 +0000

4350

9158

4356

9164

++++++++++++++++++++++++++++++++-----

4357

9165

1 files changed, 78 insertions(+), 12 deletions(-)

4358

9166

4359

commit 179062a32e3f79c99754b64062046203ab5d7514

9167

commit 2aef97996f1b3e033ad886cc80f66a0e3b4e1957

4360

9168

Author: Jonny Lamb <jonnylamb@gnome.org>

4361

9169

Date: Wed Dec 1 14:46:44 2010 +0000

4362

9170

4370

9178

libempathy/empathy-server-sasl-handler.h | 71 ++++++++

4371

9179

3 files changed, 337 insertions(+), 0 deletions(-)

4372

9180

4373

commit 245481a015d4be974380d83b7ad82968484760cf

9181

commit fcd80516f561eec897df4c750a1d15573bbdeb91

4374

9182

Author: Jonny Lamb <jonnylamb@gnome.org>

4375

9183

Date: Wed Dec 1 14:40:35 2010 +0000

4376

9184

4381

9189

libempathy/empathy-auth-factory.c | 10 ++++++++++

4382

9190

1 files changed, 10 insertions(+), 0 deletions(-)

4383

9191

4384

commit 57ca914aeb38828d9eaafd51ecbc790de8216497

9192

commit 53ead42832d2af12c9487a6f8b370787442940f9

4385

9193

Author: Jonny Lamb <jonnylamb@gnome.org>

4386

9194

Date: Wed Dec 1 14:39:48 2010 +0000

4387

9195

4393

9201

libempathy/empathy-auth-factory.c | 13 ++++++++++++-

4394

9202

2 files changed, 16 insertions(+), 1 deletions(-)

4395

9203

4396

commit a2973dd5a7acca3a1149f0fc59a74bb46d512935

9204

commit a76960e927b5f32387c17bb580d360669d6aace8

4397

9205

Author: Jonny Lamb <jonnylamb@gnome.org>

4398

9206

Date: Wed Dec 1 14:39:00 2010 +0000

4399

9207

4405

9213

libempathy/empathy-debug.h | 1 +

4406

9214

2 files changed, 2 insertions(+), 0 deletions(-)

4407

9215

4408

commit f106be9436da4364e224815bd7fe18107c8fde5b

9216

commit 2f8390928641951691bc6d5b86a4310b2d81fc3d

4409

9217

Author: Jonny Lamb <jonnylamb@gnome.org>

4410

9218

Date: Wed Dec 1 14:37:40 2010 +0000

4411

9219

4416

9224

configure.ac | 2 +-

4417

9225

1 files changed, 1 insertions(+), 1 deletions(-)

4418

9226

4419

commit 898b148e09e903e65373f859dcc7724d69d5a582

9227

commit a955dcbb4b7182a030974e80e6c6bee823392fad

9228

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

9229

Date: Wed Dec 1 14:52:24 2010 +0100

9230

9231

tp-contact-factory: request avatar feature

9232

9233

We still create TpContact for muc contacts list where we want

9234

to display

9235

avatars (#636207).

9236

9237

libempathy/empathy-tp-contact-factory.c | 1 +

9238

1 files changed, 1 insertions(+), 0 deletions(-)

9239

9240

commit 228251c3b10a22dedd3f3928561f08bbcae040a1

9241

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

9242

Date: Wed Dec 1 14:03:31 2010 +0100

9243

9244

Check if apply button has a top level window before calling

9245

gtk_widget_grab_default()

9246

9247

IRC widgets don't have any mandatory argument, so the account is

9248

valid before

9249

the widget has been packed into the accounts

9250

dialog. gtk_widget_grab_default()

9251

can't be called on a widget not having a top level window. (#636203)

9252

9253

libempathy-gtk/empathy-account-widget.c | 13 +++++++++++--

9254

1 files changed, 11 insertions(+), 2 deletions(-)

9255

9256

commit 1f5ddc41bf768c11138edc049f1f70192cbd82a1

9257

Author: Jonny Lamb <jonnylamb@gnome.org>

9258

Date: Tue Nov 30 17:50:24 2010 +0000

9259

9260

empathy-spell: implement _get_enabled_language_codes with

9261

--disable-spell

9262

9263

Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

9264

9265

libempathy-gtk/empathy-spell.c | 7 +++++++

9266

1 files changed, 7 insertions(+), 0 deletions(-)

9267

9268

commit b6a08a8526af02877f97e1bd234fa5f4aace1464

9269

Author: Jonny Lamb <jonnylamb@gnome.org>

9270

Date: Tue Nov 30 17:48:23 2010 +0000

9271

9272

empathy-spell: updated _get_suggestions disabled implementation

9273

9274

Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

9275

9276

libempathy-gtk/empathy-spell.c | 3 ++-

9277

1 files changed, 2 insertions(+), 1 deletions(-)

9278

9279

commit d69fe12699f6b07fc0f39dea2f18c3c87d3367db

9280

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

9281

Date: Tue Nov 30 16:12:42 2010 +0100

9282

9283

update copyrights

9284

9285

libempathy-gtk/empathy-chat.c | 2 +-

9286

src/empathy-chat-window.c | 2 +-

9287

2 files changed, 2 insertions(+), 2 deletions(-)

9288

9289

commit f275b954b00f0e49b2104cac312a99a420acbb46

9290

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

9291

Date: Tue Nov 30 16:11:38 2010 +0100

9292

9293

remove old defines

9294

9295

libempathy-gtk/empathy-chat.c | 3 ---

9296

1 files changed, 0 insertions(+), 3 deletions(-)

9297

9298

commit 16b77581e53f068035343c0daf302ffb73303134

9299

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

9300

Date: Tue Nov 30 14:58:09 2010 +0100

9301

9302

chat-window: don't display notifications for pending messages

9303

(#635513)

9304

9305

src/empathy-chat-window.c | 6 +++++-

9306

1 files changed, 5 insertions(+), 1 deletions(-)

9307

9308

commit fb049bcc5f5622b56112c947b5b571c6f0956671

9309

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

9310

Date: Tue Nov 30 14:56:39 2010 +0100

9311

9312

EmpathyChat::new-message: tell if the message is a pending one or not

9313

9314

libempathy-gtk/empathy-chat.c | 16 ++++++++++------

9315

src/empathy-chat-window.c | 1 +

9316

2 files changed, 11 insertions(+), 6 deletions(-)

9317

9318

commit 6d1261917c33f372f254ed84c3c6956c1e90fbc5

9319

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

9320

Date: Tue Nov 30 14:10:19 2010 +0100

9321

9322

Stop calling gtk_menu_detach()

9323

9324

GTK+ does it for us now:

9325

http://git.gnome.org/browse/gtk+/commit/?id=6716e7c3f1925560a5b4901581cabbaee4e01e28

9326

9327

libempathy-gtk/empathy-contact-list-view.c | 4 ----

9328

libempathy-gtk/empathy-individual-view.c | 2 --

9329

2 files changed, 0 insertions(+), 6 deletions(-)

9330

9331

commit 5a39893c82e21a54b6156054f45f8db9c5a9802c

9332

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

9333

Date: Tue Nov 30 12:52:46 2010 +0100

9334

9335

empathy_sound_manager_dup_singleton: add G_LIKELY

9336

9337

libempathy-gtk/empathy-sound-manager.c | 2 +-

9338

1 files changed, 1 insertions(+), 1 deletions(-)

9339

9340

commit 47ecf4b12ab06848e3fcb685529f85df3ec3d045

9341

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

9342

Date: Tue Nov 30 12:51:58 2010 +0100

9343

9344

fix typo in comment

9345

9346

libempathy-gtk/empathy-sound-manager.c | 2 +-

9347

1 files changed, 1 insertions(+), 1 deletions(-)

9348

9349

commit 645a49863a63b917b1ea648f791824fee9efaa00

9350

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

9351

Date: Tue Nov 30 12:51:36 2010 +0100

9352

9353

sound-manager: update copyright

9354

9355

libempathy-gtk/empathy-sound-manager.c | 2 +-

9356

1 files changed, 1 insertions(+), 1 deletions(-)

9357

9358

commit 24f77567c932c7693b3051156f8d5ca4499c6d8c

9359

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

9360

Date: Tue Nov 30 11:48:04 2010 +0100

9361

9362

sound-manager: cache the sound GSettings

9363

9364

libempathy-gtk/empathy-sound-manager.c | 39

9365

++++++++++++-------------------

9366

1 files changed, 15 insertions(+), 24 deletions(-)

9367

9368

commit 7c0d36e3d1604a4056934bc1a44e89d0e0875051

9369

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

9370

Date: Tue Nov 30 11:42:33 2010 +0100

9371

9372

sound-manager: move repeating_sounds to EmpathySoundManagerPrivate

9373

9374

libempathy-gtk/empathy-sound-manager.c | 137

9375

+++++++++++++++++--------------

9376

1 files changed, 75 insertions(+), 62 deletions(-)

9377

9378

commit 81068bbf3ebd6c251f308d6d45e4dadf07432ea7

9379

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

9380

Date: Tue Nov 30 11:24:20 2010 +0100

9381

9382

move sound functions to EmpathySoundManager methods

9383

9384

libempathy-gtk/empathy-sound-manager.c | 34

9385

+++++++++++++++++++++----------

9386

libempathy-gtk/empathy-sound-manager.h | 19 +++++++++++++----

9387

src/empathy-call-window.c | 15 ++++++++++---

9388

src/empathy-chat-window.c | 9 ++++++-

9389

src/empathy-event-manager.c | 30 ++++++++++++++++++++-------

9390

src/empathy-main-window.c | 10 +++++++-

9391

6 files changed, 85 insertions(+), 32 deletions(-)

9392

9393

commit 8172bca03c6f85d7dcc0ff39f1a81ccfd719b08b

9394

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

9395

Date: Tue Nov 30 10:29:00 2010 +0100

9396

9397

add EmpathySoundManager stub object (#636067)

9398

9399

libempathy-gtk/empathy-sound-manager.c | 34

9400

++++++++++++++++++++++++++++++++

9401

libempathy-gtk/empathy-sound-manager.h | 26 ++++++++++++++++++++++++

9402

2 files changed, 60 insertions(+), 0 deletions(-)

9403

9404

commit 0dca19234c147a94609c6659660e83135e765b9c

9405

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

9406

Date: Tue Nov 30 10:14:33 2010 +0100

9407

9408

move empathy-sound to empathy-sound-manager

9409

9410

libempathy-gtk/Makefile.am | 4 +-

9411

libempathy-gtk/empathy-sound-manager.c | 389

9412

++++++++++++++++++++++++++++++++

9413

libempathy-gtk/empathy-sound-manager.h | 56 +++++

9414

libempathy-gtk/empathy-sound.c | 389

9415

--------------------------------

9416

libempathy-gtk/empathy-sound.h | 56 -----

9417

po/POTFILES.in | 2 +-

9418

src/empathy-call-window.c | 2 +-

9419

src/empathy-chat-window.c | 2 +-

9420

src/empathy-event-manager.c | 2 +-

9421

src/empathy-main-window.c | 2 +-

9422

10 files changed, 452 insertions(+), 452 deletions(-)

9423

9424

commit ac0dab19efa8d17f3d7b0c9489a2d3ea06a00c6b

9425

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

9426

Date: Mon Nov 29 17:25:51 2010 +0100

9427

9428

remove released flag

9429

9430

configure.ac | 2 +-

9431

1 files changed, 1 insertions(+), 1 deletions(-)

9432

9433

commit 33d7e988e743ec40e3475c02ee2a3043c1d4a559

9434

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

9435

Date: Mon Nov 29 17:07:03 2010 +0100

9436

9437

add empathy-notifications-approver.c to POTFILES.in

9438

9439

po/POTFILES.in | 1 +

9440

1 files changed, 1 insertions(+), 0 deletions(-)

9441

9442

commit 1d033ef26ef053679d164686c8941727fe8c9883

9443

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

9444

Date: Mon Nov 29 16:59:07 2010 +0100

9445

9446

prepare 2.91.3 release

9447

9448

NEWS | 60

9449

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

9450

configure.ac | 4 +-

9451

2 files changed, 62 insertions(+), 2 deletions(-)

9452

9453

commit 6fb9b3aaa5c4b8cb82820548ada136380088584d

9454

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

9455

Date: Mon Nov 29 16:32:38 2010 +0100

9456

9457

event-manager: cache the UI GSettings

9458

9459

src/empathy-event-manager.c | 18 +++++++-----------

9460

1 files changed, 7 insertions(+), 11 deletions(-)

9461

9462

commit 6408432db9e2b1240c1cfea461d330ac0a01e49a

9463

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

9464

Date: Mon Nov 29 16:26:27 2010 +0100

9465

9466

event-manager: cache the notifications GSettings

9467

9468

src/empathy-event-manager.c | 12 ++++++++----

9469

1 files changed, 8 insertions(+), 4 deletions(-)

9470

9471

commit 086f0fc0375d06fa0c41cf921f883ed36fdb14d0

9472

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

9473

Date: Mon Nov 29 16:23:19 2010 +0100

9474

9475

theme_adium_parse_body: use the cache GSettings chat

9476

9477

libempathy-gtk/empathy-theme-adium.c | 12 ++++++------

9478

1 files changed, 6 insertions(+), 6 deletions(-)

9479

9480

commit d6b43c2ff67d2d90bf577990fb67917a01e38807

9481

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

9482

Date: Mon Nov 29 16:03:07 2010 +0100

9483

9484

notify-manager: cache the notification GSettings

9485

9486

libempathy-gtk/empathy-notify-manager.c | 27

9487

++++++++++++---------------

9488

1 files changed, 12 insertions(+), 15 deletions(-)

9489

9490

commit a8724cc2dcfcc320b6a3c1b1e39f5d3e3978b5af

9491

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

9492

Date: Mon Nov 29 15:53:42 2010 +0100

9493

9494

avatar-chooser: cache the UI GSettings

9495

9496

libempathy-gtk/empathy-avatar-chooser.c | 14 +++++++-------

9497

1 files changed, 7 insertions(+), 7 deletions(-)

9498

9499

commit b63808b139096d53264b90908efcc6e63b1c4170

9500

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

9501

Date: Mon Nov 29 15:47:35 2010 +0100

9502

9503

chat-text-view: cache the chat GSettings

9504

9505

libempathy-gtk/empathy-chat-text-view.c | 10 +++++-----

9506

1 files changed, 5 insertions(+), 5 deletions(-)

9507

9508

commit bcc2b4414470de50b757414471b52923d1849619

9509

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

9510

Date: Mon Nov 29 15:45:16 2010 +0100

9511

9512

empathy-chat-text-view: rename gsettings to gsettings_desktop

9513

9514

libempathy-gtk/empathy-chat-text-view.c | 11 ++++++-----

9515

1 files changed, 6 insertions(+), 5 deletions(-)

9516

9517

commit 8a9a8bc51095f76e502293b463de676a1f6bc517

9518

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

9519

Date: Mon Nov 29 15:40:11 2010 +0100

9520

9521

chat-window: cache the UI GSettings

9522

9523

src/empathy-chat-window.c | 8 ++++----

9524

1 files changed, 4 insertions(+), 4 deletions(-)

9525

9526

commit adda65622351cabb18517bef5ca853890e9829af

9527

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

9528

Date: Mon Nov 29 15:36:59 2010 +0100

9529

9530

chat-window: cache the notifications GSettings

9531

9532

src/empathy-chat-window.c | 10 ++++------

9533

1 files changed, 4 insertions(+), 6 deletions(-)

9534

9535

commit 87b4a33dd408c9d5fe33d9261b6185e1833696d5

9536

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

9537

Date: Mon Nov 29 08:53:08 2010 +0100

9538

9539

fix typo

9540

9541

configure.ac | 2 +-

9542

1 files changed, 1 insertions(+), 1 deletions(-)

9543

9544

commit aa70692e1a16219f2bbda8f129dd2888d1bb6341

9545

Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

9546

Date: Sat Nov 27 18:35:29 2010 +0000

9547

9548

Initialize libnotify properly to prevent crashes

9549

9550

If libnotify isn't initialized properly the app_name won't be set,

9551

causing it

9552

to eventually pass NULL for a string value to GVariant. Which nicely

9553

results in

9554

a SEGV.

9555

9556

src/empathy-chat.c | 6 ++++++

9557

1 files changed, 6 insertions(+), 0 deletions(-)

9558

9559

commit f2bc65f9bd9c5d47846ff44672a5a50e365d9da7

4420

9560

Author: Will Thompson <will.thompson@collabora.co.uk>

4421

Date: Wed Dec 8 18:59:41 2010 +0000

4422

4423

Compile with --without-ca-file

4424

4425

libempathy/empathy-tls-verifier.c | 2 ++

4426

1 files changed, 2 insertions(+), 0 deletions(-)

4427

4428

commit 0e3268df1dbe7ea6698cf6eed8982537274e726f

9561

Date: Fri Nov 26 18:03:55 2010 +0000

9562

9563

Debug window: Correct spelling of "misson-control"

9564

9565

It's been wrong for over a year, and no-one's noticed yet. :P

9566

9567

Reviewed-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

9568

9569

src/empathy-debug-window.c | 2 +-

9570

1 files changed, 1 insertions(+), 1 deletions(-)

9571

9572

commit 6d815f42f4b0203bb01b2658d71dfd0dedb164c6

9573

Merge: 5e3f159 72a4042

9574

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

9575

Date: Fri Nov 26 13:02:23 2010 +1100

9576

9577

Merge remote branch

9578

'glassrose/full_room_menu_never_insensitivated-597043'

9579

9580

commit 72a404293ef360571eda0eb45166517010daa247

9581

Author: Chandni Verma <chandniverma2112@gmail.com>

9582

Date: Thu Nov 25 07:42:51 2010 +0530

9583

9584

Only the required submenus of 'Room' menu are updated, not the

9585

entire menu.

9586

9587

Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=597043

9588

9589

src/empathy-main-window.c | 16 ++++++++++++++--

9590

1 files changed, 14 insertions(+), 2 deletions(-)

9591

9592

commit 5e3f159c66c8a68aad18c3d2ddd79ac9bc6ece79

9593

Merge: c487a45 212a4ec

9594

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

9595

Date: Thu Nov 25 10:25:44 2010 +0100

9596

9597

Merge branch 'notifications-635500'

9598

9599

commit c487a45a3509c2cda4bd712ed818924ccb09184f

9600

Author: A S Alam <aalam@users.sf.net>

9601

Date: Thu Nov 25 09:07:46 2010 +0530

9602

9603

update for Punjabi by A S Alam

9604

9605

po/pa.po | 701

9606

++++++++++++++++++++++++++++++++++----------------------------

9607

1 files changed, 380 insertions(+), 321 deletions(-)

9608

9609

commit 4b33293b29499f574955946aea70dae420e7accc

4429

9610

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

4430

9611

Date: Wed Nov 24 16:34:13 2010 +0100

4431

9612

4436

9617

libempathy-gtk/empathy-ui-utils.c | 7 +++++--

4437

9618

2 files changed, 6 insertions(+), 2 deletions(-)

4438

9619

4439

commit cfbd6ef2464d68d9d482a9a24c792de657ded74a

9620

commit fef8172419c5752d7d55e65cff3bd76a8176967e

4440

9621

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

4441

9622

Date: Wed Nov 24 16:07:00 2010 +0100

4442

9623

4445

9626

libempathy-gtk/empathy-individual-view.c | 1 +

4446

9627

1 files changed, 1 insertions(+), 0 deletions(-)

4447

9628

4448

commit d533c393c9ce04363f0c02dd8189260b5d9e85a0

9629

commit 5086e9b0734859f3bee5c0b0aa4b302a1e328b86

9630

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

9631

Date: Wed Nov 24 16:06:42 2010 +0100

9632

9633

rename empathy_individual_view_get_selected_group to

9634

empathy_individual_view_dup_selected_group

9635

9636

libempathy-gtk/empathy-individual-view.c | 8 ++++----

9637

libempathy-gtk/empathy-individual-view.h | 3 ---

9638

2 files changed, 4 insertions(+), 7 deletions(-)

9639

9640

commit 0894474e8cfed8dfa4824205a9d43e76269b50b0

4449

9641

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

4450

9642

Date: Wed Nov 24 16:01:02 2010 +0100

4451

9643

4454

9646

libempathy-gtk/empathy-log-window.c | 3 +++

4455

9647

1 files changed, 3 insertions(+), 0 deletions(-)

4456

9648

4457

commit 46ed2a7c40a6fe434bade2c7861024ea57f70e13

9649

commit 69afcc40e1fb02956b8ee0fad404b9afc776f64e

4458

9650

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

4459

9651

Date: Wed Nov 24 12:05:59 2010 +0100

4460

9652

4463

9655

libempathy-gtk/empathy-smiley-manager.c | 9 +++++----

4464

9656

1 files changed, 5 insertions(+), 4 deletions(-)

4465

9657

4466

commit b9ea52dc856586cc2876f698a35a6f4a912e8071

9658

commit 0313474daf288bd973ea491c530d26dd2df0fd28

4467

9659

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

4468

9660

Date: Wed Nov 24 12:00:11 2010 +0100

4469

9661

4472

9664

libempathy/empathy-message.c | 18 ++++++++++++------

4473

9665

1 files changed, 12 insertions(+), 6 deletions(-)

4474

9666

4475

commit aa538c7dca8eb35b813e30db34cbcea17ab54c9e

9667

commit 74f2bf579605389d30cc8fab50c7718f666ca7ee

4476

9668

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

4477

9669

Date: Wed Nov 24 11:57:59 2010 +0100

4478

9670

4481

9673

libempathy-gtk/empathy-chat.c | 1 +

4482

9674

1 files changed, 1 insertions(+), 0 deletions(-)

4483

9675

4484

commit 88934c2b6a90370a7495eeab78851cf718c9eec2

4485

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

4486

Date: Thu Nov 18 16:47:00 2010 +0100

4487

4488

remove released flag

9676

commit 212a4ecbdb3a41933a208f401f1803a930061cb7

9677

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

9678

Date: Tue Nov 23 11:56:17 2010 +0100

9679

9680

Clean up the way we keep references on notifications

9681

9682

src/empathy-notifications-approver.c | 23 +++++++++++++----------

9683

1 files changed, 13 insertions(+), 10 deletions(-)

9684

9685

commit 5196ab5cec62faae3ae7eaa3b3a9529fe7a2c33a

9686

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

9687

Date: Tue Nov 23 13:46:09 2010 +0100

9688

9689

use tp_g_signal_connect_object

9690

9691

src/empathy-notifications-approver.c | 12 ++++++------

9692

1 files changed, 6 insertions(+), 6 deletions(-)

9693

9694

commit 42547ca133381bad23066b1513fde237632515c7

9695

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

9696

Date: Tue Nov 23 13:42:37 2010 +0100

9697

9698

fix comment

9699

9700

src/empathy-notifications-approver.c | 2 +-

9701

1 files changed, 1 insertions(+), 1 deletions(-)

9702

9703

commit 43ed05000e87ed2798ab3bc222cc381b2859885f

9704

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

9705

Date: Mon Nov 22 12:53:17 2010 +0100

9706

9707

empathy.c: instantiate a EmpathyNotificationsApprover

9708

9709

src/empathy.c | 6 ++++++

9710

1 files changed, 6 insertions(+), 0 deletions(-)

9711

9712

commit dedc37ecea14c0752c8a23b77e73248dd8a6fe2b

9713

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

9714

Date: Mon Nov 22 12:52:31 2010 +0100

9715

9716

Move notifications code from status-icon to notifications-approver

9717

(#635500)

9718

9719

src/empathy-notifications-approver.c | 260

9720

++++++++++++++++++++++++++++++++++

9721

src/empathy-status-icon.c | 259

9722

---------------------------------

9723

2 files changed, 260 insertions(+), 259 deletions(-)

9724

9725

commit 426b89e06c978222479694873ec24d4dc8d2d2df

9726

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

9727

Date: Mon Nov 22 11:23:05 2010 +0100

9728

9729

add EmpathyNotificationsApprover

9730

9731

src/Makefile.am | 1 +

9732

src/empathy-notifications-approver.c | 107

9733

++++++++++++++++++++++++++++++++++

9734

src/empathy-notifications-approver.h | 58 ++++++++++++++++++

9735

3 files changed, 166 insertions(+), 0 deletions(-)

9736

9737

commit 13b07c1ae1c92c9b0a431576f6c78c95a46060fb

9738

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

9739

Date: Tue Nov 23 10:44:55 2010 +0100

9740

9741

empathy-av: early return if already activated

9742

9743

Purely esthetic change to look more like empathy-chat.c

9744

9745

src/empathy-av.c | 36 ++++++++++++++++++------------------

9746

1 files changed, 18 insertions(+), 18 deletions(-)

9747

9748

commit 141c0caa3b8e132466a0472caabce59549151f46

9749

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

9750

Date: Tue Nov 23 10:40:21 2010 +0100

9751

9752

empathy-chat: register the Handler when the app is activated

9753

9754

This avoid to raise warnings when the app is launched a second time.

9755

9756

src/empathy-chat.c | 24 +++++++++++++++---------

9757

1 files changed, 15 insertions(+), 9 deletions(-)

9758

9759

commit e218c8d18fffbba1f17dc44ba83825c7d8cdcc63

9760

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

9761

Date: Tue Nov 23 10:31:14 2010 +0100

9762

9763

empathy-chat: don't use G_APPLICATION_IS_SERVICE

9764

9765

It breaks EMPATHY_PERSIST (#635592). It's already done this way

9766

in empathy-av.

9767

9768

src/empathy-chat.c | 2 +-

9769

1 files changed, 1 insertions(+), 1 deletions(-)

9770

9771

commit 45cfb4b41984b7a227943666cf90a727ebee6e21

9772

Author: Nishio Futoshi <fut_nis@d3.dion.ne.jp>

9773

Date: Mon Nov 22 09:16:52 2010 +0100

9774

9775

Fix miss spelling quadrigraphs in the configure.ac file (#635262)

4489

9776

4490

9777

configure.ac | 2 +-

4491

9778

1 files changed, 1 insertions(+), 1 deletions(-)

4492

9779

4493

commit 6b79a837fd7fccbedfcd9541d3c71b1d37bd8cf5

4494

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

4495

Date: Thu Nov 18 16:09:36 2010 +0100

4496

4497

configure: blindy trust user if he provided a cert file

4498

4499

configure.ac | 3 ---

4500

1 files changed, 0 insertions(+), 3 deletions(-)

4501

4502

commit 26bcf722b57527c68dfec64afbe0671b2f8dda7e

4503

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

4504

Date: Thu Nov 18 15:56:13 2010 +0100

4505

4506

prepare 2.32.2

4507

4508

NEWS | 16 ++++++++++++++++

4509

configure.ac | 4 ++--

4510

2 files changed, 18 insertions(+), 2 deletions(-)

4511

4512

commit 48289f99b2d22956f87157250d4f40c719412a27

4513

Author: Brian Pepple <bpepple@fedoraproject.org>

4514

Date: Sat Nov 6 18:31:32 2010 -0400

4515

4516

Make ca-certs location configurable (#634197)

4517

4518

configure.ac | 33

4519

+++++++++++++++++++++++++++++++++

4520

libempathy/empathy-tls-verifier.c | 2 +-

4521

2 files changed, 34 insertions(+), 1 deletions(-)

4522

4523

commit 4034e5e3ddd88ec577387766548ca0454cdf6e1a

9780

commit c637edc7059b1e3ed9413b9ca097abd4e307f30b

9781

Merge: ac2b9a7 3acbe74

9782

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

9783

Date: Mon Nov 22 09:00:08 2010 +0100

9784

9785

Merge branch 'chat-resize-635022'

9786

9787

commit ac2b9a7a95a152f874bf250f4365072a3bc976e1

9788

Merge: 4b6678f 38f4477

9789

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

9790

Date: Mon Nov 22 16:52:18 2010 +1100

9791

9792

Merge remote branch 'glassrose/link_unfocussed_626560'

9793

9794

commit 38f4477ad6d36bc000db7f7388266007b194c0dd

9795

Author: Chandni Verma <chandniverma2112@gmail.com>

9796

Date: Mon Nov 15 04:42:44 2010 +0530

9797

9798

Label removed form list of focusable widgets

9799

9800

Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=626560

9801

9802

libempathy-gtk/empathy-account-widget.c | 11 +++++++++++

9803

1 files changed, 11 insertions(+), 0 deletions(-)

9804

9805

commit 4b6678f1a01a33d2aa171314bb139bd5236f0ae4

9806

Author: Yaron Shahrabani <sh.yaron@gmail.com>

9807

Date: Sun Nov 21 13:00:41 2010 +0200

9808

9809

Updated Hebrew translation.

9810

9811

po/he.po | 364

9812

+++++++++++++++++++++++++++++++-------------------------------

9813

1 files changed, 184 insertions(+), 180 deletions(-)

9814

9815

commit ad9aaac5b3c56b9bda4fc947804a690a2a2b125f

9816

Author: Dr.T.Vasudevan <agnihot3@gmail.com>

9817

Date: Sun Nov 21 12:00:39 2010 +0530

9818

9819

Updated Tamil translation

9820

9821

po/ta.po | 3 +--

9822

1 files changed, 1 insertions(+), 2 deletions(-)

9823

9824

commit 1f66a46ee6c848fc35d176bdd9c4d58d8d77d179

9825

Author: Kjartan Maraas <kmaraas@gnome.org>

9826

Date: Sat Nov 20 11:57:38 2010 +0100

9827

9828

Updated Norwegian bokmål translation

9829

9830

po/nb.po | 642

9831

+++++++++++++++++++++++++++++++++-----------------------------

9832

1 files changed, 342 insertions(+), 300 deletions(-)

9833

9834

commit 72730ceac9dda8713149277c6a784269b8cc398b

9835

Author: Gheyret T.Kenji <gheyret@gmail.com>

9836

Date: Sat Nov 20 11:00:29 2010 +0100

9837

9838

Added UG translation

9839

9840

po/ug.po | 384

9841

+++++++++++++++++++++++++++++++-------------------------------

9842

1 files changed, 194 insertions(+), 190 deletions(-)

9843

9844

commit f2240c6a236d4b9606aeb40b0de87acd30d43c16

9845

Author: Fran Diéguez <fran.dieguez@mabishu.com>

9846

Date: Sat Nov 20 01:44:39 2010 +0100

9847

9848

Updated Galician translations

9849

9850

po/gl.po | 212

9851

+++++++++++++++++++++++++++++++------------------------------

9852

1 files changed, 108 insertions(+), 104 deletions(-)

9853

9854

commit 5e77d512450ae808190819be621b09acc5fe1b55

9855

Author: Daniel Mustieles <daniel.mustieles@gmail.com>

9856

Date: Fri Nov 19 13:40:40 2010 +0100

9857

9858

Updated Spanish translation

9859

9860

po/es.po | 220

9861

+++++++++++++++++++++++++++++++------------------------------

9862

1 files changed, 112 insertions(+), 108 deletions(-)

9863

9864

commit 2b64bf3d16012a59a7d3b4cba68489af39c3f895

9865

Author: Ivar Smolin <okul@linux.ee>

9866

Date: Fri Nov 19 01:03:13 2010 +0200

9867

9868

[l10n] Updated Estonian translation

9869

9870

po/et.po | 5 ++++-

9871

1 files changed, 4 insertions(+), 1 deletions(-)

9872

9873

commit b7ec8cc620c82c4c9bdb3b851b50de8b324d7add

4524

9874

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

4525

9875

Date: Thu Nov 18 14:51:58 2010 +0100

4526

9876

4529

9879

libempathy-gtk/empathy-individual-store.c | 2 ++

4530

9880

1 files changed, 2 insertions(+), 0 deletions(-)

4531

9881

4532

commit 381af9c51c0bf36989edfefb5ac1a02dbdde1d6f

9882

commit 3f792393c4018956c7910e82c3680540612deeda

4533

9883

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

4534

9884

Date: Thu Nov 18 14:50:30 2010 +0100

4535

9885

4538

9888

libempathy-gtk/empathy-individual-store.c | 17 ++++++++++-------

4539

9889

1 files changed, 10 insertions(+), 7 deletions(-)

4540

9890

4541

commit b0bf4030adcc7b73eab4fffea81978213ebb7799

9891

commit 4d119f936fa8a692219fda73b5610482b554ba27

9892

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

9893

Date: Thu Nov 18 14:45:47 2010 +0100

9894

9895

cell_renderer_text_set_property: don't leak client types (#635105)

9896

9897

libempathy-gtk/empathy-cell-renderer-text.c | 1 +

9898

1 files changed, 1 insertions(+), 0 deletions(-)

9899

9900

commit 5594d66040047febc79e85fb99af61abcb3c8a39

4542

9901

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

4543

9902

Date: Thu Nov 18 14:18:05 2010 +0100

4544

9903

4547

9906

libempathy-gtk/empathy-individual-store.c | 2 ++

4548

9907

1 files changed, 2 insertions(+), 0 deletions(-)

4549

9908

4550

commit 03b6c0ae75f7d60be6e29451353fea87da6069f6

4551

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

4552

Date: Mon Nov 15 14:44:05 2010 +0100

4553

4554

remove released flag

4555

4556

configure.ac | 2 +-

4557

release.py | 1 +

4558

2 files changed, 2 insertions(+), 1 deletions(-)

4559

4560

commit 6cd889790503f0ca1adfdeda78e49bcd360a5a35

4561

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

4562

Date: Mon Nov 15 14:30:01 2010 +0100

4563

4564

prepare 2.32.1

4565

4566

NEWS | 24 ++++++++++++++++++++++++

4567

configure.ac | 6 +++---

4568

2 files changed, 27 insertions(+), 3 deletions(-)

4569

4570

commit 13c5732d3848d648af821c18e66fe79bb494fbac

4571

Author: Mattias Põldaru <mahfiaz gmail com>

4572

Date: Mon Nov 15 14:33:33 2010 +0200

9909

commit 3acbe74046df8d57fdf498acceacb2737be92d80

9910

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

9911

Date: Thu Nov 18 13:32:39 2010 +0100

9912

9913

chat: add a timer before saving the hpane position

9914

9915

This avoid to flood with D-Bus message when resizing the window

9916

(#635022).

9917

9918

libempathy-gtk/empathy-chat.c | 30 +++++++++++++++++++++++++-----

9919

1 files changed, 25 insertions(+), 5 deletions(-)

9920

9921

commit 220c1987a026a146dd8ae5121ac00e7fccd75339

9922

Author: Dr.T.Vasudevan <agnihot3@gmail.com>

9923

Date: Thu Nov 18 16:04:42 2010 +0530

9924

9925

Updated Tamil translation

9926

9927

po/ta.po | 5 ++++-

9928

1 files changed, 4 insertions(+), 1 deletions(-)

9929

9930

commit a2882b3bb676a2196fd647cf2d09a12bae201fbc

9931

Author: Dr.T.Vasudevan <agnihot3@gmail.com>

9932

Date: Thu Nov 18 16:01:20 2010 +0530

9933

9934

Updated Tamil translation

9935

9936

po/ta.po | 1176

9937

+++++++++++++++++++++++++++++++++-----------------------------

9938

1 files changed, 632 insertions(+), 544 deletions(-)

9939

9940

commit a68402544850f77879b85cf5f258696a8ebb332c

9941

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

9942

Date: Wed Nov 17 20:06:15 2010 +0100

9943

9944

set do-lost property on the gstrtpjitterbuffer element

9945

9946

data/element-properties | 3 +++

9947

1 files changed, 3 insertions(+), 0 deletions(-)

9948

9949

commit 06098ff7becaed9aff517fb693c18adf6a21cca0

9950

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

9951

Date: Wed Nov 17 17:12:46 2010 +0100

9952

9953

remove EMPATHY_CONTACT_LIST_STORE_COL_CLIENT_TYPES

9954

9955

It's unusd and we don't have this column in the model. (#635082)

9956

9957

libempathy-gtk/empathy-contact-list-store.h | 1 -

9958

1 files changed, 0 insertions(+), 1 deletions(-)

9959

9960

commit 479275712b6f5984d58728d28d9bad99c94108cf

9961

Merge: a631e25 de93254

9962

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

9963

Date: Wed Nov 17 15:29:01 2010 +0100

9964

9965

Merge branch 'bug-547658'

9966

9967

commit de93254a7b91ea0620a4b6ae1c5cad2d922add91

9968

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

9969

Date: Wed Nov 17 15:25:08 2010 +0100

9970

9971

Remove spurious comment

9972

9973

libempathy-gtk/empathy-cell-renderer-text.c | 1 -

9974

1 files changed, 0 insertions(+), 1 deletions(-)

9975

9976

commit 880bc8eddf459b8eb25dd2ee5189a0f160dc690d

9977

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

9978

Date: Wed Nov 17 12:16:17 2010 +0100

9979

9980

Display the phone next to the status

9981

9982

As shown in the mockup in bug 547658.

9983

9984

libempathy-gtk/empathy-cell-renderer-text.c | 34 ++++++++++++++++++++--

9985

libempathy-gtk/empathy-contact-list-store.h | 1 +

9986

libempathy-gtk/empathy-individual-view.c | 41

9987

+-------------------------

9988

3 files changed, 34 insertions(+), 42 deletions(-)

9989

9990

commit a631e25e2ec0d4fdf0f526a38df6171a6a6b26bd

9991

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

9992

Date: Wed Nov 17 09:39:43 2010 +0100

9993

9994

chat-window: cache the 'chat' gsettings

9995

9996

We use it each time the window is focused so best to reduce the

9997

D-Bus traffic

9998

(#635022).

9999

10000

src/empathy-chat-window.c | 10 +++++-----

10001

1 files changed, 5 insertions(+), 5 deletions(-)

10002

10003

commit 92be64204fc424a3b2756be253b985112dcedcf2

10004

Merge: d041967 8fd2127

10005

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

10006

Date: Tue Nov 16 14:12:28 2010 +0100

10007

10008

Merge remote branch 'vminko/fix-634688-v3'

10009

10010

commit d041967019edda596ad98bd6d27e928dc2b7fd53

10011

Merge: 7e37089 700d6bc

10012

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

10013

Date: Tue Nov 16 14:11:05 2010 +0100

10014

10015

Merge branch 'desktop-schema-626810'

10016

10017

commit 8fd21279bc061f25da3cf74690d7cdb74844f6e3

10018

Author: Vitaly Minko <vitaly.minko@gmail.com>

10019

Date: Tue Nov 16 14:10:23 2010 +0300

10020

10021

Need to set preferred height of the search bar manually (#634688).

10022

10023

libempathy-gtk/empathy-search-bar.c | 16 ++++++++++++++++

10024

1 files changed, 16 insertions(+), 0 deletions(-)

10025

10026

commit 7e37089963000a4dcce907f2e4e8849bd0c97a06

10027

Author: Ivar Smolin <okul@linux.ee>

10028

Date: Tue Nov 16 11:11:24 2010 +0200

4573

10029

4574

10030

[l10n] Updated Estonian translation

4575

10031

4576

po/et.po | 15 ++++++---------

4577

1 files changed, 6 insertions(+), 9 deletions(-)

4578

4579

commit 7170648c5790d2b8849c71139ac08be6778d2dd2

10032

po/et.po | 90

10033

++++++++++++++++++++++++++++++++++++++++++++++----------------

10034

1 files changed, 67 insertions(+), 23 deletions(-)

10035

10036

commit 700d6bc82ed3e3a83788c6ae27df0124157e847e

10037

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

10038

Date: Tue Nov 16 09:04:25 2010 +0100

10039

10040

fix identation

10041

10042

libempathy-gtk/empathy-theme-adium.c | 2 +-

10043

1 files changed, 1 insertions(+), 1 deletions(-)

10044

10045

commit 5938582ef659b024de1b59d923939721d7a3730b

10046

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

10047

Date: Thu Nov 11 16:33:01 2010 +0100

10048

10049

remove gconf dep

10050

10051

configure.ac | 2 --

10052

1 files changed, 0 insertions(+), 2 deletions(-)

10053

10054

commit 57c1b01434b3a92f3a55fb6d859aaa142bbb14a5

10055

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

10056

Date: Thu Nov 11 16:31:00 2010 +0100

10057

10058

accounts-panel: remove gconf bits (#634595)

10059

10060

This code is useless.

10061

10062

src/cc-empathy-accounts-panel.c | 9 ---------

10063

1 files changed, 0 insertions(+), 9 deletions(-)

10064

10065

commit 87f228d727344e28bb9d87f6a86845f6473a38b0

10066

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

10067

Date: Thu Nov 11 15:42:14 2010 +0100

10068

10069

use gsettings version of the document-font-name key (#626810)

10070

10071

libempathy-gtk/empathy-chat-text-view.c | 38

10072

++++++++++--------------------

10073

libempathy-gtk/empathy-theme-adium.c | 32 ++++++++++---------------

10074

libempathy/empathy-gsettings.h | 3 ++

10075

3 files changed, 29 insertions(+), 44 deletions(-)

10076

10077

commit a908b286fe5cc825f61cee64298395685b81b09d

10078

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

10079

Date: Thu Nov 11 15:19:48 2010 +0100

10080

10081

depend on gsettings-desktop-schemas

10082

10083

configure.ac | 1 +

10084

1 files changed, 1 insertions(+), 0 deletions(-)

10085

10086

commit 3889df3fdf5964f32a96912cee0c5b02e7bcfb58

10087

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

10088

Date: Mon Nov 15 17:57:27 2010 +0100

10089

10090

Only check for presence in presence-enabled personas 2.0

10091

10092

libempathy-gtk/empathy-individual-widget.c | 8 +++++++-

10093

1 files changed, 7 insertions(+), 1 deletions(-)

10094

10095

commit 1e22706c294c3b775d1963aabff29a0695ccf595

10096

Author: Jonny Lamb <jonnylamb@gnome.org>

10097

Date: Mon Oct 18 13:15:22 2010 +0100

10098

10099

empathy-individual-store: only check for presence in presence-enabled

10100

personas

10101

10102

Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

10103

10104

libempathy-gtk/empathy-individual-store.c | 8 +++++++-

10105

1 files changed, 7 insertions(+), 1 deletions(-)

10106

10107

commit c391eb0efd50b519218c317d0c14e34954a45f9a

10108

Author: Jonny Lamb <jonny.lamb@collabora.co.uk>

10109

Date: Thu Sep 30 18:24:10 2010 +0100

10110

10111

individual-widget: show a "on a phone" label in the individual view

10112

10113

Also refactor having a TpContact in the EmpathyIndividualViewPriv

10114

struct, so that contact info and client types info use the same

10115

TpContact.

10116

10117

Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

10118

10119

libempathy-gtk/empathy-individual-view.c | 3 +-

10120

libempathy-gtk/empathy-individual-widget.c | 157

10121

+++++++++++++++++++--------

10122

libempathy-gtk/empathy-individual-widget.h | 1 +

10123

libempathy-gtk/empathy-individual-widget.ui | 29 +++++

10124

4 files changed, 146 insertions(+), 44 deletions(-)

10125

10126

commit 6f9a0ae2e8dc6d71bc15bdc703cffec8851367ab

10127

Author: Jonny Lamb <jonny.lamb@collabora.co.uk>

10128

Date: Thu Sep 30 16:01:20 2010 +0100

10129

10130

contact: enable showing a phone next to contacts who are on phones

10131

10132

The future!

10133

10134

Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

10135

10136

libempathy-gtk/empathy-individual-store.c | 38 +++++++++++++++++++++

10137

libempathy-gtk/empathy-individual-store.h | 1 +

10138

libempathy-gtk/empathy-individual-view.c | 39 +++++++++++++++++++++

10139

libempathy/empathy-contact.c | 52

10140

++++++++++++++++++++++++++++-

10141

libempathy/empathy-contact.h | 1 +

10142

libempathy/empathy-tp-contact-factory.c | 1 +

10143

6 files changed, 131 insertions(+), 1 deletions(-)

10144

10145

commit 59f42ec7b50e15046fdd1b122c97a7f5d357922d

10146

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

10147

Date: Mon Nov 15 16:25:07 2010 +0100

10148

10149

don't set fill on the box containing buttons

10150

10151

src/empathy-accounts-dialog.ui | 1 +

10152

1 files changed, 1 insertions(+), 0 deletions(-)

10153

10154

commit a118a7cf1afc9858f1f4c6d7a10d949abf2fc210

10155

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

10156

Date: Mon Nov 15 16:18:47 2010 +0100

10157

10158

use gtk_box_pack_start() to pack our widget to the dialog (#634912)

10159

10160

src/empathy-accounts-dialog.c | 2 +-

10161

1 files changed, 1 insertions(+), 1 deletions(-)

10162

10163

commit 33d6d9dfbdeac6050a63912a9944b54e5c50d95f

10164

Merge: 24ffd0a 4de0e21

10165

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

10166

Date: Mon Nov 15 16:01:01 2010 +0100

10167

10168

Merge branch 'bug-607146'

10169

10170

commit 24ffd0a12ef01048052c420b73d9b374515cb2f8

10171

Author: Brian Pepple <bpepple@fedoraproject.org>

10172

Date: Sat Nov 6 18:31:32 2010 -0400

10173

10174

Make ca-certs location configurable (#634197)

10175

10176

configure.ac | 33

10177

+++++++++++++++++++++++++++++++++

10178

libempathy/empathy-tls-verifier.c | 2 +-

10179

2 files changed, 34 insertions(+), 1 deletions(-)

10180

10181

commit 4de0e218a3e225bbbfbbe3baf91036a262c0f782

10182

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

10183

Date: Mon Nov 15 14:51:27 2010 +0100

10184

10185

Make <Enter> on the account name try to log in

10186

10187

https://bugzilla.gnome.org/show_bug.cgi?id=607146

10188

10189

libempathy-gtk/empathy-account-widget.c | 20 ++++++++++++++++++++

10190

1 files changed, 20 insertions(+), 0 deletions(-)

10191

10192

commit 750f7705fe5d58f2c13a57d5e3c844aa0f205e10

10193

Merge: 4a8508f 1332eb9

10194

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

10195

Date: Mon Nov 15 14:44:35 2010 +0100

10196

10197

Merge branch 'trivia'

10198

10199

commit 4a8508f3b3a0c595add6908188a9a3e9c46c509a

10200

Merge: 2a549bd 8d93b86

10201

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

10202

Date: Mon Nov 15 14:14:08 2010 +0100

10203

10204

Merge remote branch 'zdra/configure'

10205

10206

commit 8d93b865c03829043b17010bc2bd7e3a89dbfb69

10207

Author: Xavier Claessens <xclaesse@gmail.com>

10208

Date: Mon Nov 15 13:40:43 2010 +0100

10209

10210

Group all harddeps in one pkg-config call

10211

10212

We do not support GTK2 anymore, so there is no point in keeping those

10213

10214

configure.ac | 13 ++++---------

10215

libempathy-gtk/Makefile.am | 6 +-----

10216

nautilus-sendto-plugin/Makefile.am | 3 +--

10217

src/Makefile.am | 6 ------

10218

tests/Makefile.am | 2 --

10219

tests/interactive/Makefile.am | 2 --

10220

6 files changed, 6 insertions(+), 26 deletions(-)

10221

10222

commit 2a549bda5cbe7972fe496a9e02d6a9911214205c

10223

Merge: c97e310 a05517d

10224

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

10225

Date: Mon Nov 15 12:59:01 2010 +0100

10226

10227

Merge branch 'bug-595305'

10228

10229

commit c97e3104c2ab967d22093d981ab57714ce840f67

10230

Author: Fran Diéguez <fran.dieguez@mabishu.com>

10231

Date: Mon Nov 15 12:52:43 2010 +0100

10232

10233

Updated Galician help translations

10234

10235

help/gl/gl.po | 235

10236

+++++++++++++++++++++++++++++++-------------------------

10237

1 files changed, 130 insertions(+), 105 deletions(-)

10238

10239

commit aec32ec878a4eac2f3d885c7643891f2206d82ac

4580

10240

Author: Ville-Pekka Vainio <vpivaini@cs.helsinki.fi>

4581

10241

Date: Mon Nov 15 13:52:02 2010 +0200

4582

10242

4586

10246

+++++++++++++++++++++++++++++++------------------------------

4587

10247

1 files changed, 66 insertions(+), 64 deletions(-)

4588

10248

4589

commit 60cca63e593c36f149a432b10fb795fcbcb27d34

10249

commit a05517d865e823e5bd939ae5efcc497ccadef066

10250

Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>

10251

Date: Mon Nov 15 12:31:36 2010 +0100

10252

10253

Add a close button to Previous Conversations

10254

10255

https://bugzilla.gnome.org/show_bug.cgi?id=595305

10256

10257

libempathy-gtk/empathy-log-window.c | 11 ++++++

10258

libempathy-gtk/empathy-log-window.ui | 58

10259

+++++++++++++++++++++++++++++++++-

10260

2 files changed, 68 insertions(+), 1 deletions(-)

10261

10262

commit 1332eb95a91fb7e4f001757f702e79002ad3aebc

10263

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

10264

Date: Mon Nov 15 11:38:43 2010 +0100

10265

10266

individual_store_contact_sort: account is not supposed to be NULL

10267

10268

libempathy-gtk/empathy-individual-store.c | 3 +++

10269

1 files changed, 3 insertions(+), 0 deletions(-)

10270

10271

commit 40c46616ed8b86375777610b6befc35f22914497

10272

Author: Fran Diéguez <fran.dieguez@mabishu.com>

10273

Date: Mon Nov 15 10:58:23 2010 +0100

10274

10275

Updated galician help translations

10276

10277

help/gl/gl.po | 45 ++++++++++++++++++++++++++++++++++++++++++++-

10278

1 files changed, 44 insertions(+), 1 deletions(-)

10279

10280

commit c607201736ed8dd846454bc0ad397865f01ad805

10281

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

10282

Date: Mon Nov 15 10:58:34 2010 +0100

10283

10284

bump folks dep to 0.3.2

10285

10286

configure.ac | 2 +-

10287

1 files changed, 1 insertions(+), 1 deletions(-)

10288

10289

commit 5d15b2ed1f68d17364a53549ceb503275c62769d

10290

Merge: cb0e2e0 ff49ee8

10291

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

10292

Date: Mon Nov 15 10:54:18 2010 +0100

10293

10294

Merge remote branch 'pwith/634754-folks-api-changes'

10295

10296

commit cb0e2e0239d2bdad3aa4afbd683684f9ca2d1815

10297

Merge: bf03b8e 875bf69

10298

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

10299

Date: Mon Nov 15 10:12:05 2010 +0100

10300

10301

Merge remote branch 'vminko/fix-633481-v2'

10302

10303

commit bf03b8eec2f65636fde1abd1c9daddc7e2e2310d

10304

Author: Matej Urbančič <mateju@svn.gnome.org>

10305

Date: Sun Nov 14 12:20:27 2010 +0100

10306

10307

Updated Slovenian translation

10308

10309

po/sl.po | 211

10310

+++++++++++++++++++++++++++++---------------------------------

10311

1 files changed, 99 insertions(+), 112 deletions(-)

10312

10313

commit 56b049b0bc721d16378f2c2ab57d8f29ffc9ef71

10314

Author: Gheyret T.Kenji <gheyret@gmail.com>

10315

Date: Sat Nov 13 23:47:18 2010 +0100

10316

10317

Added UG translation

10318

10319

po/LINGUAS | 1 +

10320

1 files changed, 1 insertions(+), 0 deletions(-)

10321

10322

commit e46c802a4071583cd642cfd2e2ac6090fe8c191b

4590

10323

Author: Ville-Pekka Vainio <vpivaini@cs.helsinki.fi>

4591

10324

Date: Sun Nov 14 00:40:10 2010 +0200

4592

10325

4596

10329

++++++++++++++++++++++++++++++++++----------------------------

4597

10330

1 files changed, 528 insertions(+), 444 deletions(-)

4598

10331

4599

commit e81fd7046b162028cdb6815f506c5228d8dd4af1

10332

commit 2e8e24cd771f95e98de65219f7a70116088e1afa

10333

Author: Gheyret T.Kenji <gheyret@gmail.com>

10334

Date: Sat Nov 13 21:49:27 2010 +0100

10335

10336

Added UG translation

10337

10338

po/ug.po | 3740

10339

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

10340

1 files changed, 3740 insertions(+), 0 deletions(-)

10341

10342

commit ff49ee828e63dd35b5c4faf3a0ccd962c7cd63a8

10343

Author: Philip Withnall <philip@tecnocode.co.uk>

10344

Date: Sat Nov 13 14:07:46 2010 +0000

10345

10346

Stop using removed Individual convenience methods from folks

10347

10348

They were removed from folks with commit

10349

def47dffa31a95ec6bd333f43c69822416098283. This doesn't require

10350

a dependency

10351

bump, since they're being replaced with calls to methods which exist

10352

in folks

10353

0.3.1. See: bgo#629078. Closes: bgo#634754

10354

10355

.../empathy-individual-information-dialog.c | 2 +-

10356

libempathy-gtk/empathy-individual-store.c | 42

10357

++++++++++---------

10358

libempathy-gtk/empathy-individual-view.c | 6 +-

10359

libempathy-gtk/empathy-linking-dialog.c | 2 +-

10360

libempathy-gtk/empathy-ui-utils.c | 3 +-

10361

libempathy/empathy-individual-manager.c | 2 +-

10362

6 files changed, 30 insertions(+), 27 deletions(-)

10363

10364

commit 2b1e108d1d4f19249c3fe666503e86df0da720dd

10365

Author: Fran Diéguez <fran.dieguez@mabishu.com>

10366

Date: Sat Nov 13 01:11:19 2010 +0100

10367

10368

Updated Galician translations

10369

10370

po/gl.po | 394

10371

++++++++++++++++++++++++++++++++++----------------------------

10372

1 files changed, 214 insertions(+), 180 deletions(-)

10373

10374

commit 875bf697d54f1c4ca98478ded849bc733828f758

10375

Author: Vitaly Minko <vitaly.minko@gmail.com>

10376

Date: Fri Nov 12 17:47:51 2010 +0300

10377

10378

Make AccountChooser-related code simpler and clearer (re #633481).

10379

10380

libempathy-gtk/empathy-account-chooser.c | 32 ++++++++++++++++++----

10381

libempathy-gtk/empathy-new-message-dialog.c | 33 +++-------------------

10382

src/empathy-new-chatroom-dialog.c | 38

10383

++++----------------------

10384

3 files changed, 37 insertions(+), 66 deletions(-)

10385

10386

commit eb67ffa2d04e73f078f969f751c45678dc35a430

10387

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

10388

Date: Fri Nov 12 11:10:19 2010 +0100

10389

10390

cell-renderer-text: implement get_preferred_height_for_width instead

10391

of get_size (#628043)

10392

10393

libempathy-gtk/empathy-cell-renderer-text.c | 52

10394

++++++++++----------------

10395

1 files changed, 20 insertions(+), 32 deletions(-)

10396

10397

commit 618c05bffb618c1ce5321c354e605afbdcec5553

10398

Author: Daniel Mustieles <daniel.mustieles@gmail.com>

10399

Date: Thu Nov 11 17:22:30 2010 +0100

10400

10401

Updated Spanish translation

10402

10403

po/es.po | 262

10404

++++++++++++++++++++++++++++++++------------------------------

10405

1 files changed, 136 insertions(+), 126 deletions(-)

10406

10407

commit c87c03791366d2d038f2854c171e0c91e17207aa

10408

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

10409

Date: Thu Nov 11 15:03:46 2010 +0100

10410

10411

input-text-view: use get_preferred_height instead of size_request

10412

10413

libempathy-gtk/empathy-input-text-view.c | 25 +++++++++++--------------

10414

1 files changed, 11 insertions(+), 14 deletions(-)

10415

10416

commit 379f636d605a99f04fbd29481ff755e783f34707

10417

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

10418

Date: Thu Nov 11 14:41:05 2010 +0100

10419

10420

move size-requst handling in input-text-view

10421

10422

libempathy-gtk/empathy-chat.c | 38 -----------------------

10423

libempathy-gtk/empathy-input-text-view.c | 49

10424

+++++++++++++++++++++++++++++-

10425

2 files changed, 48 insertions(+), 39 deletions(-)

10426

10427

commit 1c7e66a2a609bf5e956c6f76bf7db7e585860731

10428

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

10429

Date: Thu Nov 11 14:31:09 2010 +0100

10430

10431

add EmpathyInputTextView

10432

10433

libempathy-gtk/Makefile.am | 2 +

10434

libempathy-gtk/empathy-chat.c | 11 +----

10435

libempathy-gtk/empathy-input-text-view.c | 62

10436

++++++++++++++++++++++++++++++

10437

libempathy-gtk/empathy-input-text-view.h | 62

10438

++++++++++++++++++++++++++++++

10439

4 files changed, 129 insertions(+), 8 deletions(-)

10440

10441

commit b1ca9031bfee03b12d6a4002d223b96a03810c20

10442

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

10443

Date: Thu Nov 11 13:52:40 2010 +0100

10444

10445

empathy-chat: remove the size-request hack (#633835)

10446

10447

It just work with GTK+3 \o/

10448

10449

libempathy-gtk/empathy-chat.c | 51

10450

-----------------------------------------

10451

1 files changed, 0 insertions(+), 51 deletions(-)

10452

10453

commit 3055c76a94c9628ef30da3bcdf1ca894cb671796

10454

Author: Vitaly Minko <vitaly.mink@gmail.com>

10455

Date: Thu Nov 11 13:32:45 2010 +0100

10456

10457

Display text in verbatim (#625745)

10458

10459

libempathy-gtk/empathy-theme-adium.c | 6 ++++++

10460

1 files changed, 6 insertions(+), 0 deletions(-)

10461

10462

commit 18d649cbfd8eda7678957a3d2a76b9bb8681a981

10463

Author: Vitaly Minko <vitaly.minko@gmail.com>

10464

Date: Wed Nov 10 20:23:39 2010 +0300

10465

10466

Make AccountChooser filters asynchronous to let them handle newly

10467

connected accounts properly (#633481).

10468

10469

libempathy-gtk/empathy-account-chooser.c | 87

10470

++++++++++++++-----

10471

libempathy-gtk/empathy-account-chooser.h | 26 +++++-

10472

libempathy-gtk/empathy-contact-dialogs.c | 16 ++--

10473

libempathy-gtk/empathy-contact-selector-dialog.c | 12 ++-

10474

libempathy-gtk/empathy-contact-selector-dialog.h | 6 +-

10475

libempathy-gtk/empathy-individual-dialogs.c | 11 ++-

10476

libempathy-gtk/empathy-new-call-dialog.c | 86

10477

++++++++++++++----

10478

libempathy-gtk/empathy-new-message-dialog.c | 85

10479

++++++++++++++----

10480

src/empathy-new-chatroom-dialog.c | 103

10481

++++++++++++++++-----

10482

tests/interactive/test-empathy-account-chooser.c | 6 +-

10483

10 files changed, 336 insertions(+), 102 deletions(-)

10484

10485

commit c6cd722328a112e8f4b015ca57ffe8dc72f50cd8

10486

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

10487

Date: Tue Nov 9 09:59:32 2010 +0100

10488

10489

about-dialog: add my email

10490

10491

src/empathy-about-dialog.c | 2 +-

10492

1 files changed, 1 insertions(+), 1 deletions(-)

10493

10494

commit 1cb5c43aef3aa182fa8b3b5aca74461ce7e90ab9

10495

Merge: 13953e5 ccb133e

10496

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

10497

Date: Tue Nov 9 09:49:25 2010 +0100

10498

10499

Merge branch 'subscription-msg-630707'

10500

10501

commit 13953e50b8935ffcec168ffee32697a76ebf3db0

10502

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

10503

Date: Tue Nov 9 09:39:10 2010 +0100

10504

10505

init GTK+ before empathy-gtk

10506

10507

src/empathy-debugger.c | 1 +

10508

1 files changed, 1 insertions(+), 0 deletions(-)

10509

10510

commit ccb133e0244bd3812c0d40661942f0e003a8ea03

10511

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

10512

Date: Tue Nov 9 09:18:04 2010 +0100

10513

10514

pass message to empathy_subscription_dialog_show

10515

10516

src/empathy-event-manager.c | 3 ++-

10517

1 files changed, 2 insertions(+), 1 deletions(-)

10518

10519

commit e390a8a182a198b0e7a8f60a760773019f6d4e08

10520

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

10521

Date: Wed Oct 27 18:57:08 2010 +0200

10522

10523

empathy_subscription_dialog_show: display user's message if any

10524

(#630707)

10525

10526

libempathy-gtk/empathy-contact-dialogs.c | 25 ++++++++++++++++++++++++-

10527

libempathy-gtk/empathy-contact-dialogs.h | 1 +

10528

src/empathy-event-manager.c | 2 +-

10529

3 files changed, 26 insertions(+), 2 deletions(-)

10530

10531

commit 877ea6bc7673b4a3a31be2528a3f6e4bcad4262e

10532

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

10533

Date: Thu Oct 28 15:08:18 2010 +0200

10534

10535

Add Accept/Decline button in subscription notifications (#630706)

10536

10537

src/empathy-status-icon.c | 54

10538

+++++++++++++++++++++++++++++++++++++++++++++

10539

1 files changed, 54 insertions(+), 0 deletions(-)

10540

10541

commit 2d91d86e1638f3c9a9be8be63ff974a8fc28d9ce

10542

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

10543

Date: Thu Oct 28 14:57:38 2010 +0200

10544

10545

add empathy_event_remove()

10546

10547

src/empathy-event-manager.c | 10 ++++++++--

10548

src/empathy-event-manager.h | 1 +

10549

2 files changed, 9 insertions(+), 2 deletions(-)

10550

10551

commit a42effc9db9ad032587ded4d095bc8339b77a2ae

10552

Author: Yaron Shahrabani <sh.yaron@gmail.com>

10553

Date: Mon Nov 8 23:21:19 2010 +0200

10554

10555

Updated Hebrew translation.

10556

10557

po/he.po | 106

10558

++++++++++++++++++++++++++++++++++----------------------------

10559

1 files changed, 58 insertions(+), 48 deletions(-)

10560

10561

commit 8b856d4c77dd9dff397ff840ec318cab05c5bba7

10562

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

10563

Date: Mon Nov 8 16:31:38 2010 +0100

10564

10565

remove released flag

10566

10567

configure.ac | 2 +-

10568

1 files changed, 1 insertions(+), 1 deletions(-)

10569

10570

commit 61276718fc0643e8951219748b3dd4ee0b282d23

10571

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

10572

Date: Mon Nov 8 16:23:20 2010 +0100

10573

10574

coding style fixes

10575

10576

libempathy-gtk/empathy-chat.c | 4 ++--

10577

libempathy-gtk/empathy-presence-chooser.c | 2 +-

10578

2 files changed, 3 insertions(+), 3 deletions(-)

10579

10580

commit 859b7a4bd567c16b210870a41bacf8356cbd0ebc

10581

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

10582

Date: Mon Nov 8 16:21:42 2010 +0100

10583

10584

add empathy-chat to POTFILES.in

10585

10586

po/POTFILES.in | 1 +

10587

1 files changed, 1 insertions(+), 0 deletions(-)

10588

10589

commit 8ba1faac4239c80e8726ecfc868735584383f1b4

10590

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

10591

Date: Mon Nov 8 16:15:29 2010 +0100

10592

10593

fix typo in NEWS

10594

10595

NEWS | 2 +-

10596

1 files changed, 1 insertions(+), 1 deletions(-)

10597

10598

commit 51df29ca35c95707a1984976e447cb3f0bdeef7a

10599

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

10600

Date: Mon Nov 8 16:05:47 2010 +0100

10601

10602

prepare 2.91.2

10603

10604

NEWS | 56

10605

++++++++++++++++++++++++++++++++++++++++++++++++++++++++

10606

configure.ac | 4 ++--

10607

2 files changed, 58 insertions(+), 2 deletions(-)

10608

10609

commit dd9ab9cab63618aed2e396b427ffcb9f4240fd6c

10610

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

10611

Date: Mon Nov 8 15:57:32 2010 +0100

10612

10613

Depend on latest GLib and GTK+ release

10614

10615

They have been API changes recently so we are not able to build

10616

with older

10617

versions.

10618

10619

configure.ac | 4 ++--

10620

1 files changed, 2 insertions(+), 2 deletions(-)

10621

10622

commit 779b303df490ffa5a044b36c44777e2e0f24cf8c

10623

Merge: 518b442 afb871a

10624

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

10625

Date: Mon Nov 8 13:39:22 2010 +0100

10626

10627

Merge branch 'preset-581029'

10628

10629

commit 518b442c06fcc98399440cfe282a319f4d2ba369

10630

Author: Mario Blättermann <mariobl@gnome.org>

10631

Date: Sat Nov 6 19:25:14 2010 +0100

10632

10633

[l10n] Updated German doc translation, fixed some more XML errors

10634

10635

help/de/de.po | 6 +++---

10636

1 files changed, 3 insertions(+), 3 deletions(-)

10637

10638

commit 31a5c98b831e437ce0b4de7aa06d7b09bc8498a6

10639

Author: Mario Blättermann <mariobl@gnome.org>

10640

Date: Sat Nov 6 19:22:36 2010 +0100

10641

10642

[l10n] Updated German doc translation, fixed some XML errors

10643

10644

help/de/de.po | 14 +++++++-------

10645

1 files changed, 7 insertions(+), 7 deletions(-)

10646

10647

commit eee9a0454724a1bc2132a6574aebfa60faefb208

10648

Author: Matej Urbančič <mateju@svn.gnome.org>

10649

Date: Fri Nov 5 15:01:36 2010 +0100

10650

10651

Updated Slovenian translation

10652

10653

po/sl.po | 545

10654

+++++++++++++++++++++++++++++++++++---------------------------

10655

1 files changed, 309 insertions(+), 236 deletions(-)

10656

10657

commit a0d57aa60447a6c2810013bad801b5ecc71d8b8c

10658

Merge: 182b9fa 60ceff6

10659

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

10660

Date: Thu Nov 4 09:16:41 2010 +0100

10661

10662

Merge branch 'contact-info-630421'

10663

10664

commit 182b9fa21320d52c886284d652b1a232d3ec2793

4600

10665

Author: Reşat SABIQ <tilde.birlik@gmail.com>

4601

10666

Date: Thu Nov 4 00:49:19 2010 -0500

4602

10667

4606

10671

++++++++++++++++++++++++++++++++++++++-----------------------

4607

10672

1 files changed, 1276 insertions(+), 757 deletions(-)

4608

10673

4609

commit 54bde62ad6357fadb8ad2d12beaba6efcde459c9

4610

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

4611

Date: Fri Oct 22 12:09:46 2010 +0200

4612

4613

Don't build with gnome-keyring 2.91.x (#631657)

4614

4615

configure.ac | 5 ++++-

4616

1 files changed, 4 insertions(+), 1 deletions(-)

4617

4618

commit cc6643ceb63830f3f4739e17d124d74791764ac1

4619

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

4620

Date: Fri Oct 22 11:46:28 2010 +0200

4621

4622

don't support libnotify 0.7 (#632806)

4623

4624

configure.ac | 5 ++++-

4625

1 files changed, 4 insertions(+), 1 deletions(-)

4626

4627

commit 6d7e166717e11a9635429bbd523dc35ab2994e7a

4628

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

4629

Date: Fri Oct 22 11:33:58 2010 +0200

4630

4631

Stop disabling deprecated GTK API

4632

4633

We're not going to make big changes in this branch.

4634

4635

configure.ac | 6 ------

10674

commit a8064b9082e8cab75f72a108359bb5ce5d39675b

10675

Author: Daniel Mustieles <daniel.mustieles@gmail.com>

10676

Date: Wed Nov 3 18:03:11 2010 +0100

10677

10678

Updated Spanish translation

10679

10680

po/es.po | 38 ++++++++++++++++++++------------------

10681

1 files changed, 20 insertions(+), 18 deletions(-)

10682

10683

commit 588c9672d3530294f3ce1308754a7121681a6fa0

10684

Author: Travis Reitter <travis.reitter@collabora.co.uk>

10685

Date: Wed Nov 3 08:49:52 2010 -0700

10686

10687

Always set up the call factory in empathy-av.

10688

10689

src/empathy-av.c | 9 ++++++---

10690

1 files changed, 6 insertions(+), 3 deletions(-)

10691

10692

commit 257e5241380c49fb5498093ccf3ebcced29c7fe1

10693

Merge: c3395bb 6780c24

10694

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

10695

Date: Wed Nov 3 16:59:05 2010 +0100

10696

10697

Merge branch 'av-crash-633816'

10698

10699

commit c3395bb565cc994f4871f52d20e4be506c75d6e8

10700

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

10701

Date: Wed Nov 3 09:39:43 2010 +0100

10702

10703

fix syntax error

10704

10705

src/empathy-event-manager.c | 5 +++--

10706

1 files changed, 3 insertions(+), 2 deletions(-)

10707

10708

commit 2006f8e4601f2eab8e63884a86c4b4b626e963c6

10709

Author: Yaron Shahrabani <sh.yaron@gmail.com>

10710

Date: Wed Nov 3 10:37:50 2010 +0200

10711

10712

Updated Hebrew translation.

10713

10714

po/he.po | 15 +++++++--------

10715

1 files changed, 7 insertions(+), 8 deletions(-)

10716

10717

commit 20bf62e79da14568fcd8c65fd561d601acf4b882

10718

Author: Alex Launi <alex.launi@gmail.com>

10719

Date: Tue Nov 2 21:11:56 2010 -0400

10720

10721

Reword subscription request dialog to be less technical

10722

10723

src/empathy-event-manager.c | 4 ++--

10724

1 files changed, 2 insertions(+), 2 deletions(-)

10725

10726

commit 60ceff650179f376d3f35831a4170b3bc0a2577a

10727

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

10728

Date: Wed Oct 20 13:38:03 2010 +0200

10729

10730

Add fields which are supported but not in the vCard

10731

10732

libempathy-gtk/empathy-contact-widget.c | 58

10733

+++++++++++++++++++++++++++++++

10734

1 files changed, 58 insertions(+), 0 deletions(-)

10735

10736

commit 56b38154b0c236a158a41989c0cc72e0302cf6ff

10737

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

10738

Date: Wed Oct 20 13:12:00 2010 +0200

10739

10740

split filling of details_to_set and adding the widgets

10741

10742

This will allow us to add supported fields which are not set in

10743

the vCard.

10744

10745

libempathy-gtk/empathy-contact-widget.c | 33

10746

++++++++++++++++++------------

10747

1 files changed, 20 insertions(+), 13 deletions(-)

10748

10749

commit f8a787f1ad106cbb6422038800ee767c1b94a724

10750

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

10751

Date: Wed Oct 20 12:59:35 2010 +0200

10752

10753

contact_widget_details_update_edit: iterate over the fields returned

10754

by tp_contact_get_contact_info()

10755

10756

libempathy-gtk/empathy-contact-widget.c | 73

10757

+++++--------------------------

10758

1 files changed, 11 insertions(+), 62 deletions(-)

10759

10760

commit a2421fe9c16830e31ffab506d65a4463fd2b5e03

10761

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

10762

Date: Wed Oct 20 12:57:31 2010 +0200

10763

10764

log an error if SetContactInfo() fails

10765

10766

libempathy-gtk/empathy-contact-widget.c | 20 +++++++++++++++++++-

10767

1 files changed, 19 insertions(+), 1 deletions(-)

10768

10769

commit 897caa5f59139e690778f006ce69518cc484a25a

10770

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

10771

Date: Wed Oct 20 12:55:38 2010 +0200

10772

10773

field_value_is_empty: check that all the values are empty

10774

10775

libempathy-gtk/empathy-contact-widget.c | 11 ++++++++++-

10776

1 files changed, 10 insertions(+), 1 deletions(-)

10777

10778

commit a71719b4f268e0a1872007af770593773332cb0f

10779

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

10780

Date: Wed Sep 29 12:18:42 2010 +0200

10781

10782

field_spec_match_field: check that parameters are matching as well

10783

(#630421)

10784

10785

libempathy-gtk/empathy-contact-widget.c | 16 +++++++++++++++-

10786

1 files changed, 15 insertions(+), 1 deletions(-)

10787

10788

commit b05d78f8dcf7e952be1a1ffd88757370ec3e19cf

10789

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

10790

Date: Wed Sep 29 12:13:25 2010 +0200

10791

10792

factor out field_spec_match_field()

10793

10794

libempathy-gtk/empathy-contact-widget.c | 9 ++++++++-

10795

1 files changed, 8 insertions(+), 1 deletions(-)

10796

10797

commit 66ccf35fe60be0a85aa9e6a242bdd1a2ba6706a3

10798

Author: Yaron Shahrabani <sh.yaron@gmail.com>

10799

Date: Wed Nov 3 09:11:52 2010 +0200

10800

10801

Updated Hebrew translation.

10802

10803

po/he.po | 75

10804

++++++++++++++++++++++++++++++++-----------------------------

10805

1 files changed, 39 insertions(+), 36 deletions(-)

10806

10807

commit 6780c24c52863706602cf0b900ba4adc298180fe

10808

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

10809

Date: Tue Nov 2 14:58:03 2010 +0100

10810

10811

Don't destroy the call factory right away (#633816)

10812

10813

src/empathy-av.c | 7 ++++---

10814

1 files changed, 4 insertions(+), 3 deletions(-)

10815

10816

commit 5645e5b10dff5b440ab0343bcd1f930bee5f985b

10817

Author: Jorge González <jorgegonz@svn.gnome.org>

10818

Date: Tue Nov 2 11:10:45 2010 +0100

10819

10820

Updated Spanish translation

10821

10822

po/es.po | 77

10823

++++++++++++++++++++++++++++++++-----------------------------

10824

1 files changed, 40 insertions(+), 37 deletions(-)

10825

10826

commit 0c927779b5b37ba01bb710b86e21c55f35e7ad94

10827

Author: Vitaly Minko <vitaly.mink@gmail.com>

10828

Date: Tue Nov 2 10:08:15 2010 +0100

10829

10830

Escape URL itself along with the title (#616339)

10831

10832

libempathy-gtk/empathy-string-parser.c | 18 +++++++++++-------

10833

1 files changed, 11 insertions(+), 7 deletions(-)

10834

10835

commit dff6d4ec7292db208dac8abf44a238764b1e3915

10836

Merge: b776688 6f6c118

10837

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

10838

Date: Tue Nov 2 10:05:28 2010 +0100

10839

10840

Merge remote branch 'vminko/fix-609942'

10841

10842

commit b77668866f1d5cc4fed07786c659380c8e95e1e5

10843

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

10844

Date: Mon Oct 25 11:03:05 2010 +0200

10845

10846

improve hash mismatch error (#632926)

10847

10848

libempathy/empathy-ft-handler.c | 3 +--

10849

1 files changed, 1 insertions(+), 2 deletions(-)

10850

10851

commit 6f6c118815634fa3ddbd62df46e7447341a81f5b

10852

Author: Vitaly Minko <vitaly.minko@gmail.com>

10853

Date: Mon Nov 1 18:55:00 2010 +0300

10854

10855

String parser is changed in order not to break URLs at apostrophes.

10856

10857

libempathy-gtk/empathy-string-parser.c | 12 ++++++------

10858

tests/empathy-parser-test.c | 6 +++++-

10859

2 files changed, 11 insertions(+), 7 deletions(-)

10860

10861

commit 68e5dfaa9c4e5ee49efa13421eb9fc4dfdb04077

10862

Author: Travis Reitter <travis.reitter@collabora.co.uk>

10863

Date: Thu Oct 28 09:52:20 2010 -0700

10864

10865

empathy: use the proper exit status

10866

10867

src/empathy.c | 6 ++++--

10868

1 files changed, 4 insertions(+), 2 deletions(-)

10869

10870

commit 3afb04af72b24948e033a22800957a4564cce23c

10871

Author: Travis Reitter <travis.reitter@collabora.co.uk>

10872

Date: Thu Oct 28 09:50:29 2010 -0700

10873

10874

empathy-debugger: use the proper exit status

10875

10876

src/empathy-debugger.c | 6 ++++--

10877

1 files changed, 4 insertions(+), 2 deletions(-)

10878

10879

commit d304979d6dc8bfb35d2f4ecb69456868d4d89064

10880

Author: Travis Reitter <travis.reitter@collabora.co.uk>

10881

Date: Thu Oct 28 09:50:03 2010 -0700

10882

10883

empathy-chat: use the proper exit status

10884

10885

src/empathy-chat.c | 5 +++--

10886

1 files changed, 3 insertions(+), 2 deletions(-)

10887

10888

commit 3993edbacf01218a50b206f5f1fdd0ad981b576b

10889

Author: Travis Reitter <travis.reitter@collabora.co.uk>

10890

Date: Thu Oct 28 09:51:23 2010 -0700

10891

10892

empathy-av: use the proper exit status

10893

10894

src/empathy-av.c | 5 +++--

10895

1 files changed, 3 insertions(+), 2 deletions(-)

10896

10897

commit 9fa6495ab8e1900c020b0e6e265d380b68b405a7

10898

Author: Travis Reitter <travis.reitter@collabora.co.uk>

10899

Date: Thu Oct 28 09:48:29 2010 -0700

10900

10901

empathy-accounts: use the proper exit status

10902

10903

src/empathy-accounts.c | 5 +++--

10904

1 files changed, 3 insertions(+), 2 deletions(-)

10905

10906

commit e7568fd64d8ec733efea5f6563bf7d286319edfc

10907

Author: Travis Reitter <travis.reitter@collabora.co.uk>

10908

Date: Wed Oct 27 17:31:02 2010 -0700

10909

10910

Make the chat program not exit after 60 seconds.

10911

10912

We were mis-handling the GApplication holds, which let it time-out,

10913

even if a

10914

chat window was open.

10915

10916

Helps bgo#632912.

10917

10918

src/empathy-chat.c | 59

10919

+++++++++++++++-------------------------------------

10920

1 files changed, 17 insertions(+), 42 deletions(-)

10921

10922

commit d298521fb71385e25ce924bd051ecaed73ae14e7

10923

Author: Travis Reitter <travis.reitter@collabora.co.uk>

10924

Date: Wed Oct 27 11:21:04 2010 -0700

10925

10926

Make the core empathy a command-line GApplication.

10927

10928

Helps bgo#632912.

10929

10930

src/empathy.c | 134

10931

+++++++++++++++++++++++++++++++++++++-------------------

10932

1 files changed, 88 insertions(+), 46 deletions(-)

10933

10934

commit ae2279dbd9844674ea90bb161078dfc3925573cd

10935

Author: Travis Reitter <travis.reitter@collabora.co.uk>

10936

Date: Tue Oct 26 10:39:18 2010 -0700

10937

10938

Make empathy-accounts use act as a "command-line" GApplication

10939

10940

Helps bgo#632912.

10941

10942

src/empathy-accounts.c | 81

10943

+++++++++++++++++++++++++++++++++++------------

10944

1 files changed, 60 insertions(+), 21 deletions(-)

10945

10946

commit 1cee1d840d87c1cb55ea35b17c58f3d7c69931be

10947

Author: Travis Reitter <travis.reitter@collabora.co.uk>

10948

Date: Fri Oct 22 13:06:45 2010 -0700

10949

10950

Relocate static function to eliminate prototype.

10951

10952

src/empathy-av.c | 36 +++++++++++++++---------------------

10953

1 files changed, 15 insertions(+), 21 deletions(-)

10954

10955

commit ad19fb0668dcd21c0ac82e3c0fc81f6fa03dd92a

10956

Author: Travis Reitter <travis.reitter@collabora.co.uk>

10957

Date: Fri Oct 22 13:05:54 2010 -0700

10958

10959

Don't try to register for unique bus names in remote instances

10960

of empathy-av.

10961

10962

src/empathy-av.c | 31 ++++++++++++++++---------------

10963

1 files changed, 16 insertions(+), 15 deletions(-)

10964

10965

commit 8857f63fb88c5b6cc3fed75143a9b58da439f583

10966

Author: Travis Reitter <travis.reitter@collabora.co.uk>

10967

Date: Fri Oct 22 13:03:55 2010 -0700

10968

10969

Properly handle remote instances of empathy-av.

10970

10971

Also cut out unncessary window counting that GApplication does for us.

10972

10973

Fixes bgo#632912.

10974

10975

src/empathy-av.c | 63

10976

+++++++++++++++++------------------------------------

10977

1 files changed, 20 insertions(+), 43 deletions(-)

10978

10979

commit f6e6e24cd11b820e382e687626b52dd3eb6364a7

10980

Author: Travis Reitter <travis.reitter@collabora.co.uk>

10981

Date: Fri Oct 22 12:35:50 2010 -0700

10982

10983

Properly handle remote instances of the accounts dialog.

10984

10985

Helps bgo#632912.

10986

10987

src/empathy-accounts.c | 7 ++++---

10988

1 files changed, 4 insertions(+), 3 deletions(-)

10989

10990

commit f9e4c3d37f6cc259beca5b4dde709a34e517d2c6

10991

Author: Travis Reitter <travis.reitter@collabora.co.uk>

10992

Date: Fri Oct 22 12:16:18 2010 -0700

10993

10994

Properly handle remote instances of the debugger.

10995

10996

Helps bgo#632912.

10997

10998

src/empathy-debugger.c | 28 +++++++++++++++++++++-------

10999

1 files changed, 21 insertions(+), 7 deletions(-)

11000

11001

commit 0ff09c9c9bf89948a8e37b3c3606fc42f0d8e618

11002

Author: Travis Reitter <travis.reitter@collabora.co.uk>

11003

Date: Fri Oct 22 12:04:26 2010 -0700

11004

11005

Don't try to register for unique bus names in remote instances

11006

of Empathy.

11007

11008

This means, that remote (secondary) instances of Empathy won't try

11009

to hold the

11010

Chat or FT bus names (which will always fail.

11011

11012

It also means that remote instances don't try to hold the GApplication

11013

(though

11014

they would release it upon exit anyhow).

11015

11016

src/empathy.c | 101

11017

+++++++++++++++++++++++++++++++-------------------------

11018

1 files changed, 56 insertions(+), 45 deletions(-)

11019

11020

commit 4c8dc9d04de6f80c8e5406495e71d0dca9f73369

11021

Author: Travis Reitter <travis.reitter@collabora.co.uk>

11022

Date: Fri Oct 22 11:47:29 2010 -0700

11023

11024

Cut out unnecessary empathy_app_new().

11025

11026

src/empathy.c | 30 +++---------------------------

11027

1 files changed, 3 insertions(+), 27 deletions(-)

11028

11029

commit f0bc602802fd56095886b1d6b1b054a44320973d

11030

Author: Travis Reitter <travis.reitter@collabora.co.uk>

11031

Date: Fri Oct 22 11:41:47 2010 -0700

11032

11033

Make the Empathy core program act as a unique app.

11034

11035

This means that instances beyond the first simply raise the initial

11036

instance and

11037

exit.

11038

11039

Helps bgo#632912.

11040

11041

src/empathy.c | 4 ++--

11042

1 files changed, 2 insertions(+), 2 deletions(-)

11043

11044

commit 8b529506fbc4265b44ab35cda5bdc99978192680

11045

Merge: 2237080 5c9cc71

11046

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

11047

Date: Fri Oct 29 09:50:04 2010 +0200

11048

11049

Merge branch 'muc-crash-633329'

11050

11051

commit 22370808b807c31c111fea61a33aa19d2dec1f03

11052

Author: Vitaly Minko <vitaly.mink@gmail.com>

11053

Date: Thu Oct 28 15:40:56 2010 +0200

11054

11055

Allow to drop contacts on the group names (#619961)

11056

11057

libempathy-gtk/empathy-individual-store.c | 2 +-

11058

1 files changed, 1 insertions(+), 1 deletions(-)

11059

11060

commit 91a0c4fcb278477422e1c89f517cc0f5c833de33

11061

Merge: 10de0a2 01566e5

11062

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

11063

Date: Thu Oct 28 15:23:48 2010 +0200

11064

11065

Merge remote branch 'vminko/fix-612205-v2'

11066

11067

commit 01566e5ee1cc585aeda44f58d76874ac1faaa63a

11068

Author: Vitaly Minko <vitaly.minko@gmail.com>

11069

Date: Thu Oct 28 16:52:16 2010 +0400

11070

11071

Copy topic selection manually since Ctrl-C is bound to the menu item.

11072

11073

libempathy-gtk/empathy-chat.c | 25 +++++++++++++++++++++++++

11074

1 files changed, 25 insertions(+), 0 deletions(-)

11075

11076

commit 10de0a21f8abf9ad1719039addf347e03a6324dd

11077

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

11078

Date: Thu Oct 28 14:28:54 2010 +0200

11079

11080

rename timeout_id to auto_scroll_timeout_id

11081

11082

libempathy-gtk/empathy-individual-view.c | 10 +++++-----

11083

1 files changed, 5 insertions(+), 5 deletions(-)

11084

11085

commit 512026609a385f2715350d275f987ca61dbc2ad8

11086

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

11087

Date: Thu Oct 28 14:26:38 2010 +0200

11088

11089

move AutoScrollData to priv

11090

11091

libempathy-gtk/empathy-individual-view.c | 40

11092

++++++++++++++---------------

11093

1 files changed, 19 insertions(+), 21 deletions(-)

11094

11095

commit 047aefcdfb7a8f19d6cb569375601e81cae30a38

11096

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

11097

Date: Thu Oct 28 10:10:30 2010 +0200

11098

11099

Use GTK3 API

11100

11101

libempathy-gtk/empathy-individual-view.c | 16 ++++++++++------

11102

1 files changed, 10 insertions(+), 6 deletions(-)

11103

11104

commit 7fc61f47a6133047135b01190ad3dc8e9eed4489

11105

Author: Vitaly Minko <vitaly.minko@gmail.com>

11106

Date: Wed Oct 27 23:39:32 2010 +0400

11107

11108

Add auto scrolling when drag-and-dropping contacts (#619858).

11109

11110

libempathy-gtk/empathy-individual-view.c | 54

11111

++++++++++++++++++++++++++++++

11112

1 files changed, 54 insertions(+), 0 deletions(-)

11113

11114

commit 5c9cc71dd871671cf6654fbe968755654081946e

11115

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

11116

Date: Thu Oct 28 09:32:47 2010 +0200

11117

11118

chat-manager: keep a ref on the chatroom mgr

11119

11120

This avoid to recreate one each time we need it.

11121

11122

src/empathy-chat-manager.c | 31 +++++++++++++++++++------------

11123

1 files changed, 19 insertions(+), 12 deletions(-)

11124

11125

commit 43810b24c12d81f26f4d38035ae911a1a7a0bbcc

11126

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

11127

Date: Thu Oct 28 09:31:54 2010 +0200

11128

11129

chatroom-manager: ensure that we stay alive while preparing the AM

11130

11131

This manager uses to be always alive but that's not longer tree

11132

since we

11133

splitted the chat client (#633329).

11134

11135

libempathy/empathy-chatroom-manager.c | 7 +++++--

11136

1 files changed, 5 insertions(+), 2 deletions(-)

11137

11138

commit 8fcbe3e7f71eeb6bca559dd6c36711b7fa5078c4

11139

Author: Travis Reitter <travis.reitter@collabora.co.uk>

11140

Date: Wed Oct 27 17:52:09 2010 -0700

11141

11142

Fix the subtitution for the libexecdir path in the Chat service file.

11143

11144

data/Makefile.am | 2 +-

11145

1 files changed, 1 insertions(+), 1 deletions(-)

11146

11147

commit f8f79bf5b2597b0239fb12c426907cf2b918bddc

11148

Author: Aron Xu <aronxu@gnome.org>

11149

Date: Wed Oct 27 16:01:02 2010 +0000

11150

11151

Update Simplified Chinese translation.

11152

11153

po/zh_CN.po | 1004

11154

+++++++++++++++++++++++++++++++----------------------------

11155

1 files changed, 533 insertions(+), 471 deletions(-)

11156

11157

commit 85bcf8d0266294ebc9ba66062812cbee40791de5

11158

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

11159

Date: Wed Oct 27 17:53:12 2010 +0200

11160

11161

empathy-chat is installed in libexecdir

11162

11163

...esktop.Telepathy.Client.Empathy.Chat.service.in | 2 +-

11164

1 files changed, 1 insertions(+), 1 deletions(-)

11165

11166

commit afb871aad6cf857d445d9235fc1e956518f76e5f

11167

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

11168

Date: Wed Oct 27 17:20:34 2010 +0200

11169

11170

Don't use 'Preset' in the UI (#581029)

11171

11172

libempathy-gtk/empathy-status-preset-dialog.ui | 4 ++--

11173

1 files changed, 2 insertions(+), 2 deletions(-)

11174

11175

commit 77da3f09f8e74d8dd96efc1cce1efe46f8a352fc

11176

Author: Jorge González <jorgegonz@svn.gnome.org>

11177

Date: Tue Oct 26 10:45:42 2010 +0200

11178

11179

Updated Spanish translation

11180

11181

po/es.po | 41 ++++++++++++++++++++++-------------------

11182

1 files changed, 22 insertions(+), 19 deletions(-)

11183

11184

commit 9c832ed43560894522aaf832ac6c9d91831ee051

11185

Author: Yaron Shahrabani <sh.yaron@gmail.com>

11186

Date: Tue Oct 26 08:23:55 2010 +0200

11187

11188

Updated Hebrew translation.

11189

11190

po/he.po | 43 ++++++++++++++++++++++---------------------

11191

1 files changed, 22 insertions(+), 21 deletions(-)

11192

11193

commit a00833accf9eb1c4470feac282b4679df3e2629d

11194

Author: Francisca Gallardo <fran.gallardop@gmail.com>

11195

Date: Mon Oct 25 20:07:49 2010 -0300

11196

11197

empathy-account: change Salut -> People Nearby

11198

11199

Changed error message

11200

"Don't display any dialogs if there are any non-Salut accounts"

11201

to "Don't display any dialogs unless there are only 'People Nearby'

11202

accounts"

11203

11204

https://bugzilla.gnome.org/show_bug.cgi?id=628823

11205

11206

src/empathy-accounts.c | 2 +-

11207

1 files changed, 1 insertions(+), 1 deletions(-)

11208

11209

commit 8f0fbd89ee0d514bdc664850541416cac9090204

11210

Merge: 1e6d192 34a97e5

11211

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

11212

Date: Mon Oct 25 14:33:47 2010 +0200

11213

11214

Merge remote branch 'vminko/fix-573283'

11215

11216

commit 34a97e543d2d8e306333d3e8682316c7e0ea8444

11217

Author: Vitaly Minko <vitaly.minko@gmail.com>

11218

Date: Mon Oct 25 14:10:38 2010 +0400

11219

11220

Fixing incorrect indentation.

11221

11222

libempathy-gtk/empathy-contact-menu.c | 8 ++++----

11223

1 files changed, 4 insertions(+), 4 deletions(-)

11224

11225

commit 1e6d192d7a61c14fefae302f2109a91a9a916287

11226

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

11227

Date: Mon Oct 25 11:14:31 2010 +0200

11228

11229

src/Makefile.am: add $(NULL)

11230

11231

src/Makefile.am | 9 ++++++---

11232

1 files changed, 6 insertions(+), 3 deletions(-)

11233

11234

commit 426487b5817b6f75c77ee888b3355fd7b89981a2

11235

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

11236

Date: Mon Oct 25 10:29:44 2010 +0200

11237

11238

coding style fix

11239

11240

src/empathy-chat.c | 19 +++++++++++--------

11241

1 files changed, 11 insertions(+), 8 deletions(-)

11242

11243

commit 3af8594e436d5c88e531fcd6f36a1d81b20b133e

11244

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

11245

Date: Tue Oct 19 16:20:06 2010 +0200

11246

11247

empathy.c: stop instantiating the chat manager

11248

11249

src/empathy.c | 6 ------

4636

11250

1 files changed, 0 insertions(+), 6 deletions(-)

4637

11251

4638

commit f78841f876e201df9a0c69f03f4ac5db49124698

4639

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

4640

Date: Fri Oct 22 11:13:57 2010 +0200

4641

4642

disable GTK3 support (#632807)

4643

4644

configure.ac | 104

4645

++++++++++++++--------------------------------------------

4646

1 files changed, 25 insertions(+), 79 deletions(-)

4647

4648

commit bb57a956a5b166ced675e323a76d47c9389cb8ea

11252

commit 3c1151db28aa6d8726a763060070e0c8eb961e2d

11253

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

11254

Date: Tue Oct 19 16:12:53 2010 +0200

11255

11256

Create 'empathy-chat' handling text channels (#631946)

11257

11258

src/.gitignore | 1 +

11259

src/Makefile.am | 10 +++-

11260

src/empathy-chat.c | 174

11261

++++++++++++++++++++++++++++++++++++++++++++++++++++

11262

3 files changed, 184 insertions(+), 1 deletions(-)

11263

11264

commit f116e5268165cce8c67d6876b6819790ba29c683

11265

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

11266

Date: Tue Oct 19 16:11:11 2010 +0200

11267

11268

chat-manager: add API to track the number of handled chats

11269

11270

src/empathy-chat-manager.c | 61

11271

++++++++++++++++++++++++++++++++++++++++++++

11272

src/empathy-chat-manager.h | 2 +

11273

2 files changed, 63 insertions(+), 0 deletions(-)

11274

11275

commit 912a3822ff6dcedcf6336191aab3bd363d7e24bb

11276

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

11277

Date: Tue Oct 19 15:40:47 2010 +0200

11278

11279

chat-manager: make clear that we are dealing with *closed* chats

11280

11281

src/empathy-chat-manager.c | 39 ++++++++++++++++++++-------------------

11282

src/empathy-chat-manager.h | 2 +-

11283

src/empathy-chat-window.c | 4 ++--

11284

3 files changed, 23 insertions(+), 22 deletions(-)

11285

11286

commit dc277e086d67b4e5ae53211229368c1bd7572844

11287

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

11288

Date: Tue Oct 19 15:37:03 2010 +0200

11289

11290

rename the chat handler to Empathy.Chat

11291

11292

data/.gitignore | 2 +-

11293

data/Empathy.Chat.client | 14 ++++++++++++++

11294

data/Empathy.client | 14 --------------

11295

data/Makefile.am | 6 +++---

11296

...esktop.Telepathy.Client.Empathy.Chat.service.in | 3 +++

11297

...freedesktop.Telepathy.Client.Empathy.service.in | 3 ---

11298

src/empathy-chat-manager.c | 2 +-

11299

7 files changed, 22 insertions(+), 22 deletions(-)

11300

11301

commit eaffceb6b4a5ea9d15a0aaa41885b258dcbc0cf2

11302

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

11303

Date: Tue Oct 19 15:33:59 2010 +0200

11304

11305

idle.h: we have to include account from tp-glib

11306

11307

libempathy/empathy-idle.h | 1 +

11308

1 files changed, 1 insertions(+), 0 deletions(-)

11309

11310

commit f3028d109fb45840c5ef7f63dc14de74593f5079

11311

Author: Yaron Shahrabani <sh.yaron@gmail.com>

11312

Date: Sat Oct 23 02:34:13 2010 +0200

11313

11314

Updated Hebrew translation.

11315

11316

po/he.po | 136

11317

++++++++++++++++++++++++++++++++++----------------------------

11318

1 files changed, 75 insertions(+), 61 deletions(-)

11319

11320

commit dbe9379eb6d3f1f51dbbe293a8cf347efedf85f1

4649

11321

Author: Carles Ferrando <carles.ferrando@gmail.com>

4650

11322

Date: Sat Oct 23 01:02:36 2010 +0200

4651

11323

4655

11327

+++++++++++++++++++++++++++++++++--------------------

4656

11328

1 files changed, 1257 insertions(+), 748 deletions(-)

4657

11329

4658

commit 540e4d055e1817433209fd29901b8d805a196c23

11330

commit 06edcef25a101bd47b7958732561d4b1ebe17dfc

11331

Author: Vitaly Minko <vitaly.minko@gmail.com>

11332

Date: Fri Oct 22 20:58:57 2010 +0400

11333

11334

Disable meaningless popup menu items in the contact menu (#573283).

11335

11336

libempathy-gtk/empathy-contact-menu.c | 16 +++++++++++++---

11337

1 files changed, 13 insertions(+), 3 deletions(-)

11338

11339

commit d6fb6d85664ad4c56cddb7e07ffd49287fddb58a

11340

Author: Jorge González <jorgegonz@svn.gnome.org>

11341

Date: Fri Oct 22 14:57:47 2010 +0200

11342

11343

Updated Spanish translation

11344

11345

po/es.po | 136

11346

++++++++++++++++++++++++++++++++++----------------------------

11347

1 files changed, 75 insertions(+), 61 deletions(-)

11348

11349

commit a0570eb786037e9855a0a8a51aabc5c6130ad342

11350

Merge: 45e2e34 2324b39

11351

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

11352

Date: Fri Oct 22 14:18:34 2010 +0200

11353

11354

Merge remote branch 'vminko/fix-625780'

11355

11356

commit 45e2e349b685c33338ab3e60a64b038d0b22385a

11357

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

11358

Date: Fri Oct 22 13:09:17 2010 +0200

11359

11360

empathy.c: call g_application_hold() on the app

11361

11362

src/empathy.c | 1 +

11363

1 files changed, 1 insertions(+), 0 deletions(-)

11364

11365

commit dd2c970a735a8099b00df7423cf8fe0dc8f4c473

11366

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

11367

Date: Fri Oct 22 13:07:46 2010 +0200

11368

11369

GApplication is not a initable anymore

11370

11371

src/empathy.c | 8 ++------

11372

1 files changed, 2 insertions(+), 6 deletions(-)

11373

11374

commit 7c8a06a7cd034f24df4c532533ef144cb87145ee

11375

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

11376

Date: Fri Oct 22 12:58:09 2010 +0200

11377

11378

gtk_text_view_get_vadjustment() has been removed

11379

11380

libempathy-gtk/empathy-chat-text-view.c | 6 +++---

11381

1 files changed, 3 insertions(+), 3 deletions(-)

11382

11383

commit d2f7a29078e2b351e1c52cc6db049808ae86ae1f

11384

Author: Vitaly Minko <vitaly.mink@gmail.com>

11385

Date: Fri Oct 22 14:08:22 2010 +0200

11386

11387

add a new popup-menu item in the chat window allowing to add words

11388

to dictionaries (#550775).

11389

11390

libempathy-gtk/empathy-chat.c | 134

11391

+++++++++++++++++++++++++++++++++++++++-

11392

libempathy-gtk/empathy-spell.c | 31 +++++++++-

11393

libempathy-gtk/empathy-spell.h | 2 +

11394

3 files changed, 165 insertions(+), 2 deletions(-)

11395

11396

commit 3c83182d654711d5f86b30ed8b7d3bf9af418d94

11397

Author: Travis Reitter <travis.reitter@collabora.co.uk>

11398

Date: Thu Oct 21 14:37:01 2010 -0700

11399

11400

Port the a/v app to new G/tkApplication.

11401

11402

Fixes bgo#632846.

11403

11404

src/empathy-av.c | 41 +++++++++++++++++++----------------------

11405

1 files changed, 19 insertions(+), 22 deletions(-)

11406

11407

commit ca04b3480cf5a55767065324b29e5babb2039b37

11408

Author: Travis Reitter <travis.reitter@collabora.co.uk>

11409

Date: Thu Oct 21 14:31:23 2010 -0700

11410

11411

Port the accounts dialog to new G/tkApplication.

11412

11413

Helps bgo#632846.

11414

11415

src/empathy-accounts.c | 12 +++++++-----

11416

1 files changed, 7 insertions(+), 5 deletions(-)

11417

11418

commit 73c0679204bc2e268f866ca802772c3f6a26288c

11419

Author: Travis Reitter <travis.reitter@collabora.co.uk>

11420

Date: Thu Oct 21 14:27:23 2010 -0700

11421

11422

Port the debugger to new G/tkApplication.

11423

11424

Helps bgo#632846.

11425

11426

src/empathy-debugger.c | 7 +++++--

11427

1 files changed, 5 insertions(+), 2 deletions(-)

11428

11429

commit 29fd0970e4c60963117322c3d067b93fa9461293

11430

Author: Travis Reitter <travis.reitter@collabora.co.uk>

11431

Date: Thu Oct 21 14:22:16 2010 -0700

11432

11433

Port core Empathy to new G/tkApplication.

11434

11435

Helps bgo#632846.

11436

11437

src/empathy.c | 9 ++++-----

11438

1 files changed, 4 insertions(+), 5 deletions(-)

11439

11440

commit 2324b39d322867c4ef583265cf7c5d840a72cb02

11441

Author: Vitaly Minko <vitaly.minko@gmail.com>

11442

Date: Thu Oct 21 19:07:33 2010 +0400

11443

11444

Return existing default chat window when it's hidden, just restore

11445

it in this case (#625780).

11446

11447

src/empathy-chat-window.c | 30 +++++++++++++++---------------

11448

1 files changed, 15 insertions(+), 15 deletions(-)

11449

11450

commit 063c4fb406eda4278493cc3ee24ad63a12b83996

11451

Author: Jorge González <jorgegonz@svn.gnome.org>

11452

Date: Thu Oct 21 12:05:58 2010 +0200

11453

11454

Updated Spanish translation

11455

11456

po/es.po | 17 ++++++++---------

11457

1 files changed, 8 insertions(+), 9 deletions(-)

11458

11459

commit 92202b819168ac29193936540bf47137185052dc

11460

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

11461

Date: Thu Oct 21 13:20:58 2010 +1100

11462

11463

Don't assume account will exist when accessing storage restrictions

11464

11465

Fixes https://bugzilla.gnome.org/show_bug.cgi?id=632681

11466

11467

libempathy-gtk/empathy-account-widget.c | 14 +++++++++-----

11468

1 files changed, 9 insertions(+), 5 deletions(-)

11469

11470

commit eb798b30942ae008bde80decf023534111478919

11471

Author: Yaron Shahrabani <sh.yaron@gmail.com>

11472

Date: Wed Oct 20 23:46:01 2010 +0200

11473

11474

Updated Hebrew translation.

11475

11476

po/he.po | 274

11477

+++++++++++++++++++++++++++++++++++---------------------------

11478

1 files changed, 154 insertions(+), 120 deletions(-)

11479

11480

commit c9ee1b685ba3fa505914c7e1f9bb705ea88e5ff0

4659

11481

Author: Takayuki KUSANO <AE5T-KSN@asahi-net.or.jp>

4660

11482

Date: Thu Oct 21 00:57:11 2010 +0900

4661

11483

4665

11487

+++++++++++++++++++++++++++++++-------------------------------

4666

11488

1 files changed, 148 insertions(+), 147 deletions(-)

4667

11489

4668

commit 3615098ca78ea59f64bf4e7137b06be5d8cfb3a5

11490

commit 2d56a523190e64ae61d5ff470d2fe1b4ba357944

4669

11491

Author: Gabor Kelemen <kelemeng@gnome.hu>

4670

11492

Date: Wed Oct 20 12:19:31 2010 +0200

4671

11493

4674

11496

help/hu/hu.po | 29 ++++++++++++++++++++++-------

4675

11497

1 files changed, 22 insertions(+), 7 deletions(-)

4676

11498

4677

commit 04776cb50759931dde13c9bcfa0d200fd7c77a5a

11499

commit d64a75e1138fb8f871589e7b3eb8285d4b92cdd5

11500

Merge: 0b0bc2d ce75052

11501

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

11502

Date: Wed Oct 20 11:02:25 2010 +0200

11503

11504

Merge branch 'kill-dispatcher-632550'

11505

11506

commit ce75052d1555213bf6cdfd99a585e1edb9d86044

11507

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

11508

Date: Wed Oct 20 09:08:55 2010 +0200

11509

11510

use tp_asv_* and TP_PROP_*

11511

11512

libempathy/empathy-ft-handler.c | 70

11513

+++++++++++++--------------------------

11514

1 files changed, 23 insertions(+), 47 deletions(-)

11515

11516

commit 0b0bc2d054b03840557339661af757083dc00850

11517

Author: Fran Diéguez <fran.dieguez@mabishu.com>

11518

Date: Wed Oct 20 09:10:19 2010 +0200

11519

11520

Updated galician translations and help

11521

11522

help/gl/gl.po | 108 ++++++++++++++++++++---

11523

po/gl.po | 278

11524

++++++++++++++++++++++++++++++++-------------------------

11525

2 files changed, 253 insertions(+), 133 deletions(-)

11526

11527

commit 225932c9e57331509eb15ac402af6020027fc08a

11528

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

11529

Date: Tue Oct 19 14:53:39 2010 +0200

11530

11531

remove empathy_dispatcher_find_requestable_channel_classes_async

11532

(#632550)

11533

11534

libempathy/empathy-dispatcher.c | 124

11535

---------------------------------------

11536

libempathy/empathy-dispatcher.h | 6 --

11537

2 files changed, 0 insertions(+), 130 deletions(-)

11538

11539

commit e502bb48739f6d5b63dbee2c698b090928110400

11540

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

11541

Date: Tue Oct 19 14:51:02 2010 +0200

11542

11543

no more need to iterate twice over the channel classes

11544

11545

libempathy/empathy-ft-handler.c | 74

11546

+++++++++++++++++---------------------

11547

1 files changed, 33 insertions(+), 41 deletions(-)

11548

11549

commit a360151f84ffc367ce9d749eacca3cde155649db

11550

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

11551

Date: Tue Oct 19 14:42:41 2010 +0200

11552

11553

empathy-ft-handler: re-implement

11554

empathy_dispatcher_find_requestable_channel_classes_async using

11555

TpCapabilities

11556

11557

libempathy/empathy-ft-handler.c | 56

11558

++++++++++++++++++++++++++++++++++----

11559

1 files changed, 50 insertions(+), 6 deletions(-)

11560

11561

commit cb265f95cc5ca492f8808be0ab81d70e8e77d843

11562

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

11563

Date: Tue Oct 19 13:13:16 2010 +0200

11564

11565

tp-chat: stop using EmpathyDispatcher to check if Conference is

11566

supported

11567

11568

libempathy/empathy-tp-chat.c | 24 ++++++++++++------------

11569

1 files changed, 12 insertions(+), 12 deletions(-)

11570

11571

commit 3e908f6ba9caefd06a6fbedb7dae55c3a71b9f44

11572

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

11573

Date: Tue Oct 19 13:12:09 2010 +0200

11574

11575

Ensure that the connection of the account passed to EmpathyTpChat

11576

has capabilities ready

11577

11578

src/empathy-chat-manager.c | 8 ++++++--

11579

src/empathy-event-manager.c | 4 ++++

11580

2 files changed, 10 insertions(+), 2 deletions(-)

11581

11582

commit 2bd0ca2b99c6c010e8c46865942e91ca755d4e4a

11583

Author: Claude Paroz <claude@2xlibre.net>

11584

Date: Wed Oct 20 08:38:42 2010 +0200

11585

11586

[help] Fix XML validity of French translation

11587

11588

help/fr/fr.po | 2 +-

11589

1 files changed, 1 insertions(+), 1 deletions(-)

11590

11591

commit 8909adc8fa36c39d26d21bc7e3c3065bb1b6b74d

11592

Author: William Jon McCann <jmccann@redhat.com>

11593

Date: Tue Oct 12 02:15:51 2010 -0400

11594

11595

Port to libnotify 0.7.0

11596

11597

https://bugzilla.gnome.org/show_bug.cgi?id=631944

11598

11599

configure.ac | 2 +-

11600

src/empathy-chat-window.c | 2 +-

11601

src/empathy-status-icon.c | 4 ++--

11602

3 files changed, 4 insertions(+), 4 deletions(-)

11603

11604

commit 0ca576c2a57d4628328696b2803553d2de748c87

11605

Author: Jorge González <jorgegonz@svn.gnome.org>

11606

Date: Tue Oct 19 00:37:16 2010 +0200

11607

11608

Updated Spanish translation

11609

11610

po/es.po | 130

11611

++++++++++++++++++++++++++++++++------------------------------

11612

1 files changed, 67 insertions(+), 63 deletions(-)

11613

11614

commit 4632bf414e157820e87f4ea22d4a73a84db843d5

11615

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

11616

Date: Mon Oct 18 16:44:59 2010 +0200

11617

11618

remove released flag

11619

11620

configure.ac | 2 +-

11621

1 files changed, 1 insertions(+), 1 deletions(-)

11622

11623

commit 1c188eb538d9a8d191f70c3a994874db7e7bd397

11624

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

11625

Date: Mon Oct 18 16:18:05 2010 +0200

11626

11627

prepare 2.91.1

11628

11629

NEWS | 48 ++++++++++++++++++++++++++++++++++++++++++++++++

11630

configure.ac | 4 ++--

11631

2 files changed, 50 insertions(+), 2 deletions(-)

11632

11633

commit e0586a58f10fe82931a2e4861d0ecd2ea7dfb0f0

11634

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

11635

Date: Mon Oct 18 16:06:14 2010 +0200

11636

11637

release.py: update last_tag_pattern

11638

11639

release.py | 2 +-

11640

1 files changed, 1 insertions(+), 1 deletions(-)

11641

11642

commit 798670e5ec296942eb26797cbc9dc8bb3cd2d771

11643

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

11644

Date: Mon Oct 18 16:35:20 2010 +0200

11645

11646

move the 'Find in contact list' menu item

11647

11648

src/empathy-main-window.ui | 2 +-

11649

1 files changed, 1 insertions(+), 1 deletions(-)

11650

11651

commit 0446279dbf79a85718ca7a71bb6588d389ed15f5

11652

Merge: d91cd1d b3a5b44

11653

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

11654

Date: Mon Oct 18 15:22:46 2010 +0200

11655

11656

Merge remote branch 'vminko/fix-632024-v2'

11657

11658

commit d91cd1d110fa660385574d3a9128b83287fc9a92

11659

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

11660

Date: Mon Oct 18 15:05:21 2010 +0200

11661

11662

individual-widget: set xalign on the status message (#632434)

11663

11664

Seems the default changed in GTK3.

11665

11666

libempathy-gtk/empathy-individual-widget.c | 1 +

11667

1 files changed, 1 insertions(+), 0 deletions(-)

11668

11669

commit b3a5b441b884c25198b77ae014cde3b73d396257

11670

Author: Vitaly Minko <vitaly.minko@gmail.com>

11671

Date: Mon Oct 18 16:51:03 2010 +0400

11672

11673

Move the 'Find in Contact List' item from the View menu to the

11674

Edit menu.

11675

11676

src/empathy-main-window.c | 4 ++--

11677

src/empathy-main-window.ui | 14 +++++++-------

11678

2 files changed, 9 insertions(+), 9 deletions(-)

11679

11680

commit 2d25c8605b4e6a2cb832955de7f6e12080a658e0

11681

Author: Vitaly Minko <vitaly.minko@gmail.com>

11682

Date: Mon Oct 18 15:32:37 2010 +0400

11683

11684

Add an entry in the View menu to search for contacts (#632024).

11685

11686

libempathy-gtk/empathy-individual-view.c | 19 +++++++++++++++----

11687

libempathy-gtk/empathy-individual-view.h | 2 ++

11688

src/empathy-main-window.c | 10 ++++++++++

11689

src/empathy-main-window.ui | 7 +++++++

11690

4 files changed, 34 insertions(+), 4 deletions(-)

11691

11692

commit 5ddb08157c2b22b3fe3d95ceaee89a641aadbb7f

11693

Merge: 0da5677 f127e56

11694

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

11695

Date: Mon Oct 18 12:34:38 2010 +0200

11696

11697

Merge branch 'no-notif-632422'

11698

11699

commit f127e56c1b1f27bf7b8be219e13a7c71ffdb63ec

4678

11700

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

4679

11701

Date: Mon Oct 18 11:23:29 2010 +0200

4680

11702

4688

11710

libempathy-gtk/empathy-notify-manager.c | 2 +-

4689

11711

1 files changed, 1 insertions(+), 1 deletions(-)

4690

11712

4691

commit e847711dccf8038c10a6652e5fce1b7a3a1ff294

4692

Author: Jorge González <jorgegonz@svn.gnome.org>

4693

Date: Tue Oct 12 22:55:31 2010 +0200

4694

4695

Updated Spanish translation

4696

4697

po/es.po | 8 ++++----

4698

1 files changed, 4 insertions(+), 4 deletions(-)

4699

4700

commit 7a9d244a46d1888c249b9fc60697bb14cf33eef3

11713

commit 0da5677984bf4820ec0e723141bf43d3539a0fa3

11714

Author: Jorge González <jorgegonz@svn.gnome.org>

11715

Date: Mon Oct 18 11:09:13 2010 +0200

11716

11717

Updated Spanish translation

11718

11719

po/es.po | 152

11720

++++++++++++++++++++++++++++++++++----------------------------

11721

1 files changed, 83 insertions(+), 69 deletions(-)

11722

11723

commit 64b7bd12aa298e080047cace1918d19098509b0a

11724

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

11725

Date: Fri Oct 15 15:36:41 2010 +0200

11726

11727

empathy-av: use GtkApplication (#621339)

11728

11729

src/empathy-av.c | 8 +++++++-

11730

1 files changed, 7 insertions(+), 1 deletions(-)

11731

11732

commit 359fed84d5ee5b0fb82699cb927dbc3293c235cc

11733

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

11734

Date: Fri Oct 15 15:31:07 2010 +0200

11735

11736

empathy-debugger: use GtkApplication (#621339)

11737

11738

src/empathy-debugger.c | 9 +++++++--

11739

1 files changed, 7 insertions(+), 2 deletions(-)

11740

11741

commit 935bd1c90642bbef3430f19769e5649354f75731

11742

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

11743

Date: Fri Oct 15 15:28:51 2010 +0200

11744

11745

define EMPATHY_DBUS_NAME

11746

11747

src/empathy.c | 4 +++-

11748

1 files changed, 3 insertions(+), 1 deletions(-)

11749

11750

commit fd57d14531134f57783ab46d6a366c3c23827685

11751

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

11752

Date: Fri Oct 15 15:25:39 2010 +0200

11753

11754

stop linking on libunique

11755

11756

configure.ac | 2 --

11757

src/Makefile.am | 4 ----

11758

2 files changed, 0 insertions(+), 6 deletions(-)

11759

11760

commit 96311a0b2a5f03c2208ca8b383332ccfd154b8cb

11761

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

11762

Date: Fri Oct 15 15:23:39 2010 +0200

11763

11764

empathy-accounts-common: no need to include unique

11765

11766

src/empathy-accounts-common.c | 1 -

11767

1 files changed, 0 insertions(+), 1 deletions(-)

11768

11769

commit e34270c0664061091a9abdebe3df75e76adc5f3f

11770

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

11771

Date: Fri Oct 15 15:22:59 2010 +0200

11772

11773

empathy-accounts: port to GtkApplication (#621339)

11774

11775

src/empathy-accounts.c | 53

11776

++++++++++-------------------------------------

11777

1 files changed, 12 insertions(+), 41 deletions(-)

11778

11779

commit 383e325a32599a0d359e3574cb86859c8a1ed76c

11780

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

11781

Date: Fri Oct 15 14:35:19 2010 +0200

11782

11783

Use GtkApplication::activated instead of libunique

11784

11785

Also use empathy_window_present() to present the existing window as

11786

it does

11787

what we need.

11788

11789

src/empathy.c | 75

11790

++++++++++++++++-----------------------------------------

11791

1 files changed, 21 insertions(+), 54 deletions(-)

11792

11793

commit 5d9afc90e6d9f07aa3408c1e230d0856d71f1363

11794

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

11795

Date: Fri Oct 15 13:02:06 2010 +0200

11796

11797

EmpathyApp: inherit from GtkApplication (#621339)

11798

11799

src/empathy.c | 35 ++++++++++++++++++++++++++++-------

11800

1 files changed, 28 insertions(+), 7 deletions(-)

11801

11802

commit d002bc22326aaa6f710ab6f282486c19ef7b6261

11803

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

11804

Date: Thu Oct 14 17:20:58 2010 +0200

11805

11806

Create a EmpathyApp object

11807

11808

src/empathy.c | 418

11809

+++++++++++++++++++++++++++++++++++++--------------------

11810

1 files changed, 271 insertions(+), 147 deletions(-)

11811

11812

commit 2ff9d1b7c0ba3d1fe4e39941a89ed15e74509371

11813

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

11814

Date: Mon Oct 18 10:35:34 2010 +1100

11815

11816

Port empathy-debug-window to GtkComboBoxText

11817

11818

src/empathy-debug-window.c | 4 ++--

11819

1 files changed, 2 insertions(+), 2 deletions(-)

11820

11821

commit dcb853028f46c6d2f9f27af870b3311afb098644

11822

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

11823

Date: Mon Oct 18 10:35:20 2010 +1100

11824

11825

Port empathy-account-assistant to GtkComboBoxText

11826

11827

src/empathy-account-assistant.c | 4 ++--

11828

1 files changed, 2 insertions(+), 2 deletions(-)

11829

11830

commit 0edff90c614fd8011c12c7be6981df5d9443f41b

11831

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

11832

Date: Mon Oct 18 10:35:00 2010 +1100

11833

11834

Port empathy-status-preset-dialog to GtkComboBox

11835

11836

libempathy-gtk/empathy-status-preset-dialog.c | 4 ++--

11837

libempathy-gtk/empathy-status-preset-dialog.h | 2 +-

11838

libempathy-gtk/empathy-status-preset-dialog.ui | 3 ++-

11839

3 files changed, 5 insertions(+), 4 deletions(-)

11840

11841

commit 18c25feae5e0094113b7e7327b3f0de308f1f369

11842

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

11843

Date: Mon Oct 18 10:34:37 2010 +1100

11844

11845

Port empathy-presence-chooser to GtkComboBox

11846

11847

libempathy-gtk/empathy-presence-chooser.c | 24 ++++++++++++++++++------

11848

libempathy-gtk/empathy-presence-chooser.h | 6 +++---

11849

2 files changed, 21 insertions(+), 9 deletions(-)

11850

11851

commit 873f14fac716544d076fea1776f2b44c9dc233f6

11852

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

11853

Date: Mon Oct 18 11:07:07 2010 +1100

11854

11855

Bump GTK+ requirement to 2.91.1

11856

11857

configure.ac | 2 +-

11858

1 files changed, 1 insertions(+), 1 deletions(-)

11859

11860

commit 643dc00f6a6e60f1dae91647301505169e8c7791

11861

Merge: 2a7871a 53ca6d2

11862

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

11863

Date: Mon Oct 18 09:14:11 2010 +1100

11864

11865

Merge branch 'external-accounts'

11866

11867

commit 2a7871af19764420ad2fa78dfa97dca517a130da

11868

Author: Mattias Põldaru <mahfiaz gmail com>

11869

Date: Sun Oct 17 15:12:32 2010 +0300

11870

11871

[l10n] Updated Estonian translation

11872

11873

po/et.po | 100

11874

++++++++++++++++++++++++++++++++++---------------------------

11875

1 files changed, 56 insertions(+), 44 deletions(-)

11876

11877

commit 378e46aee2d8376db3e6fbd1a9356cacf72a7aef

11878

Author: Kjartan Maraas <kmaraas@gnome.org>

11879

Date: Sat Oct 16 12:46:05 2010 +0200

11880

11881

Updated Norwegian bokmål translation

11882

11883

po/nb.po | 815

11884

++++++++++++++++++++++++++++++++------------------------------

11885

1 files changed, 416 insertions(+), 399 deletions(-)

11886

11887

commit 2c5175128196c93f648b165bc7e155f5d9cef1c3

11888

Author: Travis Reitter <travis.reitter@collabora.co.uk>

11889

Date: Wed Oct 13 11:36:05 2010 -0700

11890

11891

Retain the ContactManager for the lifetime of the main window.

11892

11893

The ContactManager doesn't cleanly disconnect its signals when

11894

it's finalized

11895

(or initialized), so we need to retain it for the lifetime of the

11896

main window

11897

to avoid segfaults. It's not worth fixing the ContactManager,

11898

since we're

11899

planning to remove it.

11900

11901

src/empathy-main-window.c | 14 +++++++++-----

11902

1 files changed, 9 insertions(+), 5 deletions(-)

11903

11904

commit 1291ec05478f211d37479fc98904d9d3dda743b0

11905

Author: Travis Reitter <travis.reitter@collabora.co.uk>

11906

Date: Tue Oct 12 23:22:23 2010 -0700

11907

11908

Remove obsolete ContactManager from IndividualManager.

11909

11910

Helps bgo#625969.

11911

11912

libempathy/empathy-individual-manager.c | 5 -----

11913

1 files changed, 0 insertions(+), 5 deletions(-)

11914

11915

commit f5f2d3a1cf71a4fc89c517a15d1413bfd1bfcac5

11916

Author: Travis Reitter <travis.reitter@collabora.co.uk>

11917

Date: Tue Oct 12 23:20:55 2010 -0700

11918

11919

Cut obsolete IndividualManagerFlags.

11920

11921

Helps bgo#625969.

11922

11923

libempathy/empathy-individual-manager.c | 30

11924

------------------------------

11925

libempathy/empathy-individual-manager.h | 13 -------------

11926

2 files changed, 0 insertions(+), 43 deletions(-)

11927

11928

commit 5598cb0b0b012199fb5cfe8a0f2a5b05ed8078c8

11929

Author: Travis Reitter <travis.reitter@collabora.co.uk>

11930

Date: Tue Oct 12 23:16:17 2010 -0700

11931

11932

Add missing #include.

11933

11934

libempathy/empathy-contact.c | 1 +

11935

1 files changed, 1 insertions(+), 0 deletions(-)

11936

11937

commit a4cd05f5f8aeb4067652e4806f0e125b221d8ad1

11938

Author: Travis Reitter <travis.reitter@collabora.co.uk>

11939

Date: Tue Oct 12 22:45:53 2010 -0700

11940

11941

Use Folks to check if a TpConnection can alias and group personas.

11942

11943

Helps bgo#625969.

11944

11945

libempathy-gtk/empathy-individual-menu.c | 7 ++-----

11946

libempathy/empathy-utils.c | 28

11947

++++++++++++++++++++++++++++

11948

libempathy/empathy-utils.h | 2 ++

11949

3 files changed, 32 insertions(+), 5 deletions(-)

11950

11951

commit 4f39984ad575e8ee643e3cf52ad519386c23009e

11952

Author: Travis Reitter <travis.reitter@collabora.co.uk>

11953

Date: Tue Oct 12 09:45:03 2010 -0700

11954

11955

Use Folks to check if a TpConnection can add personas.

11956

11957

Helps bgo#625969.

11958

11959

libempathy-gtk/empathy-individual-dialogs.c | 3 +-

11960

libempathy/empathy-utils.c | 52

11961

+++++++++++++++++++++++++++

11962

libempathy/empathy-utils.h | 3 ++

11963

3 files changed, 56 insertions(+), 2 deletions(-)

11964

11965

commit 31905d995ddb96e2e25a795fa197cb541bc7724d

11966

Author: Travis Reitter <travis.reitter@collabora.co.uk>

11967

Date: Mon Oct 11 12:52:18 2010 -0700

11968

11969

Use Folks to check the ability to remove Individuals in the store

11970

& view.

11971

11972

Helps bgo#625969.

11973

11974

configure.ac | 2 +-

11975

libempathy-gtk/empathy-individual-store.c | 14 ++------

11976

libempathy-gtk/empathy-individual-store.h | 1 -

11977

libempathy-gtk/empathy-individual-view.c | 51

11978

++++++++++++----------------

11979

libempathy-gtk/empathy-individual-view.h | 3 --

11980

5 files changed, 27 insertions(+), 44 deletions(-)

11981

11982

commit cddc09f1ca10d13de7d71fa199b1ae4d5a7c8784

11983

Author: Andrej Žnidaršič <andrej.znidarsic@gmail.com>

11984

Date: Fri Oct 15 21:46:04 2010 +0200

11985

11986

Updated Slovenian translation

11987

11988

help/sl/sl.po | 24 ++++++++++++------------

11989

1 files changed, 12 insertions(+), 12 deletions(-)

11990

11991

commit 1f77f0d10cd6ce602b74210bf708e74d0ca83d52

11992

Author: Andrej Žnidaršič <andrej.znidarsic@gmail.com>

11993

Date: Fri Oct 15 21:44:19 2010 +0200

11994

11995

Updated Slovenian translation

11996

11997

help/sl/sl.po | 1009

11998

++++++++++++++++++++++++++++++---------------------------

11999

1 files changed, 527 insertions(+), 482 deletions(-)

12000

12001

commit aeec22a98c9acae6fe793fbd1e6cd37b5dc9058c

12002

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

12003

Date: Fri Oct 15 11:52:08 2010 +0200

12004

12005

help/.gitignore: ignore sl generated files

12006

12007

help/.gitignore | 2 ++

12008

1 files changed, 2 insertions(+), 0 deletions(-)

12009

12010

commit db7e70826c705e3724cecb2ba509242c3472ede0

12011

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

12012

Date: Fri Oct 15 11:51:27 2010 +0200

12013

12014

help/.gitignore: sort

12015

12016

help/.gitignore | 4 ++--

12017

1 files changed, 2 insertions(+), 2 deletions(-)

12018

12019

commit 63d63edcd3294a47367b530e3b627e4354cc348c

12020

Author: Jorge González <jorgegonz@svn.gnome.org>

12021

Date: Fri Oct 15 11:47:40 2010 +0200

12022

12023

Updated Spanish translation

12024

12025

po/es.po | 70

12026

+++++++++++++++++++++++++++++++++++++++-----------------------

12027

1 files changed, 44 insertions(+), 26 deletions(-)

12028

12029

commit 26e03eb5ff87e6148a7a316c9538e94e6587cfe3

12030

Author: Vitaly Minko <vitaly.minko@gmail.com>

12031

Date: Fri Oct 15 11:18:56 2010 +0200

12032

12033

Separate spelling suggestions in one sub-menu per language (#532832)

12034

12035

libempathy-gtk/empathy-chat.c | 94

12036

+++++++++++++++++++++++++++++----------

12037

libempathy-gtk/empathy-spell.c | 91

12038

++++++++++++++++++++++----------------

12039

libempathy-gtk/empathy-spell.h | 4 +-

12040

src/empathy-preferences.c | 35 ++++++---------

12041

4 files changed, 140 insertions(+), 84 deletions(-)

12042

12043

commit c07cc33d2453bc8bcb5597439f620a7534680d31

12044

Author: Chandni Verma <chandniverma2112@gmail.com>

12045

Date: Fri Oct 15 08:03:48 2010 +0530

12046

12047

A modal dialog to warn the user if account manager could not be

12048

contacted

12049

12050

Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=594576

12051

12052

Reviewed-by: Danielle Madeley <danielle.madeley@collabora.co.uk>

12053

12054

src/empathy.c | 14 ++++++++++++++

12055

1 files changed, 14 insertions(+), 0 deletions(-)

12056

12057

commit b13f029ad4b09ea1c61de7e05ff46eec9b7f2647

12058

Author: Matej Urbančič <mateju@svn.gnome.org>

12059

Date: Thu Oct 14 20:02:10 2010 +0200

12060

12061

Added sl for Slovenian translation

12062

12063

help/Makefile.am | 2 +-

12064

1 files changed, 1 insertions(+), 1 deletions(-)

12065

12066

commit 2afeae6b56b1f0f2e2bc457b23fc54eac05c34c0

12067

Author: Matej Urbančič <mateju@svn.gnome.org>

12068

Date: Thu Oct 14 19:59:45 2010 +0200

12069

12070

Updated Slovenian translation

12071

12072

help/sl/sl.po | 60

12073

++++++++++++++++++++++++++++----------------------------

12074

1 files changed, 30 insertions(+), 30 deletions(-)

12075

12076

commit 7a4c8e7c2e707d20051cfe0fcc5bcfc5a74fc622

12077

Author: Matej Urbančič <mateju@svn.gnome.org>

12078

Date: Thu Oct 14 19:55:41 2010 +0200

12079

12080

Added Slovenian translation

12081

12082

help/sl/sl.po | 2267

12083

+++++++++++++++++++++++++++++++++++++++++++++++++++++++++

12084

1 files changed, 2267 insertions(+), 0 deletions(-)

12085

12086

commit 054e1f0bf407756fa8380513d3b1d24930503cce

12087

Author: Vitaly Minko <vitaly.minko@gmail.com>

12088

Date: Thu Oct 14 11:55:25 2010 +0200

12089

12090

Check format of some user names (#629261)

12091

12092

libempathy-gtk/empathy-account-widget.c | 113

12093

+++++++++++++++++++++++++++++++

12094

libempathy/empathy-account-settings.c | 106

12095

+++++++++++++++++++++++------

12096

libempathy/empathy-account-settings.h | 8 ++

12097

3 files changed, 205 insertions(+), 22 deletions(-)

12098

12099

commit 1f107665d98cfba8175d47b46ff35dca07d886bc

12100

Author: Yaron Shahrabani <sh.yaron@gmail.com>

12101

Date: Thu Oct 14 11:14:18 2010 +0200

12102

12103

Updated Hebrew translation.

12104

12105

po/he.po | 103

12106

+++++++++++++++++++++++++++++++------------------------------

12107

1 files changed, 52 insertions(+), 51 deletions(-)

12108

12109

commit fd1ccf04926964b9434701791c5f62078c5a69c4

12110

Author: Cheng-Chia Tseng <pswo10680@gmail.com>

12111

Date: Wed Oct 13 15:50:37 2010 +0800

12112

12113

Updated Traditional Chinese translation(Hong Kong and Taiwan)

12114

12115

po/zh_HK.po | 707

12116

+++++++++++++++++++++++++++++++----------------------------

12117

po/zh_TW.po | 705

12118

+++++++++++++++++++++++++++++++----------------------------

12119

2 files changed, 743 insertions(+), 669 deletions(-)

12120

12121

commit 33c0aab9178123734e88c5ac14e86fba36e05ff8

12122

Author: A S Alam <aalam@users.sf.net>

12123

Date: Wed Oct 13 07:37:53 2010 +0530

12124

12125

updating translation for Punjabi

12126

12127

po/pa.po | 737

12128

++++++++++++++++++++++++++++++++------------------------------

12129

1 files changed, 380 insertions(+), 357 deletions(-)

12130

12131

commit c959939c36693235243c46fcdbfe956eff943472

12132

Author: Jorge González <jorgegonz@svn.gnome.org>

12133

Date: Tue Oct 12 22:51:32 2010 +0200

12134

12135

Updated Spanish translation

12136

12137

po/es.po | 19 +++----------------

12138

1 files changed, 3 insertions(+), 16 deletions(-)

12139

12140

commit 888df7fc53595e18c5de077860881bd10f327cc5

12141

Author: Vitaly Minko <vitaly.minko@gmail.com>

12142

Date: Mon Oct 11 15:51:38 2010 +0200

12143

12144

enable imported Pidgin accounts if needed (#594145)

12145

12146

src/empathy-import-pidgin.c | 53

12147

+++++++++++++++++++++++++++++++++++++++---

12148

src/empathy-import-utils.c | 1 +

12149

src/empathy-import-utils.h | 2 +

12150

src/empathy-import-widget.c | 11 ++++++++-

12151

4 files changed, 62 insertions(+), 5 deletions(-)

12152

12153

commit 4722911e579557b37f543ee03d51562c02272184

12154

Author: Jorge González <jorgegonz@svn.gnome.org>

12155

Date: Mon Oct 11 14:34:58 2010 +0200

12156

12157

Updated Spanish translation

12158

12159

po/es.po | 384

12160

++++++++++++++++++++++++++++++++------------------------------

12161

1 files changed, 198 insertions(+), 186 deletions(-)

12162

12163

commit b8a1793bad1703c8a4aa6c487e41346e42527df0

12164

Author: Fran Diéguez <fran.dieguez@mabishu.com>

12165

Date: Mon Oct 11 10:33:54 2010 +0200

12166

12167

Updated Galician translations

12168

12169

po/gl.po | 706

12170

+++++++++++++++++++++++++++++++-------------------------------

12171

1 files changed, 358 insertions(+), 348 deletions(-)

12172

12173

commit 53ca6d2ca5de5401e55171bc71a3d75cc7e18fb8

12174

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

12175

Date: Mon Oct 11 19:13:26 2010 +1100

12176

12177

Bump required tp-glib version to 0.13.1.1

12178

12179

configure.ac | 2 +-

12180

1 files changed, 1 insertions(+), 1 deletions(-)

12181

12182

commit 0ee7dc02b4f710edcd83a41910ce5cdf5e51475b

12183

Merge: 8cfe1e4 6c8e88f

12184

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

12185

Date: Mon Oct 11 19:04:12 2010 +1100

12186

12187

Merge branch 'gcr-trivia-631657'

12188

12189

commit 6c8e88f2405c3c8f9b8ed8942407643ff5eeed0f

12190

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

12191

Date: Mon Oct 11 12:34:24 2010 +1100

12192

12193

Force the GcrCertificateWidget to be at least 150 pixels high

12194

12195

libempathy-gtk/empathy-tls-dialog.c | 7 +++++++

12196

1 files changed, 7 insertions(+), 0 deletions(-)

12197

12198

commit 5c5bf4621619277a7a24e328f8a46ba49bb4211f

12199

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

12200

Date: Mon Oct 11 12:04:12 2010 +1100

12201

12202

Remove formatting line breaks from translatable strings.

12203

12204

Add extra line breaks.

12205

Add punctuation to translatable strings.

12206

12207

libempathy-gtk/empathy-tls-dialog.c | 27 ++++++++++++++-------------

12208

1 files changed, 14 insertions(+), 13 deletions(-)

12209

12210

commit 8cfe1e4d27b1da878ded1811f07f995ae3c34ccc

4701

12211

Author: Gil Forcada <gforcada@gnome.org>

4702

12212

Date: Sun Oct 10 23:12:15 2010 +0200

4703

12213

4707

12217

++++++++++++++++++++++++++++++++++++++------------------------

4708

12218

1 files changed, 1194 insertions(+), 738 deletions(-)

4709

12219

4710

commit 12e15a6e2d01109751273c37ee7d2e7ed60792c1

12220

commit 7a9411155285e47b40d5c82327a4074116645c0a

4711

12221

Author: Changwoo Ryu <cwryu@debian.org>

4712

12222

Date: Sat Oct 9 09:14:51 2010 +0900

4713

12223

4717

12227

+++++++++++++++++++++++++++++++++++++++-----------------------

4718

12228

1 files changed, 1245 insertions(+), 749 deletions(-)

4719

12229

4720

commit c5973960fd01e9c461dc19a1dcd3f8cf40bde6c3

12230

commit 69ccb1c49425512fd078f7d6901fbb0058c87fe9

12231

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

12232

Date: Fri Oct 8 13:07:33 2010 +1100

12233

12234

Fix Empathy to build with gcr-3

12235

12236

Closes https://bugzilla.gnome.org/show_bug.cgi?id=631657

12237

12238

libempathy-gtk/empathy-tls-dialog.c | 4 ++--

12239

1 files changed, 2 insertions(+), 2 deletions(-)

12240

12241

commit 99651e27bfe1dd1be31db6119f2cbd8686a905d0

12242

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

12243

Date: Fri Oct 8 13:06:14 2010 +1100

12244

12245

Access Account.I.Storage properties via TpAccount

12246

12247

libempathy-gtk/empathy-account-widget.c | 73

12248

++++++++++++++++---------------

12249

libempathy/empathy-account-settings.c | 9 +++-

12250

2 files changed, 45 insertions(+), 37 deletions(-)

12251

12252

commit aaebc7e2323b89aa577d7d724257522fd0407d3f

12253

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

12254

Date: Fri Oct 8 12:27:17 2010 +1100

12255

12256

Revert changes to empathy-account-settings

12257

12258

libempathy/empathy-account-settings.c | 92

12259

---------------------------------

12260

libempathy/empathy-account-settings.h | 10 ----

12261

2 files changed, 0 insertions(+), 102 deletions(-)

12262

12263

commit 9936a3252f26ddd99e936ad41dc03b1e83eba6ea

12264

Author: Danielle Madeley <danielle.madeley@collabora.co.uk>

12265

Date: Fri May 21 19:23:22 2010 +1000

12266

12267

Support Account.Interface.Storage

12268

12269

Also support org.moblin.libsocialweb for Meego

12270

12271

configure.ac | 1 +

12272

libempathy-gtk/empathy-account-widget.c | 169

12273

++++++++++++++++++++++++++-----

12274

libempathy/empathy-account-settings.c | 92 +++++++++++++++++

12275

libempathy/empathy-account-settings.h | 10 ++

12276

4 files changed, 246 insertions(+), 26 deletions(-)

12277

12278

commit 6f6575656b1553190bbaf698ee0671a6a8bc5bf4

12279

Author: Matej Urbančič <mateju@svn.gnome.org>

12280

Date: Wed Oct 6 15:06:38 2010 +0200

12281

12282

Updated Slovenian translation

12283

12284

po/sl.po | 1069

12285

+++++++++++++++++++++++++++-----------------------------------

12286

1 files changed, 459 insertions(+), 610 deletions(-)

12287

12288

commit e2087d9cd12d7f79e7409618b5ff661d04d9e686

4721

12289

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

4722

12290

Date: Wed Oct 6 12:06:59 2010 +0200

4723

12291

4728

12296

src/empathy-main-window.c | 3 +++

4729

12297

1 files changed, 3 insertions(+), 0 deletions(-)

4730

12298

4731

commit cd7f80c3c7028d7e688321b26fecfc3429121851

12299

commit 9ff924e6e512d21414e080d78b93cdde8a3ae4fa

12300

Author: Yaron Shahrabani <sh.yaron@gmail.com>

12301

Date: Wed Oct 6 01:49:12 2010 +0200

12302

12303

Updated Hebrew translation.

12304

12305

po/he.po | 601

12306

+++++++++++++++++++++++++++++++-------------------------------

12307

1 files changed, 304 insertions(+), 297 deletions(-)

12308

12309

commit c772ac27197ef0440c81bc45496fa78875004da5

12310

Author: Travis Reitter <travis.reitter@collabora.co.uk>

12311

Date: Mon Oct 4 11:48:38 2010 -0700

12312

12313

Update for changes to GTK 3 API.

12314

12315

libempathy-gtk/empathy-cell-renderer-activatable.c | 4 +-

12316

libempathy-gtk/empathy-cell-renderer-expander.c | 26

12317

++++++++++----------

12318

libempathy-gtk/empathy-cell-renderer-text.c | 16 ++++++------

12319

3 files changed, 23 insertions(+), 23 deletions(-)

12320

12321

commit 1594b24862967f7d0046c8d4328b11a0b2b45330

12322

Author: Travis Reitter <travis.reitter@collabora.co.uk>

12323

Date: Thu Sep 30 20:20:51 2010 -0700

12324

12325

Don't bother fetching contact avatar details, since we already do

12326

that in Folks.

12327

12328

libempathy/empathy-tp-contact-factory.c | 2 --

12329

1 files changed, 0 insertions(+), 2 deletions(-)

12330

12331

commit 53aa7c1e6546214568969fe727926f7740a26127

12332

Author: Philip Withnall <philip.withnall@collabora.co.uk>

12333

Date: Wed Sep 15 15:23:14 2010 +0100

12334

12335

Port Empathy to use FolksAliasable and FolksGroupable

12336

12337

FolksAliasable is the new name for FolksAlias, and FolksGroupable

12338

is the new name for FolksGroups.

12339

12340

configure.ac | 2 +-

12341

libempathy-gtk/empathy-contact-widget.c | 4 +-

12342

libempathy-gtk/empathy-groups-widget.c | 48

12343

++++++++++++++--------------

12344

libempathy-gtk/empathy-groups-widget.h | 6 ++--

12345

libempathy-gtk/empathy-individual-view.c | 8 ++--

12346

libempathy-gtk/empathy-individual-widget.c | 12 +++---

12347

libempathy-gtk/empathy-persona-store.c | 16 +++++----

12348

libempathy/empathy-contact.c | 14 ++++----

12349

libempathy/empathy-individual-manager.c | 6 ++--

12350

libempathy/empathy-utils.c | 2 +-

12351

libempathy/empathy-utils.h | 2 +-

12352

11 files changed, 61 insertions(+), 59 deletions(-)

12353

12354

commit 3195780450fdcfe8678bf29e5fd20cb957283bc2

4732

12355

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

4733

Date: Mon Oct 4 16:12:18 2010 +0200

12356

Date: Mon Oct 4 16:50:53 2010 +0200

4734

12357

4735

12358

remove released flag

4736

12359

4737

12360

configure.ac | 2 +-

4738

12361

1 files changed, 1 insertions(+), 1 deletions(-)

4739

12362

4740

commit b5dc9ffdb3b1b5baf17094b94fd2f4e990176954

4741

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

4742

Date: Mon Oct 4 13:19:09 2010 +0200

4743

4744

prepare 2.32.0.1 release

4745

4746

NEWS | 44 ++++++++++++++++++++++++++++++++++++++++++++

12363

commit a8bb1c59bba2f69ff3110822f2353c16f49d5a6a

12364

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

12365

Date: Mon Oct 4 13:01:11 2010 +0200

12366

12367

prepare 2.91.0 release

12368

12369

NEWS | 27 +++++++++++++++++++++++++++

12370

configure.ac | 6 +++---

12371

2 files changed, 30 insertions(+), 3 deletions(-)

12372

12373

commit d5bcb9462a07ab89e5ce525c0f3572fd94feceed

12374

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

12375

Date: Mon Oct 4 13:33:49 2010 +0200

12376

12377

Bump required version of libcanberra and Webkit

12378

12379

We now depends on the GTK+-3 flavour of those libs. Best to depend

12380

on the

12381

version which introduced the new pc file to make things clearer

12382

to packagers.

12383

4747

12384

configure.ac | 4 ++--

4748

2 files changed, 46 insertions(+), 2 deletions(-)

4749

4750

commit 6c40c743fce1357a64290064d5f093274702a0b2

12385

1 files changed, 2 insertions(+), 2 deletions(-)

12386

12387

commit ab782c7ac56fedf80b3c839b59670538675b7558

12388

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

12389

Date: Mon Oct 4 13:23:32 2010 +0200

12390

12391

Depends on latest GTK3 release

12392

12393

We already depends on it as we ported Empathy to latest API changes.

12394

12395

configure.ac | 2 +-

12396

1 files changed, 1 insertions(+), 1 deletions(-)

12397

12398

commit 4fca76dda02cb3dde2c0ae4b14895fdb3381acbc

4751

12399

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

4752

12400

Date: Mon Oct 4 13:00:57 2010 +0200

4753

12401

4756

12404

release.py | 2 +-

4757

12405

1 files changed, 1 insertions(+), 1 deletions(-)

4758

12406

4759

commit 47c3bf561bd8fc2c6703ad6baf301ca29d9185e7

4760

Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

4761

Date: Mon Sep 20 18:38:49 2010 +0100

4762

4763

Set the ptime multiple for PCM codecs to 20ms, needed for interop

4764

with some SIP phones

4765

4766

data/element-properties | 6 ++++++

4767

1 files changed, 6 insertions(+), 0 deletions(-)

4768

4769

commit 6c7d6ae27283e2a54b97198baedfe9c26b812b46

12407

commit 2283d55ce9a4cbb3076ce9ae2e95ba70239ca782

12408

Merge: a63cc37 0c0e2b5

12409

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

12410

Date: Mon Oct 4 15:51:47 2010 +0200

12411

12412

Merge remote branch 'sjoerd/master'

12413

12414

commit a63cc377a55674f8b9ff5870e1d5db211c43049a

4770

12415

Author: Cosimo Cecchi <cosimoc@gnome.org>

4771

12416

Date: Mon Oct 4 11:13:22 2010 +0200

4772

12417

4778

12423

libempathy/empathy-tls-verifier.c | 5 ++++-

4779

12424

1 files changed, 4 insertions(+), 1 deletions(-)

4780

12425

4781

commit f060ca8527d66c601d624394f4d46c037c713f34

12426

commit ae556603dd7e354ba17657bee405f20d4d84c902

4782

12427

Author: Vincent Untz <vuntz@gnome.org>

4783

12428

Date: Sun Oct 3 21:25:05 2010 +0200

4784

12429

4789

12434

libempathy-gtk/empathy-individual-menu.c | 2 ++

4790

12435

1 files changed, 2 insertions(+), 0 deletions(-)

4791

12436

4792

commit 43385565c3c422cc6c1b7748ab8e6af3143c5a12

12437

commit 2afe7493a5d5bc0edac6525b02f8cc5e414a7aa0

4793

12438

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

4794

12439

Date: Mon Oct 4 09:50:02 2010 +0200

4795

12440

4798

12443

libempathy-gtk/empathy-contact-menu.c | 1 -

4799

12444

1 files changed, 0 insertions(+), 1 deletions(-)

4800

12445

4801

commit 64ae3cbe9c5231db131c61cf54255819264c741f

12446

commit bc597f022145cdfbd661d4355583d85c86e0c7f4

12447

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

12448

Date: Mon Oct 4 10:49:07 2010 +0200

12449

12450

chat-window: port to new GtkNotebook API

12451

12452

src/empathy-chat-window.c | 11 +++++++----

12453

1 files changed, 7 insertions(+), 4 deletions(-)

12454

12455

commit 166ee29973d7db1d0a7a5844eaa488470f5079f9

12456

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

12457

Date: Thu Sep 30 16:17:46 2010 +0200

12458

12459

call-window: remove GTK2 compat code

12460

12461

src/empathy-call-window.c | 9 ---------

12462

1 files changed, 0 insertions(+), 9 deletions(-)

12463

12464

commit 442462170b4be90281b67a76e2e3f38daa3a8beb

12465

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

12466

Date: Thu Sep 30 15:27:55 2010 +0200

12467

12468

remove has-separator property from XML files

12469

12470

It has been removed from GtkDialog

12471

12472

libempathy-gtk/empathy-account-widget-irc.ui | 1 -

12473

libempathy-gtk/empathy-contact-dialogs.ui | 1 -

12474

src/empathy-ft-manager.ui | 1 -

12475

src/empathy-new-chatroom-dialog.ui | 1 -

12476

4 files changed, 0 insertions(+), 4 deletions(-)

12477

12478

commit 6c8ce8dd1587c237c4cadf5b91c3aa117cc01ae1

12479

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

12480

Date: Thu Sep 30 15:14:32 2010 +0200

12481

12482

don't set has-window on the spinner

12483

12484

There is no reason to and that makes GTK assert.

12485

12486

src/empathy-main-window.c | 1 -

12487

1 files changed, 0 insertions(+), 1 deletions(-)

12488

12489

commit 28cda4cfa04b92840430137ecb366769d1a28791

12490

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

12491

Date: Thu Sep 30 14:09:02 2010 +0200

12492

12493

empathy-video-widget: port to new GTK+3 API

12494

12495

libempathy-gtk/empathy-video-widget.c | 22 +++++++++++++---------

12496

1 files changed, 13 insertions(+), 9 deletions(-)

12497

12498

commit e47e07d74933c39641c56bfa2f66fd9b31007993

12499

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

12500

Date: Thu Sep 30 11:51:19 2010 +0200

12501

12502

remove EmpathyKludgeLabel

12503

12504

It shouldn't be needed any more with GTK-3.

12505

12506

libempathy-gtk/Makefile.am | 2 -

12507

libempathy-gtk/empathy-contact-widget.c | 4 +-

12508

libempathy-gtk/empathy-individual-widget.c | 4 +-

12509

libempathy-gtk/empathy-kludge-label.c | 92

12510

----------------------------

12511

libempathy-gtk/empathy-kludge-label.h | 53 ----------------

12512

5 files changed, 2 insertions(+), 153 deletions(-)

12513

12514

commit aae6cabf7a463de9c7586fecc3d909db6b1194a9

12515

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

12516

Date: Thu Sep 30 11:29:49 2010 +0200

12517

12518

Import latest version of ev-sidebar from totem

12519

12520

This one builds fine with GTK-3. Also, stop renamespacing it so it's

12521

easier to

12522

update it.

12523

12524

src/Makefile.am | 9 +-

12525

src/empathy-call-window.c | 28 +-

12526

src/empathy-sidebar.c | 606

12527

---------------------------------------------

12528

src/empathy-sidebar.h | 85 -------

12529

src/ev-sidebar.c | 338 +++++++++++++++++++++++++

12530

src/ev-sidebar.h | 76 ++++++

12531

6 files changed, 434 insertions(+), 708 deletions(-)

12532

12533

commit 47d11da4f3d9cefb236143a3c229128b91f64419

12534

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

12535

Date: Wed Sep 29 16:57:54 2010 +0200

12536

12537

empathy_window_iconify: use gdk_window_get_display()

12538

12539

libempathy-gtk/empathy-ui-utils.c | 2 +-

12540

1 files changed, 1 insertions(+), 1 deletions(-)

12541

12542

commit e129fe6f1784b3e2b4012961fc9f553b9213d986

12543

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

12544

Date: Wed Sep 29 16:14:30 2010 +0200

12545

12546

about-dialog: gtk_about_dialog_set_url_hook has been removed

12547

12548

src/empathy-about-dialog.c | 14 --------------

12549

1 files changed, 0 insertions(+), 14 deletions(-)

12550

12551

commit 75b6dbfd673890da51b7b969acfc1b7e9d644760

12552

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

12553

Date: Wed Sep 29 16:10:25 2010 +0200

12554

12555

individual-linker: no more need to implement size_request

12556

12557

libempathy-gtk/empathy-individual-linker.c | 26

12558

--------------------------

12559

1 files changed, 0 insertions(+), 26 deletions(-)

12560

12561

commit ee234cca5708bbccf5d538f75bf85fa46aa2a274

12562

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

12563

Date: Wed Sep 29 16:09:23 2010 +0200

12564

12565

no more need to implement chat_size_request

12566

12567

libempathy-gtk/empathy-chat.c | 24 ------------------------

12568

1 files changed, 0 insertions(+), 24 deletions(-)

12569

12570

commit 68b25e741eaee424bc108fce67f2a65df4151448

12571

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

12572

Date: Wed Sep 29 16:05:40 2010 +0200

12573

12574

no more need to implement empathy_search_bar_size_request

12575

12576

GtkBin is smarter now and does it for us.

12577

12578

libempathy-gtk/empathy-search-bar.c | 22 ----------------------

12579

1 files changed, 0 insertions(+), 22 deletions(-)

12580

12581

commit 5a5b01af718f2db74fb131b1fa6d3cc14ad88793

12582

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

12583

Date: Wed Sep 29 16:03:48 2010 +0200

12584

12585

cell_renderer_text_render: update to new API

12586

12587

libempathy-gtk/empathy-cell-renderer-text.c | 18 ++++++++----------

12588

1 files changed, 8 insertions(+), 10 deletions(-)

12589

12590

commit cce96b15f7ee09f7666d6b2e081ad8bddc197d3c

12591

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

12592

Date: Wed Sep 29 16:03:14 2010 +0200

12593

12594

empathy_cell_renderer_expander_render: update to new API

12595

12596

libempathy-gtk/empathy-cell-renderer-expander.c | 20

12597

+++++++++-----------

12598

1 files changed, 9 insertions(+), 11 deletions(-)

12599

12600

commit 8fda16b2e760ca46315aa6b9ef7434e741940a92

12601

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

12602

Date: Wed Sep 29 15:57:57 2010 +0200

12603

12604

cell_renderer_activatable_render: update to new API

12605

12606

libempathy-gtk/empathy-cell-renderer-activatable.c | 15 +++++++--------

12607

1 files changed, 7 insertions(+), 8 deletions(-)

12608

12609

commit e7e4a5c52a92f3d0b328b7a66b14063d9ef96fa8

12610

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

12611

Date: Wed Sep 29 15:55:59 2010 +0200

12612

12613

use gdk_error_trap_pop_ignored() instead of gdk_error_trap_pop()

12614

12615

We actually ignore the return value.

12616

12617

libempathy-gtk/empathy-avatar-image.c | 2 +-

12618

1 files changed, 1 insertions(+), 1 deletions(-)

12619

12620

commit b70f96a527146903d637ef75434423da9a5b7468

12621

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

12622

Date: Wed Sep 29 15:45:08 2010 +0200

12623

12624

GDK keys are now GDK_KEY_*

12625

12626

libempathy-gtk/empathy-contact-list-view.c | 4 ++--

12627

libempathy-gtk/empathy-individual-view.c | 4 ++--

12628

libempathy-gtk/empathy-live-search.c | 14 +++++++-------

12629

libempathy-gtk/empathy-presence-chooser.c | 4 ++--

12630

libempathy-gtk/empathy-search-bar.c | 2 +-

12631

src/empathy-call-window.c | 2 +-

12632

src/empathy-chat-window.c | 4 ++--

12633

src/empathy-debug-window.c | 4 ++--

12634

src/empathy-ft-manager.c | 4 ++--

12635

src/empathy-main-window.c | 2 +-

12636

src/empathy-sidebar.c | 8 ++++----

12637

src/empathy-status-icon.c | 2 +-

12638

12 files changed, 27 insertions(+), 27 deletions(-)

12639

12640

commit 23535a4ce054f952aa31012bbbc2fd894ba77ecd

12641

Author: Matthias Clasen <mclasen@redhat.com>

12642

Date: Tue Sep 28 15:45:17 2010 +0200

12643

12644

Stop using GtkObject (#630685)

12645

12646

libempathy-gtk/empathy-live-search.c | 4 ++--

12647

src/empathy-sidebar.c | 8 +++-----

12648

2 files changed, 5 insertions(+), 7 deletions(-)

12649

12650

commit b9881f163ef17c95689cd65f5a9311e8759eb774

12651

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

12652

Date: Thu Sep 30 16:17:25 2010 +0200

12653

12654

hard depend on GTK3 (#623925)

12655

12656

configure.ac | 112

12657

+++++++++++++---------------------------------------------

12658

1 files changed, 25 insertions(+), 87 deletions(-)

12659

12660

commit 96800fa8a3afc1dca53a76dabf2dea30de27e348

12661

Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

12662

Date: Mon Sep 20 18:38:49 2010 +0100

12663

12664

Set the ptime multiple for PCM codecs to 20ms, needed for interop

12665

with some SIP phones

12666

12667

data/element-properties | 6 ++++++

12668

1 files changed, 6 insertions(+), 0 deletions(-)

12669

12670

commit eec595130fcd2488e9c5bb99f03c9756082be223

4802

12671

Author: Milo Casagrande <milo@ubuntu.com>

4803

12672

Date: Sat Oct 2 10:44:40 2010 +0200

4804

12673

4808

12677

+++++++++++++++++++++++++++++++++++++++------------------

4809

12678

1 files changed, 442 insertions(+), 204 deletions(-)

4810

12679

4811

commit cd666fbc2575fbd7bfe566f09f2cff981fa575b3

4812

Author: Daniel Nylander <po@danielnylander.se>

4813

Date: Sat Oct 2 05:50:35 2010 +0200

4814

4815

Updated Swedish translation

4816

4817

po/sv.po | 370

4818

++++++++++++++++++++++++++++++++------------------------------

4819

1 files changed, 190 insertions(+), 180 deletions(-)

4820

4821

commit 0e0dd96df0ae10ee87f7cf258327bf70c4969f12

12680

commit c1ce4603c615b7a9e0d46876b8ca03cc539093de

12681

Author: Milo Casagrande <milo@ubuntu.com>

12682

Date: Fri Oct 1 22:44:57 2010 +0200

12683

12684

[help] Removed SIP provider link, fixes bug #631049

12685

12686

help/C/create-account.page | 5 +----

12687

1 files changed, 1 insertions(+), 4 deletions(-)

12688

12689

commit ecc9b3d5e04bd929179b500ca5b84ee82dfc8e3c

12690

Author: Matej Urbančič <mateju@svn.gnome.org>

12691

Date: Fri Oct 1 15:11:24 2010 +0200

12692

12693

Updated Slovenian translation

12694

12695

po/sl.po | 456

12696

++++++++++++++++++++++++++++++++++++++++---------------------

12697

1 files changed, 299 insertions(+), 157 deletions(-)

12698

12699

commit 3c961e3c9ca41b941b0846a3dd5e78f8bcfde866

4822

12700

Author: Jorge González <jorgegonz@svn.gnome.org>

4823

Date: Fri Oct 1 12:29:15 2010 +0200

12701

Date: Fri Oct 1 12:28:33 2010 +0200

4824

12702

4825

12703

Updated Spanish translation

4826

12704

4827

po/es.po | 247

4828

+++++++++++++++++++++++++++++++-------------------------------

4829

1 files changed, 124 insertions(+), 123 deletions(-)

4830

4831

commit 6850d5e6a123e4f261a0abef3e895c61ff223e06

12705

po/es.po | 480

12706

++++++++++++++++++++++++++++++++------------------------------

12707

1 files changed, 245 insertions(+), 235 deletions(-)

12708

12709

commit 36e8870de17b9dffab299e3f4f099a10db6e67af

12710

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

12711

Date: Fri Oct 1 12:01:41 2010 +0200

12712

12713

remove 'import-asked' gsettings key

12714

12715

data/empathy.convert | 1 -

12716

data/org.gnome.Empathy.gschema.xml.in | 5 -----

12717

libempathy/empathy-gsettings.h | 1 -

12718

3 files changed, 0 insertions(+), 7 deletions(-)

12719

12720

commit f08b753e0c8f29709390c832275290dc2934fe82

12721

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

12722

Date: Fri Oct 1 11:56:24 2010 +0200

12723

12724

accounts-dialog: stop displaying the import dialog automatically

12725

(#631080)

12726

12727

User had seen the nice assistant before so he already imported his

12728

account if

12729

he wanted to.

12730

12731

src/empathy-accounts-dialog.c | 19 -------------------

12732

1 files changed, 0 insertions(+), 19 deletions(-)

12733

12734

commit db94fca28c28e0025d8d36bd5e4048a6213b482e

12735

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

12736

Date: Fri Oct 1 11:26:27 2010 +0200

12737

12738

empathy_account_settings_set_*: check arguments

12739

12740

libempathy/empathy-account-settings.c | 20 ++++++++++++++++++++

12741

1 files changed, 20 insertions(+), 0 deletions(-)

12742

12743

commit 25d8783e9f0a72dcd2210b9f4ec0dbc7994140a6

12744

Author: Bilal Akhtar <bilalakhtar@ubuntu.com>

12745

Date: Fri Oct 1 10:47:09 2010 +0300

12746

12747

Move the 'Clear' menu option in the chat window right-click context

12748

menu to the last place. (#629544)

12749

12750

libempathy-gtk/empathy-chat-text-view.c | 4 ++--

12751

1 files changed, 2 insertions(+), 2 deletions(-)

12752

12753

commit 381be5d52f5410939dce528a6a3beda9b70b231c

4832

12754

Author: Michael Kotsarinis <mk73628@gmail.com>

4833

12755

Date: Fri Oct 1 02:32:35 2010 +0300

4834

12756

4838

12760

+++++++++++++++++++++++++++++++++++++++------------------

4839

12761

1 files changed, 235 insertions(+), 107 deletions(-)

4840

12762

4841

commit 5531b2ddfd1399771a159f57b541dcc62a1c9578

12763

commit ab542dc5acbf1727552c711427d15a4f07b7e5d8

4842

12764

Author: Simos Xenitellis <simos@gnome.org>

4843

12765

Date: Thu Sep 30 15:11:56 2010 +0300

4844

12766

4848

12770

+++++++++++++++++++++++++++++++++++++++-----------------------

4849

12771

1 files changed, 458 insertions(+), 270 deletions(-)

4850

12772

4851

commit 077b4020f267b8946807ed813c8cf6715561fad6

12773

commit bf32549f220c7adb3133b413490cf1af276c9cc6

12774

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

12775

Date: Thu Sep 30 11:38:12 2010 +0200

12776

12777

coding style fixes

12778

12779

libempathy/empathy-utils.c | 4 ++--

12780

1 files changed, 2 insertions(+), 2 deletions(-)

12781

12782

commit 1e6d8b7b214389b03bb94762333c0f15e6351579

12783

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

12784

Date: Thu Sep 30 11:35:59 2010 +0200

12785

12786

add empathy-protocol-chooser.c to POTFILES.in

12787

12788

po/POTFILES.in | 1 +

12789

1 files changed, 1 insertions(+), 0 deletions(-)

12790

12791

commit b68e00fd8bba2dec6140eaa45be99f3cf9e8287b

12792

Merge: f83fcfb 204eecf

12793

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

12794

Date: Wed Sep 29 17:37:26 2010 +0200

12795

12796

Merge branch 'conference-tp-glib-630709'

12797

12798

commit f83fcfb28e6cf8d3f2ba31dddebc597eac934dae

4852

12799

Author: Žygimantas Beručka <zygis@gnome.org>

4853

12800

Date: Wed Sep 29 14:18:30 2010 +0200

4854

12801

4858

12805

+++++++++++++++++++++++++-------------------------------------

4859

12806

1 files changed, 132 insertions(+), 193 deletions(-)

4860

12807

4861

commit 1f519ac5c0e9b8e2dd99063876f7969374e1c147

12808

commit 204eecf6dd4fc8da63f3f82e93af1ffa72836583

12809

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

12810

Date: Wed Sep 29 14:09:26 2010 +0200

12811

12812

use TP_PROP_*

12813

12814

libempathy/empathy-tp-chat.c | 10 +++++-----

12815

1 files changed, 5 insertions(+), 5 deletions(-)

12816

12817

commit 140247122d8b06b3ed1c293c562306a3056a373a

12818

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

12819

Date: Wed Sep 29 14:02:07 2010 +0200

12820

12821

Stop generating Conference API

12822

12823

extensions/Channel_Interface_Conference.xml | 635

12824

---------------------------

12825

extensions/Makefile.am | 1 -

12826

extensions/misc.xml | 1 -

12827

3 files changed, 0 insertions(+), 637 deletions(-)

12828

12829

commit 12c53ccc7ab841ec7a6e52c3718316952d2518a9

12830

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

12831

Date: Wed Sep 29 14:04:15 2010 +0200

12832

12833

use tp-glib API for Conference (#630709)

12834

12835

libempathy/empathy-tp-chat.c | 8 ++++----

12836

1 files changed, 4 insertions(+), 4 deletions(-)

12837

12838

commit 733e7394cb7f805c41332c07336347e87b86c590

12839

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

12840

Date: Wed Sep 29 14:02:22 2010 +0200

12841

12842

bump tp-glib dep to 0.11.16

12843

12844

Conference API is generated since this version.

12845

12846

configure.ac | 2 +-

12847

1 files changed, 1 insertions(+), 1 deletions(-)

12848

12849

commit 5cf10ed55ac02529b7ad8d960e6974da0bf4bf5f

4862

12850

Author: Gabor Kelemen <kelemeng@gnome.hu>

4863

12851

Date: Wed Sep 29 13:53:53 2010 +0200

4864

12852

4867

12855

help/hu/hu.po | 2 +-

4868

12856

1 files changed, 1 insertions(+), 1 deletions(-)

4869

12857

12858

commit e713c34cf46fe2d1159f8c1d62cae220c8f40f3b

12859

Author: Mario Blättermann <mariobl@gnome.org>

12860

Date: Wed Sep 29 13:28:16 2010 +0200

12861

12862

[i18n] Updated German translation

12863

12864

po/de.po | 361

12865

+++++++++++++++++++++++++++++++-------------------------------

12866

1 files changed, 179 insertions(+), 182 deletions(-)

12867

12868

commit 1079bc533604184921cbd08cb85416cf33e721b7

12869

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

12870

Date: Wed Sep 29 12:59:28 2010 +0200

12871

12872

Update version

12873

12874

Next release will be 2.91.0 so let's be 2.90.99 for now.

12875

12876

configure.ac | 4 ++--

12877

1 files changed, 2 insertions(+), 2 deletions(-)

12878

12879

commit 2e589ed7517c0f98320481b93d6a9fcc39d56a3b

12880

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

12881

Date: Tue Sep 28 13:30:03 2010 +0200

12882

12883

use gettext() instead of _()

12884

12885

libempathy/empathy-utils.c | 4 ++--

12886

1 files changed, 2 insertions(+), 2 deletions(-)

12887

12888

commit 4ac0bdf3c3322e5f4d94586569b8c60244e421c1

12889

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

12890

Date: Tue Sep 28 13:19:42 2010 +0200

12891

12892

allow to translate 'Google Talk'

12893

12894

We allow to translate 'Facebook Chat' so best stay coherent.

12895

12896

libempathy/empathy-utils.c | 2 +-

12897

1 files changed, 1 insertions(+), 1 deletions(-)

12898

12899

commit d6e5c9087b7c611c8b03a5239dbf9eb5aa50a9b4

12900

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

12901

Date: Fri Sep 17 16:27:39 2010 +0200

12902

12903

Allow to set the Service of newly created account (#629734)

12904

12905

libempathy-gtk/empathy-protocol-chooser.c | 2 +-

12906

libempathy/empathy-account-settings.c | 32

12907

+++++++++++++++++++++++++++++

12908

libempathy/empathy-account-settings.h | 4 +++

12909

src/empathy-auto-salut-account-helper.c | 2 +-

12910

4 files changed, 38 insertions(+), 2 deletions(-)

12911

12912

commit 9cd957b56a67984b4fd3d89aec3e6606372462d7

12913

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

12914

Date: Fri Sep 17 15:55:45 2010 +0200

12915

12916

factor out empathy_protocol_chooser_create_account_settings()

12917

12918

No need to keep this code duplicated.

12919

12920

libempathy-gtk/empathy-protocol-chooser.c | 56

12921

++++++++++++++++++++++++++

12922

libempathy-gtk/empathy-protocol-chooser.h | 5 ++

12923

src/empathy-account-assistant.c | 59

12924

+--------------------------

12925

src/empathy-accounts-dialog.c | 62

12926

++---------------------------

12927

4 files changed, 68 insertions(+), 114 deletions(-)

12928

12929

commit fc4059e17da2a94a3864f396b5de12d93865090d

12930

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

12931

Date: Fri Sep 17 15:35:07 2010 +0200

12932

12933

Add empathy_service_name_to_display_name()

12934

12935

Also makes empathy_protocol_name_to_display_name() fallbacks to

12936

the protocol

12937

name so caller doesn't have to.

12938

12939

libempathy-gtk/empathy-protocol-chooser.c | 8 ++----

12940

libempathy/empathy-utils.c | 32

12941

++++++++++++++++++++++++++--

12942

libempathy/empathy-utils.h | 1 +

12943

src/empathy-account-assistant.c | 14 +++++-------

12944

src/empathy-accounts-dialog.c | 16 ++++----------

12945

5 files changed, 44 insertions(+), 27 deletions(-)

12946

12947

commit 3a6aca03ec70cb11d23cfd68e72a51a4a49220a2

12948

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

12949

Date: Fri Sep 17 15:13:19 2010 +0200

12950

12951

protocol-chooser: expose a 'service' string instead of boolean for

12952

facebook and gtalk

12953

12954

libempathy-gtk/empathy-protocol-chooser.c | 46

12955

++++++++++------------------

12956

libempathy-gtk/empathy-protocol-chooser.h | 6 +--

12957

src/empathy-account-assistant.c | 32 ++++++++++++-------

12958

src/empathy-accounts-dialog.c | 26 +++++++++++-----

12959

4 files changed, 57 insertions(+), 53 deletions(-)

12960

12961

commit 6341b2e61078bf64602c6de2115599690d680596

12962

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

12963

Date: Wed Sep 22 17:44:57 2010 +0200

12964

12965

tp-roomlist: use TpAccountChannelRequest to create the channel

12966

12967

libempathy/empathy-tp-roomlist.c | 76

12968

++++++++++++++++---------------------

12969

1 files changed, 33 insertions(+), 43 deletions(-)

12970

12971

commit e3ec7ef3fac49d470573eed6f31fd2e39ab72c40

12972

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

12973

Date: Wed Sep 22 15:33:59 2010 +0200

12974

12975

Avoid to completely hide the last saved window when creating a new one

12976

12977

src/empathy-chat-window.c | 10 ++++++++++

12978

1 files changed, 10 insertions(+), 0 deletions(-)

12979

12980

commit 87a039507241c49c2cf6aeaf288c90a72c7119e3

12981

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

12982

Date: Wed Sep 22 15:26:47 2010 +0200

12983

12984

chat-window: remember the geometry of the last saved window

12985

12986

This way new chat window have this geometry rather than the default

12987

one.

12988

12989

src/empathy-chat-window.c | 13 ++++++++++---

12990

1 files changed, 10 insertions(+), 3 deletions(-)

12991

12992

commit 1a69c8b6c2aa0ce113cd132eb7ead8058e9ddacb

12993

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

12994

Date: Wed Sep 22 15:20:31 2010 +0200

12995

12996

geometry: add suport for binding a window more than once

12997

12998

libempathy-gtk/empathy-geometry.c | 105

12999

+++++++++++++++++++++++++-----------

13000

libempathy-gtk/empathy-geometry.h | 3 +-

13001

2 files changed, 75 insertions(+), 33 deletions(-)

13002

13003

commit a59a1e8874cdf7c0e1bc323543820f9a36167933

13004

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

13005

Date: Wed Sep 22 12:23:14 2010 +0200

13006

13007

geometry: no need to export _load and _save

13008

13009

libempathy-gtk/empathy-geometry.c | 4 ++--

13010

libempathy-gtk/empathy-geometry.h | 6 ------

13011

2 files changed, 2 insertions(+), 8 deletions(-)

13012

13013

commit af102f5b5497c155bece1e6d30a5efac06c86d68

13014

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

13015

Date: Wed Sep 22 11:55:45 2010 +0200

13016

13017

chat-window: most of the functions can be static

13018

13019

src/empathy-chat-window.c | 86

13020

++++++++++++++++++++++++++-------------------

13021

src/empathy-chat-window.h | 18 +---------

13022

2 files changed, 51 insertions(+), 53 deletions(-)

13023

13024

commit 4bbcf0aa554eae683251b3a9681ad603bff57e18

13025

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

13026

Date: Wed Sep 15 13:13:11 2010 +0200

13027

13028

Add context on "Select" strings (#629707)

13029

13030

libempathy-gtk/empathy-groups-widget.c | 3 ++-

13031

.../empathy-irc-network-chooser-dialog.c | 3 ++-

13032

2 files changed, 4 insertions(+), 2 deletions(-)

13033

4870

13034

commit d1eb6b4ce3920ac78f112e42e9b48f43fe600ab4

4871

13035

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

4872

13036

Date: Wed Sep 29 11:02:05 2010 +0200

5669

13833

po/POTFILES.in | 1 +

5670

13834

1 files changed, 1 insertions(+), 0 deletions(-)

5671

13835

13836

commit 0c0e2b5bd721f39577935c7182b792eface2e8ff

13837

Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

13838

Date: Mon Sep 20 18:38:49 2010 +0100

13839

13840

Set the ptime multiple for PCM codecs to 20ms, needed for interop

13841

with some SIP phones

13842

13843

data/element-properties | 6 ++++++

13844

1 files changed, 6 insertions(+), 0 deletions(-)

13845

5672

13846

commit 4fb52741016fc1135eea200f83272e5b1a8b8bea

5673

13847

Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

5674

13848

Date: Mon Sep 20 17:39:55 2010 +0200