← Back to branch summary

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

« back to all changes in this revision

Viewing changes to mail/e-mail-reader.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:
mail/e-mail-reader.c
287
287
        EMailSession *session;
288
288
        EMFolderSelector *selector;
289
289
        EMFolderTree *folder_tree;
 
290
        EMFolderTreeModel *model;
290
291
        GtkWidget *dialog;
291
292
        GtkWindow *window;
292
293
        GPtrArray *uids;
299
300
        window = e_mail_reader_get_window (reader);
300
301
        uids = e_mail_reader_get_selected_uids (reader);
301
302
 
 
303
        model = em_folder_tree_model_get_default ();
 
304
 
302
305
        dialog = em_folder_selector_new (
303
 
                window, backend, EM_FOLDER_SELECTOR_CAN_CREATE,
 
306
                window, backend, model,
 
307
                EM_FOLDER_SELECTOR_CAN_CREATE,
304
308
                _("Copy to Folder"), NULL, _("C_opy"));
305
309
 
306
310
        selector = EM_FOLDER_SELECTOR (dialog);
789
793
        EMailSession *session;
790
794
        EMFolderSelector *selector;
791
795
        EMFolderTree *folder_tree;
 
796
        EMFolderTreeModel *model;
792
797
        GtkWidget *dialog;
793
798
        GtkWindow *window;
794
799
        GPtrArray *uids;
795
800
        const gchar *uri;
796
801
 
797
802
        backend = e_mail_reader_get_backend (reader);
 
803
        session = e_mail_backend_get_session (backend);
 
804
 
798
805
        folder = e_mail_reader_get_folder (reader);
799
806
        uids = e_mail_reader_get_selected_uids (reader);
800
807
        window = e_mail_reader_get_window (reader);
801
808
 
802
 
        session = e_mail_backend_get_session (backend);
 
809
        model = em_folder_tree_model_get_default ();
803
810
 
804
811
        dialog = em_folder_selector_new (
805
 
                window, backend, EM_FOLDER_SELECTOR_CAN_CREATE,
 
812
                window, backend, model,
 
813
                EM_FOLDER_SELECTOR_CAN_CREATE,
806
814
                _("Move to Folder"), NULL, _("_Move"));
807
815
 
808
816
        selector = EM_FOLDER_SELECTOR (dialog);