← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/evolution/oneiric-proposed

« back to all changes in this revision

Viewing changes to shell/e-shell-window-actions.h

  • Committer: Bazaar Package Importer
  • Author(s): Mathieu Trudel-Lapierre
  • Date: 2011-08-18 11:10:01 UTC
  • mfrom: (1.1.83 upstream)
  • Revision ID: james.westby@ubuntu.com-20110818111001-559uzyuqsoyj7xjg
Tags: 3.1.5-0ubuntu1
https://launchpad.net/bugs/828693
* New upstream release.
* debian/control: bump e-d-s Build-Depends to 3.1.5.
* debian/patches/03_lpi.patch: refreshed.
* debian/patches/11_remove_upstream_submit_bugreport.patch: refreshed.
* debian/patches/bogofilter_init_903b8e6.patch,
  debian/patches/evo_fbee43e_to_f4505a2.patch,
  debian/patches/spamassassin_init_4fc04af.patch: dropped, included upstream.
* debian/patches/spamd_sbin_path.patch: correct the path to spamd as
  /usr/sbin/spamd, which is the correct path in Ubuntu. (LP: #828693)

Show diffs side-by-side

added added

removed removed

Lines of Context:
shell/e-shell-window-actions.h
41
41
        E_SHELL_WINDOW_ACTION ((window), "cut-clipboard")
42
42
#define E_SHELL_WINDOW_ACTION_DELETE_SELECTION(window) \
43
43
        E_SHELL_WINDOW_ACTION ((window), "delete-selection")
44
 
#define E_SHELL_WINDOW_ACTION_FAQ(window) \
45
 
        E_SHELL_WINDOW_ACTION ((window), "faq")
46
44
#define E_SHELL_WINDOW_ACTION_FORGET_PASSWORDS(window) \
47
45
        E_SHELL_WINDOW_ACTION ((window), "forget-passwords")
48
46
#define E_SHELL_WINDOW_ACTION_GAL_CUSTOM_VIEW(window) \