← Back to branch summary

~ubuntu-branches/ubuntu/utopic/nautilus/utopic-proposed

« back to all changes in this revision

Viewing changes to .pc/20_unity_control_center.patch/src/nautilus-desktop-canvas-view.c

  • Committer: Package Import Robot
  • Author(s): Tim Lunn
  • Date: 2014-01-02 16:50:06 UTC
  • mfrom: (1.17.43)
  • Revision ID: package-import@ubuntu.com-20140102165006-1ghk9ropzitdc8pp
Tags: 1:3.10.1-0ubuntu1
https://launchpad.net/bugs/1272602
* New upstream release
* debian/control.in: bump depend on gtk+ 3.9.11
* debian/patches:
  - Dropped git patches, that are included in new version
  - 06_never_exec_nonexec_launchers.patch, refreshed
  - disconnect-extra-location-widgets.patch, dropped included in new version
  - 16_unity_new_documents.patch, refreshed
  - ubuntu_show_titlebar.patch, disable CSD titlebar on non-GNOME sessions
  - ubuntu_titlebar_css.patch, theme fixes (LP: #1272602)

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/20_unity_control_center.patch/src/nautilus-desktop-canvas-view.c
30
30
 
31
31
#include "nautilus-actions.h"
32
32
#include "nautilus-canvas-view-container.h"
33
 
#include "nautilus-view-factory.h"
34
33
#include "nautilus-view.h"
35
34
 
36
35
#include <X11/Xatom.h>
460
459
                desktop_directory = nautilus_get_desktop_directory ();
461
460
        }
462
461
 
463
 
        nautilus_canvas_view_filter_by_screen (NAUTILUS_CANVAS_VIEW (desktop_canvas_view), TRUE);
464
462
        canvas_container = get_canvas_container (desktop_canvas_view);
465
463
        nautilus_canvas_container_set_use_drop_shadows (canvas_container, TRUE);
466
464
        nautilus_canvas_view_container_set_sort_desktop (NAUTILUS_CANVAS_VIEW_CONTAINER (canvas_container), TRUE);
743
741
        g_free (control_center_path);
744
742
}
745
743
 
746
 
static NautilusView *
747
 
nautilus_desktop_canvas_view_create (NautilusWindowSlot *slot)
 
744
NautilusView *
 
745
nautilus_desktop_canvas_view_new (NautilusWindowSlot *slot)
748
746
{
749
 
        NautilusCanvasView *view;
750
 
 
751
 
        view = g_object_new (NAUTILUS_TYPE_DESKTOP_CANVAS_VIEW,
 
747
        return g_object_new (NAUTILUS_TYPE_DESKTOP_CANVAS_VIEW,
752
748
                             "window-slot", slot,
753
749
                             "supports-zooming", FALSE,
754
750
                             "supports-auto-layout", FALSE,
756
752
                             "supports-scaling", TRUE,
757
753
                             "supports-keep-aligned", TRUE,
758
754
                             NULL);
759
 
        return NAUTILUS_VIEW (view);
760
 
}
761
 
 
762
 
static gboolean
763
 
nautilus_desktop_canvas_view_supports_uri (const char *uri,
764
 
                                   GFileType file_type,
765
 
                                   const char *mime_type)
766
 
{
767
 
        if (g_str_has_prefix (uri, EEL_DESKTOP_URI)) {
768
 
                return TRUE;
769
 
        }
770
 
 
771
 
        return FALSE;
772
 
}
773
 
 
774
 
static NautilusViewInfo nautilus_desktop_canvas_view = {
775
 
        NAUTILUS_DESKTOP_CANVAS_VIEW_ID,
776
 
        "Desktop View",
777
 
        "_Desktop",
778
 
        N_("The desktop view encountered an error."),
779
 
        N_("The desktop view encountered an error while starting up."),
780
 
        "Display this location with the desktop view.",
781
 
        nautilus_desktop_canvas_view_create,
782
 
        nautilus_desktop_canvas_view_supports_uri
783
 
};
784
 
 
785
 
void
786
 
nautilus_desktop_canvas_view_register (void)
787
 
{
788
 
        nautilus_desktop_canvas_view.error_label = _(nautilus_desktop_canvas_view.error_label);
789
 
        nautilus_desktop_canvas_view.startup_error_label = _(nautilus_desktop_canvas_view.startup_error_label);
790
 
        
791
 
        nautilus_view_factory_register (&nautilus_desktop_canvas_view);
792
755
}