← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/empathy-ft-manager.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:
src/empathy-ft-manager.ui
9
9
    <property name="role">empathy-ft-manager</property>
10
10
    <property name="icon_name">document-send</property>
11
11
    <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
12
 
    <property name="has_separator">False</property>
13
12
    <child internal-child="vbox">
14
13
      <object class="GtkVBox" id="dialog-vbox31">
15
14
        <property name="visible">True</property>
31
30
            </child>
32
31
          </object>
33
32
          <packing>
 
33
            <property name="expand">True</property>
34
34
            <property name="position">1</property>
35
35
          </packing>
36
36
        </child>
73
73
                <property name="position">2</property>
74
74
              </packing>
75
75
            </child>
 
76
            <child>
 
77
              <object class="GtkButton" id="close_button">
 
78
                <property name="visible">True</property>
 
79
                <property name="can_focus">True</property>
 
80
                <property name="can_default">True</property>
 
81
                <property name="label">gtk-close</property>
 
82
                <property name="use_stock">True</property>
 
83
              </object>
 
84
              <packing>
 
85
                <property name="position">3</property>
 
86
              </packing>
 
87
            </child>
76
88
          </object>
77
89
          <packing>
78
90
            <property name="expand">False</property>
85
97
      <action-widget response="3">clear_button</action-widget>
86
98
      <action-widget response="1">open_button</action-widget>
87
99
      <action-widget response="2">abort_button</action-widget>
 
100
      <action-widget response="4">close_button</action-widget>
88
101
    </action-widgets>
89
102
  </object>
90
103
</interface>