← Back to branch summary

~ubuntu-branches/ubuntu/precise/empathy/precise-proposed-201205180810

« back to all changes in this revision

Viewing changes to .pc/01_lpi.patch/src/empathy-main-window.ui

  • Committer: Bazaar Package Importer
  • Author(s): Brian Curtis, Brian Curtis, Ken VanDine
  • Date: 2011-06-01 10:35:24 UTC
  • mfrom: (1.1.70 upstream) (6.3.44 experimental)
  • Revision ID: james.westby@ubuntu.com-20110601103524-wx3wgp71394730jt
Tags: 3.1.1-1ubuntu1
[ Brian Curtis ]
* Merge with Debian experimental, remaining Ubuntu changes:
* debian/control:
  - Drop geoclue/mapping build-depends (they are in Universe)
  - Add Vcz-Bzr link
  - Add Suggests on telepathy-idle
  - Bump telepathy-butterfly, telepathy-haze to recommends
  - Don't recommend the freedesktop sound theme we have an ubuntu one
  - Add build depend for libunity-dev
* debian/rules:
  - Use autoreconf.mk
  - Disable map and location
* debian/empathy.install:
  - Install message indicator configuration
* debian/indicators/empathy:
  - Message indicator configuration
* debian/patches/01_lpi.patch:
  - Add Launchpad integration
* debian/patches/10_use_notify_osd_icons.patch:
  - Use the notify-osd image for new messages
* debian/patches/34_start_raised_execpt_in_session.patch
  - If not started with the session, we should always raise
* debian/patches/36_chat_window_default_size.patch:
  - Make the default chat window size larger
* debian/patches/37_facebook_default.patch:
  - Make facebook the default chat account type
* debian/patches/38_lp_569289.patch
  - Set freenode as default IRC network for new IRC accounts 
* debian/patches/41_unity_launcher_progress.patch
  - Display file transfer progress in the unity launcher

[ Ken VanDine ]
* debian/control
  - build depend on libgcr-3-dev instead of libgcr-dev
  - dropped build depends for libindicate, we will use telepathy-indicator
  - Depend on dconf-gsettings-backend | gsettings-backend
  - Added a Recommends for telepathy-indicator
* +debian/empathy.gsettings-override
  - Added an override for notifications-focus
* debian/patches/series
  - commented out 23_idomessagedialog_for_voip_and_ft.patch, until ido has 
    been ported to gtk3

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/01_lpi.patch/src/empathy-main-window.ui
47
47
            <property name="name">chat_search_contacts</property>
48
48
            <property name="label" translatable="yes">_Search for Contacts…</property>
49
49
          </object>
 
50
          <accelerator key="f" modifiers="GDK_SHIFT_MASK | GDK_CONTROL_MASK"/>
50
51
        </child>
51
52
        <child>
52
53
          <object class="GtkAction" id="view_show_ft_manager">
69
70
          </object>
70
71
        </child>
71
72
        <child>
 
73
          <object class="GtkToggleAction" id="view_balance_show_in_roster">
 
74
            <property name="name">view_balance_show_in_roster</property>
 
75
            <property name="label" translatable="yes">Credit Balance</property>
 
76
            <property name="visible">False</property>
 
77
          </object>
 
78
        </child>
 
79
        <child>
72
80
          <object class="GtkAction" id="view_show_map">
73
81
            <property name="name">view_show_map</property>
74
82
            <property name="label" translatable="yes">Contacts on a _Map</property>
120
128
          </object>
121
129
        </child>
122
130
        <child>
 
131
          <object class="GtkAction" id="edit_search_contacts">
 
132
            <property name="name">edit_search_contacts</property>
 
133
            <property name="label" translatable="yes">Find in Contact _List</property>
 
134
          </object>
 
135
          <accelerator key="f" modifiers="GDK_CONTROL_MASK"/>
 
136
        </child>
 
137
        <child>
123
138
          <object class="GtkAction" id="view">
124
139
            <property name="name">view</property>
125
140
            <property name="label" translatable="yes">_View</property>
248
263
          <separator name="edit_context_separator"/>
249
264
          <menuitem action="edit_accounts"/>
250
265
          <menuitem action="edit_personal_information"/>
 
266
          <menuitem action="edit_search_contacts"/>
251
267
          <menuitem action="edit_blocked_contacts"/>
252
268
          <separator/>
253
269
          <menuitem action="edit_preferences"/>
256
272
          <menuitem action="view_show_offline"/>
257
273
          <menuitem action="view_show_protocols"/>
258
274
          <separator/>
 
275
          <menuitem action="view_balance_show_in_roster"/>
 
276
          <placeholder name="view_balance_placeholder"/>
 
277
          <separator/>
259
278
          <menuitem action="view_sort_by_name"/>
260
279
          <menuitem action="view_sort_by_status"/>
261
280
          <separator/>
297
316
          <object class="GtkToolbar" id="presence_toolbar">
298
317
            <property name="visible">True</property>
299
318
            <property name="toolbar_style">GTK_TOOLBAR_BOTH</property>
 
319
            <style>
 
320
              <class name="primary-toolbar"/>
 
321
            </style>
300
322
          </object>
301
323
          <packing>
302
324
            <property name="expand">False</property>
305
327
          </packing>
306
328
        </child>
307
329
        <child>
 
330
          <object class="GtkVBox" id="balance_vbox">
 
331
            <property name="spacing">3</property>
 
332
            <child>
 
333
              <placeholder/>
 
334
            </child>
 
335
          </object>
 
336
          <packing>
 
337
            <property name="expand">False</property>
 
338
            <property name="fill">False</property>
 
339
            <property name="position">2</property>
 
340
          </packing>
 
341
        </child>
 
342
        <child>
308
343
          <object class="GtkVBox" id="errors_vbox">
309
344
            <child>
310
345
              <placeholder/>
313
348
          <packing>
314
349
            <property name="expand">False</property>
315
350
            <property name="fill">False</property>
316
 
            <property name="position">2</property>
 
351
            <property name="position">3</property>
317
352
          </packing>
318
353
        </child>
319
354
        <child>
325
360
          <packing>
326
361
            <property name="expand">False</property>
327
362
            <property name="fill">False</property>
328
 
            <property name="position">3</property>
 
363
            <property name="position">4</property>
329
364
          </packing>
330
365
        </child>
331
366
        <child>
360
395
            </child>
361
396
          </object>
362
397
          <packing>
363
 
            <property name="position">4</property>
 
398
            <property name="position">5</property>
364
399
          </packing>
365
400
        </child>
366
401
      </object>