← Back to branch summary

~elementary-apps/pantheon-files/trunk

« back to all changes in this revision

Viewing changes to src/Application.vala

  • Committer: Jeremy Wootten
  • Date: 2017-01-13 13:36:33 UTC
  • mfrom: (2444 pantheon-files)
  • mto: This revision was merged to the branch mainline in revision 2471.
  • Revision ID: jeremy@elementaryos.org-20170113133633-ajg6izr1e6irmj0g
Merge r2444

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/Application.vala
2
2
    Copyright (c) 1999, 2000 Red Hat, Inc.
3
3
    Copyright (c) 2000, 2001 Eazel, Inc.
4
4
    Copyright (c) 2013 Julián Unrrein <junrrein@gmail.com>
5
 
    Copyright (c) 2015-2016 elementary LLC (http://launchpad.net/elementary)  
 
5
    Copyright (c) 2015-2017 elementary LLC (http://launchpad.net/elementary)  
6
6
 
7
7
    This program is free software: you can redistribute it and/or modify it
8
8
    under the terms of the GNU Lesser General Public License version 3, as published
90
90
 
91
91
        progress_handler = new Marlin.Progress.UIHandler (this);
92
92
 
93
 
        this.clipboard = new Marlin.ClipboardManager.get_for_display (Gdk.Display.get_default ());
 
93
        this.clipboard = Marlin.ClipboardManager.get_for_display ();
94
94
        this.thumbnailer = Marlin.Thumbnailer.get ();
95
95
        this.recent = new Gtk.RecentManager ();
96
96