← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/empathy/oneiric-security

« back to all changes in this revision

Viewing changes to libempathy-gtk/empathy-account-widget-irc.ui

  • Committer: Package Import Robot
  • Author(s): Steve Beattie
  • Date: 2011-10-24 14:56:42 UTC
  • mfrom: (163.1.1 oneiric-proposed)
  • Revision ID: package-import@ubuntu.com-20111024145642-8xktisdsgvrz8qme
Tags: 3.2.0.1-0ubuntu1.1
https://launchpad.net/bugs/879301
* SECURITY UPDATE: remote HTML injection (LP: #879301)
  - debian/patches/50_empathy-CVE-2011-3635-lp879301.patch: escape
    HTML in when displaying other users' names. (Thanks to upstream
    for patch.)
  - CVE-2011-3635, CVE-2011-4170

Show diffs side-by-side

added added

removed removed

Lines of Context:
libempathy-gtk/empathy-account-widget-irc.ui
284
284
    <property name="visible">True</property>
285
285
    <property name="can_focus">False</property>
286
286
    <child>
287
 
      <object class="GtkTable" id="table_irc_settings">
 
287
      <object class="GtkGrid" id="table_irc_settings">
288
288
        <property name="visible">True</property>
289
289
        <property name="can_focus">False</property>
290
 
        <property name="n_rows">4</property>
291
 
        <property name="n_columns">2</property>
 
290
        <property name="row_spacing">6</property>
292
291
        <property name="column_spacing">12</property>
293
 
        <property name="row_spacing">6</property>
294
292
        <child>
295
293
          <object class="GtkEntry" id="entry_password">
296
294
            <property name="visible">True</property>
299
297
          </object>
300
298
          <packing>
301
299
            <property name="left_attach">1</property>
302
 
            <property name="right_attach">2</property>
303
 
            <property name="top_attach">2</property>
304
 
            <property name="bottom_attach">3</property>
305
 
            <property name="y_options"></property>
306
 
          </packing>
307
 
        </child>
308
 
        <child>
309
 
          <object class="GtkLabel" id="label_password">
310
 
            <property name="visible">True</property>
311
 
            <property name="can_focus">False</property>
312
 
            <property name="xalign">0</property>
313
 
            <property name="label" translatable="yes">Password:</property>
314
 
          </object>
315
 
          <packing>
316
 
            <property name="top_attach">2</property>
317
 
            <property name="bottom_attach">3</property>
318
 
            <property name="x_options">GTK_FILL</property>
319
 
            <property name="y_options"></property>
 
300
            <property name="top_attach">2</property>
 
301
            <property name="width">1</property>
 
302
            <property name="height">1</property>
320
303
          </packing>
321
304
        </child>
322
305
        <child>
326
309
          </object>
327
310
          <packing>
328
311
            <property name="left_attach">1</property>
329
 
            <property name="right_attach">2</property>
330
 
            <property name="top_attach">1</property>
331
 
            <property name="bottom_attach">2</property>
332
 
            <property name="y_options"></property>
333
 
          </packing>
334
 
        </child>
335
 
        <child>
336
 
          <object class="GtkLabel" id="label_nick">
337
 
            <property name="visible">True</property>
338
 
            <property name="can_focus">False</property>
339
 
            <property name="xalign">0</property>
340
 
            <property name="label" translatable="yes">Nickname:</property>
341
 
            <property name="use_underline">True</property>
342
 
            <property name="mnemonic_widget">entry_nick</property>
343
 
          </object>
344
 
          <packing>
345
 
            <property name="top_attach">1</property>
346
 
            <property name="bottom_attach">2</property>
347
 
            <property name="x_options">GTK_FILL</property>
348
 
            <property name="y_options"></property>
349
 
          </packing>
350
 
        </child>
351
 
        <child>
352
 
          <object class="GtkLabel" id="label_network2">
353
 
            <property name="visible">True</property>
354
 
            <property name="can_focus">False</property>
355
 
            <property name="xalign">0</property>
356
 
            <property name="label" translatable="yes">Network:</property>
357
 
            <property name="use_underline">True</property>
358
 
          </object>
359
 
          <packing>
360
 
            <property name="x_options">GTK_FILL</property>
361
 
            <property name="y_options"></property>
 
312
            <property name="top_attach">1</property>
 
313
            <property name="width">1</property>
 
314
            <property name="height">1</property>
362
315
          </packing>
363
316
        </child>
364
317
        <child>
377
330
          </object>
378
331
          <packing>
379
332
            <property name="left_attach">1</property>
380
 
            <property name="right_attach">2</property>
381
333
            <property name="top_attach">3</property>
382
 
            <property name="bottom_attach">4</property>
383
 
            <property name="y_options"></property>
384
 
          </packing>
385
 
        </child>
386
 
        <child>
387
 
          <placeholder/>
388
 
        </child>
389
 
        <child>
390
 
          <placeholder/>
 
334
            <property name="width">1</property>
 
335
            <property name="height">1</property>
 
336
          </packing>
 
337
        </child>
 
338
        <child>
 
339
          <object class="GtkLabel" id="label_network2">
 
340
            <property name="visible">True</property>
 
341
            <property name="can_focus">False</property>
 
342
            <property name="xalign">0</property>
 
343
            <property name="label" translatable="yes">Network:</property>
 
344
            <property name="use_underline">True</property>
 
345
          </object>
 
346
          <packing>
 
347
            <property name="left_attach">0</property>
 
348
            <property name="top_attach">0</property>
 
349
            <property name="width">1</property>
 
350
            <property name="height">1</property>
 
351
          </packing>
 
352
        </child>
 
353
        <child>
 
354
          <object class="GtkLabel" id="label_nick">
 
355
            <property name="visible">True</property>
 
356
            <property name="can_focus">False</property>
 
357
            <property name="xalign">0</property>
 
358
            <property name="label" translatable="yes">Nickname:</property>
 
359
            <property name="use_underline">True</property>
 
360
            <property name="mnemonic_widget">entry_nick</property>
 
361
          </object>
 
362
          <packing>
 
363
            <property name="left_attach">0</property>
 
364
            <property name="top_attach">1</property>
 
365
            <property name="width">1</property>
 
366
            <property name="height">1</property>
 
367
          </packing>
 
368
        </child>
 
369
        <child>
 
370
          <placeholder/>
 
371
        </child>
 
372
        <child>
 
373
          <placeholder/>
 
374
        </child>
 
375
        <child>
 
376
          <object class="GtkLabel" id="label_password">
 
377
            <property name="visible">True</property>
 
378
            <property name="can_focus">False</property>
 
379
            <property name="xalign">0</property>
 
380
            <property name="label" translatable="yes">Password:</property>
 
381
          </object>
 
382
          <packing>
 
383
            <property name="left_attach">0</property>
 
384
            <property name="top_attach">2</property>
 
385
            <property name="width">1</property>
 
386
            <property name="height">1</property>
 
387
          </packing>
391
388
        </child>
392
389
      </object>
393
390
      <packing>