← Back to branch summary

~elementary-apps/pantheon-files/trunk

« back to all changes in this revision

Viewing changes to src/marlin-icon-renderer.c

  • 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/marlin-icon-renderer.c
26
26
 
27
27
#include <glib-object.h>
28
28
#include <gtk/gtk.h>
29
 
#include "marlin-clipboard-manager.h"
30
29
#include "marlin-icon-renderer.h"
31
30
#include "eel-gdk-pixbuf-extensions.h"
32
31
#include "marlin-vala.h"
110
109
                                                    MarlinIconRendererPrivate);
111
110
    priv = cellpixbuf->priv;
112
111
 
113
 
    priv->clipboard = marlin_clipboard_manager_new_get_for_display (gdk_display_get_default ());
 
112
    priv->clipboard = marlin_clipboard_manager_get_for_display (gdk_display_get_default ());
114
113
    priv->emblems = TRUE;
115
114
}
116
115