diff options
| author | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2011-03-14 09:58:00 +0800 |
|---|---|---|
| committer | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2011-03-14 09:58:00 +0800 |
| commit | 8e6a977d36aea1eb4b429ddee84cb9b4bc4142cd (patch) | |
| tree | 5c1858c474144e0cd511fc6891e9d21ef978c5e3 /src/empathy-main-window.ui | |
| parent | 2e3e5e8e732fbc2e4d3ed61892aefa09efabbfc2 (diff) | |
| parent | c0eca0414ca529da3b083c099ec3031436420b00 (diff) | |
| download | gsoc2013-empathy-8e6a977d36aea1eb4b429ddee84cb9b4bc4142cd.tar gsoc2013-empathy-8e6a977d36aea1eb4b429ddee84cb9b4bc4142cd.tar.gz gsoc2013-empathy-8e6a977d36aea1eb4b429ddee84cb9b4bc4142cd.tar.bz2 gsoc2013-empathy-8e6a977d36aea1eb4b429ddee84cb9b4bc4142cd.tar.lz gsoc2013-empathy-8e6a977d36aea1eb4b429ddee84cb9b4bc4142cd.tar.xz gsoc2013-empathy-8e6a977d36aea1eb4b429ddee84cb9b4bc4142cd.tar.zst gsoc2013-empathy-8e6a977d36aea1eb4b429ddee84cb9b4bc4142cd.zip | |
Merge branch 'glassrose-contact-blocking-rebase'
Diffstat (limited to 'src/empathy-main-window.ui')
| -rw-r--r-- | src/empathy-main-window.ui | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/empathy-main-window.ui b/src/empathy-main-window.ui index 0cfd6bee4..217b276f2 100644 --- a/src/empathy-main-window.ui +++ b/src/empathy-main-window.ui @@ -107,6 +107,12 @@ </object> </child> <child> + <object class="GtkAction" id="edit_blocked_contacts"> + <property name="name">edit_blocked_contacts</property> + <property name="label" translatable="yes">_Blocked Contacts</property> + </object> + </child> + <child> <object class="GtkAction" id="edit_preferences"> <property name="stock_id">gtk-preferences</property> <property name="name">edit_preferences</property> @@ -249,6 +255,7 @@ <menuitem action="edit_accounts"/> <menuitem action="edit_personal_information"/> <menuitem action="edit_search_contacts"/> + <menuitem action="edit_blocked_contacts"/> <separator/> <menuitem action="edit_preferences"/> </menu> |