← 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.c

  • 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.c
38
38
#define EVOLUTION_COPYRIGHT \
39
39
        "Copyright \xC2\xA9 1999 - 2008 Novell, Inc. and Others"
40
40
 
41
 
#define EVOLUTION_FAQ \
42
 
        "http://live.gnome.org/Evolution/FAQ"
43
 
 
44
41
#define EVOLUTION_WEBSITE \
45
42
        "http://www.gnome.org/projects/evolution/"
46
43
 
730
727
}
731
728
 
732
729
/**
733
 
 * E_SHELL_WINDOW_ACTION_FAQ:
734
 
 * @window: an #EShellWindow
735
 
 *
736
 
 * Activation of this action opens a web page with answers to frequently
737
 
 * asked questions about this application.
738
 
 *
739
 
 * Main menu item: Help -> Evolution FAQ
740
 
 **/
741
 
static void
742
 
action_faq_cb (GtkAction *action,
743
 
               EShellWindow *shell_window)
744
 
{
745
 
        e_show_uri (GTK_WINDOW (shell_window), EVOLUTION_FAQ);
746
 
}
747
 
 
748
 
/**
749
730
 * E_SHELL_WINDOW_ACTION_FORGET_PASSWORDS:
750
731
 * @window: an #EShellWindow
751
732
 *
1490
1471
          N_("Delete the selection"),
1491
1472
          NULL },  /* Handled by EFocusTracker */
1492
1473
 
1493
 
        { "faq",
1494
 
          "help-faq",
1495
 
          N_("Evolution _FAQ"),
1496
 
          NULL,
1497
 
          N_("Open the Frequently Asked Questions webpage"),
1498
 
          G_CALLBACK (action_faq_cb) },
1499
 
 
1500
1474
        { "forget-passwords",
1501
1475
          NULL,
1502
1476
          N_("_Forget Passwords"),