← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/nautilus/oneiric-updates

« back to all changes in this revision

Viewing changes to src/nautilus-desktop-icon-view.c

  • Committer: Bazaar Package Importer
  • Author(s): Didier Roche
  • Date: 2011-07-25 11:44:24 UTC
  • Revision ID: james.westby@ubuntu.com-20110725114424-thpvep0hbdv8d4kj
Tags: 1:3.1.3-0ubuntu3
https://launchpad.net/bugs/723861
* debian/patches/12_remove_create_launcher_on_desktop.patch:
  - remove the "create launcher" entry from desktop right-click. It's depending
    on a gnome-panel binary, confusing the user when unity is running and
    default upstream sessions don't have even nautilus drawing the icons on
    the desktop. Do the same for other places as well. (LP: #723861)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/nautilus-desktop-icon-view.c
708
708
}
709
709
 
710
710
static void
711
 
action_new_launcher_callback (GtkAction *action, gpointer data)
712
 
{
713
 
        char *desktop_directory;
714
 
 
715
 
        g_assert (NAUTILUS_VIEW (data));
716
 
 
717
 
        desktop_directory = nautilus_get_desktop_directory ();
718
 
 
719
 
        nautilus_launch_application_from_command (gtk_widget_get_screen (GTK_WIDGET (data)),
720
 
                                                  "gnome-desktop-item-edit",
721
 
                                                  FALSE,
722
 
                                                  "--create-new", desktop_directory, NULL);
723
 
        g_free (desktop_directory);
724
 
 
725
 
}
726
 
 
727
 
static void
728
711
action_change_background_callback (GtkAction *action, 
729
712
                                   gpointer data)
730
713
{
789
772
 
790
773
        desktop_view = NAUTILUS_DESKTOP_ICON_VIEW (view);
791
774
 
792
 
        /* New Launcher */
793
 
        disable_command_line = g_settings_get_boolean (gnome_lockdown_preferences, NAUTILUS_PREFERENCES_LOCKDOWN_COMMAND_LINE);
794
 
        action = gtk_action_group_get_action (desktop_view->details->desktop_action_group,
795
 
                                              NAUTILUS_ACTION_NEW_LAUNCHER_DESKTOP);
796
 
        gtk_action_set_visible (action,
797
 
                                !disable_command_line);
798
 
 
799
775
        /* Empty Trash */
800
776
        include_empty_trash = trash_link_is_selection (view);
801
777
        action = gtk_action_group_get_action (desktop_view->details->desktop_action_group,
813
789
 
814
790
static const GtkActionEntry desktop_view_entries[] = {
815
791
        /* name, stock id */
816
 
        { "New Launcher Desktop", NULL,
817
 
          /* label, accelerator */
818
 
          N_("Create L_auncher..."), NULL,
819
 
          /* tooltip */
820
 
          N_("Create a new launcher"),
821
 
          G_CALLBACK (action_new_launcher_callback) },
822
 
        /* name, stock id */
823
792
        { "Change Background", NULL,
824
793
          /* label, accelerator */
825
794
          N_("Change Desktop _Background"), NULL,