Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
nautilus
nautilus
  • Overview
    • Overview
    • Details
    • Activity
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Issues 119
    • Issues 119
    • List
    • Board
    • Labels
    • Milestones
  • Merge Requests 14
    • Merge Requests 14
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • GNOME
  • nautilusnautilus
  • Merge Requests
  • !46

Merged
Opened Jan 02, 2018 by Ernestas Kulik@ernestask 
  • Report abuse
Report abuse

remove the desktop

Along with an assortment of other tweaks.

Closes #158 (closed).

Edited Jan 02, 2018 by Carlos Soriano
  • Discussion 15
  • Commits 11
  • Pipelines 2
  • Changes 114
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Ernestas Kulik @ernestask

    added 6 commits

    • 827a79a8 - CI: drop unused dependencies
    • 5b3a31fa - dnd: drop unused preprocessor definition
    • 5275ee19 - metadata: drop unused keys
    • ac0e5578 - general: always show file names for desktop files
    • e3777b54 - program-choosing: drop eel dependency
    • d48db627 - eel: remove unused code

    Compare with previous version

    Jan 02, 2018

    added 6 commits

    • 827a79a8 - CI: drop unused dependencies
    • 5b3a31fa - dnd: drop unused preprocessor definition
    • 5275ee19 - metadata: drop unused keys
    • ac0e5578 - general: always show file names for desktop files
    • e3777b54 - program-choosing: drop eel dependency
    • d48db627 - eel: remove unused code

    Compare with previous version

    added 6 commits * 827a79a8 - CI: drop unused dependencies * 5b3a31fa - dnd: drop unused preprocessor definition * 5275ee19 - metadata: drop unused keys * ac0e5578 - general: always show file names for desktop files * e3777b54 - program-choosing: drop eel dependency * d48db627 - eel: remove unused code [Compare with previous version](https://gitlab.gnome.org/GNOME/nautilus/merge_requests/46/diffs?diff_id=1057&start_sha=c6ee9e45540bec183635c7e05be2ad7cf9e6453a)
    Toggle commit list
  • Carlos Soriano
    @csoriano started a discussion on commit 74dd9c9f Jan 02, 2018
    Resolved by Carlos Soriano Jan 02, 2018
    src/nautilus-bookmark.c
    213 213 }
    214 214
    215 215 /* exclude XDG locations which are not in our builtin list */
    216 if (xdg_type == G_USER_DIRECTORY_DESKTOP &&
    217 !g_settings_get_boolean (gnome_background_preferences, NAUTILUS_PREFERENCES_SHOW_DESKTOP))
    216 if (xdg_type == G_USER_DIRECTORY_DESKTOP)
    • Carlos Soriano @csoriano commented Jan 02, 2018
      Master

      We might want to not include the desktop as special dir ever from now on, and allow users to put it in the bookmarks (otherwise how would they show it in the sidebar now?). Something to think about in the upcoming weeks.

      We might want to not include the desktop as special dir ever from now on, and allow users to put it in the bookmarks (otherwise how would they show it in the sidebar now?). Something to think about in the upcoming weeks.
    • Carlos Soriano @csoriano

      created #187 (closed) to continue this discussion

      Jan 02, 2018

      created #187 (closed) to continue this discussion

      created #187 to continue this discussion
      Toggle commit list
    Please register or sign in to reply
  • Carlos Soriano
    @csoriano started a discussion on commit 74dd9c9f Jan 02, 2018
    Resolved by Carlos Soriano Jan 02, 2018
    src/nautilus-link.c
    189 189 const char *display_name,
    190 190 const char *image,
    191 191 const char *target_uri,
    192 const GdkPoint *point,
    • Carlos Soriano @csoriano commented Jan 02, 2018
      Master

      Just to remember for posterity, iirc (and the code seems to go with this hypothesis) nautilus-link was an attemp to merge the functionality of special desktop links (like the home folder, hard drives and network icon) and other links and regular desktop files, so probably we can just remove this into a simpler handling in the future.

      Just to remember for posterity, iirc (and the code seems to go with this hypothesis) nautilus-link was an attemp to merge the functionality of special desktop links (like the home folder, hard drives and network icon) and other links and regular desktop files, so probably we can just remove this into a simpler handling in the future.
    • Carlos Soriano @csoriano

      created #184 to continue this discussion

      Jan 02, 2018

      created #184 to continue this discussion

      created #184 to continue this discussion
      Toggle commit list
    Please register or sign in to reply
  • Carlos Soriano @csoriano

    mentioned in issue #184

    Jan 02, 2018

    mentioned in issue #184

    mentioned in issue #184
    Toggle commit list
  • Carlos Soriano
    @csoriano started a discussion on commit 983892a6 Jan 02, 2018
    Resolved by Carlos Soriano Jan 02, 2018
    meson.build
    68 57 endif
    69
    70 if get_option ('enable-selinux')
    71 selinux = dependency ('libselinux', version: selinux_ver)
    72 conf.set10 ('HAVE_SELINUX', true)
    73 endif
    74
    75 tracker_sparql = dependency ('tracker-sparql-2.0', required: false)
    58 tracker_sparql = dependency('tracker-sparql-2.0', required: false)
    76 59 if not tracker_sparql.found()
    77 tracker_sparql = dependency ('tracker-sparql-1.0')
    60 tracker_sparql = dependency('tracker-sparql-1.0')
    61 endif
    62 x11 = dependency('x11')
    63 xml = dependency('libxml-2.0', version: '>= 2.7.8')
    64 #
    • Carlos Soriano @csoriano commented Jan 02, 2018
      Master

      spurious #

      spurious #
    • Carlos Soriano @csoriano commented Jan 02, 2018
      Master

      So Ernestas says this is on purpose, but yeah better to do something more clear :)

      So Ernestas says this is on purpose, but yeah better to do something more clear :)
    Please register or sign in to reply
  • Carlos Soriano
    @csoriano started a discussion on commit 983892a6 Jan 02, 2018
    Resolved by Carlos Soriano Jan 02, 2018
    meson.build
    68 57 endif
    69
    70 if get_option ('enable-selinux')
    71 selinux = dependency ('libselinux', version: selinux_ver)
    72 conf.set10 ('HAVE_SELINUX', true)
    73 endif
    74
    75 tracker_sparql = dependency ('tracker-sparql-2.0', required: false)
    58 tracker_sparql = dependency('tracker-sparql-2.0', required: false)
    76 59 if not tracker_sparql.found()
    77 tracker_sparql = dependency ('tracker-sparql-1.0')
    60 tracker_sparql = dependency('tracker-sparql-1.0')
    61 endif
    62 x11 = dependency('x11')
    63 xml = dependency('libxml-2.0', version: '>= 2.7.8')
    64 #
    • Carlos Soriano @csoriano commented Jan 02, 2018
      Master

      spurious #

      spurious #
    • Carlos Soriano @csoriano commented Jan 02, 2018
      Master

      So Ernestas says this is on purpose, but yeah better to do something more clear :)

      So Ernestas says this is on purpose, but yeah better to do something more clear :)
    Please register or sign in to reply
  • Carlos Soriano
    @csoriano started a discussion on commit 983892a6 Jan 02, 2018
    Resolved by Carlos Soriano Jan 02, 2018
    meson.build
    80 conf.set10('ENABLE_PROFILING', true)
    81 endif
    82 if get_option('selinux')
    83 conf.set10('HAVE_SELINUX', true)
    78 84 endif
    79 85
    80 configure_file (input: 'config.h.meson',
    81 output: 'config.h',
    82 configuration: conf)
    83
    84 nautilus_include_dirs = include_directories ('.')
    85
    86 subdir ('eel')
    87 subdir ('libnautilus-extension')
    86 configure_file(output: 'config.h', configuration: conf)
    87 #
    • Carlos Soriano @csoriano commented Jan 02, 2018
      Master

      Another spurious #

      Another spurious #
    • Carlos Soriano @csoriano commented Jan 02, 2018
      Master

      So Ernestas says this is on purpose, but yeah better to do something more clear :)

      So Ernestas says this is on purpose, but yeah better to do something more clear :)
    Please register or sign in to reply
  • Carlos Soriano
    @csoriano started a discussion on commit 983892a6 Jan 02, 2018
    Resolved by Carlos Soriano Jan 02, 2018
    meson.build
    80 conf.set10('ENABLE_PROFILING', true)
    81 endif
    82 if get_option('selinux')
    83 conf.set10('HAVE_SELINUX', true)
    78 84 endif
    79 85
    80 configure_file (input: 'config.h.meson',
    81 output: 'config.h',
    82 configuration: conf)
    83
    84 nautilus_include_dirs = include_directories ('.')
    85
    86 subdir ('eel')
    87 subdir ('libnautilus-extension')
    86 configure_file(output: 'config.h', configuration: conf)
    87 #
    • Carlos Soriano @csoriano commented Jan 02, 2018
      Master

      Another spurious #

      Another spurious #
    • Carlos Soriano @csoriano commented Jan 02, 2018
      Master

      So Ernestas says this is on purpose, but yeah better to do something more clear :)

      So Ernestas says this is on purpose, but yeah better to do something more clear :)
    Please register or sign in to reply
  • Carlos Soriano
    @csoriano started a discussion on commit 983892a6 Jan 02, 2018
    Resolved by Carlos Soriano Jan 02, 2018
    meson.build
    50 gmodule = dependency('gmodule-no-export-2.0', version: glib_ver)
    51 gnome_autoar = dependency('gnome-autoar-0', version: '>= 0.2.1')
    52 gnome_desktop = dependency('gnome-desktop-3.0', version: '>= 3.0.0')
    53 gtk = dependency('gtk+-3.0', version: '>= 3.22.26')
    54 selinux = disabler()
    55 if get_option('selinux')
    56 selinux = dependency('libselinux', version: '>= 2.0')
    68 57 endif
    69
    70 if get_option ('enable-selinux')
    71 selinux = dependency ('libselinux', version: selinux_ver)
    72 conf.set10 ('HAVE_SELINUX', true)
    73 endif
    74
    75 tracker_sparql = dependency ('tracker-sparql-2.0', required: false)
    58 tracker_sparql = dependency('tracker-sparql-2.0', required: false)
    • Carlos Soriano @csoriano commented Jan 02, 2018
      Master

      We should require this unconditionally now that we require tracker in general unconditionally right?

      We should require this unconditionally now that we require tracker in general unconditionally right?
    • Ernestas Kulik @ernestask commented Jan 02, 2018
      Master

      That would remove compatibility with tracker-sparql-1.0. Not sure how relevant having that still is.

      That would remove compatibility with `tracker-sparql-1.0`. Not sure how relevant having that still is.
    • Carlos Soriano @csoriano commented Jan 02, 2018
      Master

      Let's create a new issue for that.

      Let's create a new issue for that.
    • Carlos Soriano @csoriano

      created #186 (closed) to continue this discussion

      Jan 02, 2018

      created #186 (closed) to continue this discussion

      created #186 to continue this discussion
      Toggle commit list
    Please register or sign in to reply
  • Carlos Soriano
    @csoriano started a discussion on commit 983892a6 Jan 02, 2018
    Resolved by Carlos Soriano Jan 02, 2018
    meson.build
    95 subdir('test')
    96 subdir('data')
    97 subdir('po')
    98 if get_option('docs')
    99 subdir('docs')
    103 100 endif
    104
    105 if get_option ('enable-nst-extension')
    106 subdir ('nautilus-sendto-extension')
    101 if get_option('nst_extension')
    102 subdir('nautilus-sendto-extension')
    107 103 endif
    108 104
    109 105 # Compile GSettings schemas when installing from source.
    110 meson.add_install_script ('build-aux/meson/postinstall.py')
    106 meson.add_install_script('build-aux/meson/postinstall.py')
    • Carlos Soriano @csoriano commented Jan 02, 2018
      Master

      If I'm not mistaken this is no longer needed, but we can figure out in a new issue /me clicks the "resolve this discussion in a new issue" thing again 😄

      If I'm not mistaken this is no longer needed, but we can figure out in a new issue /me clicks the "resolve this discussion in a new issue" thing again :smile:
    • Carlos Soriano @csoriano

      created #185 to continue this discussion

      Jan 02, 2018

      created #185 to continue this discussion

      created #185 to continue this discussion
      Toggle commit list
    Please register or sign in to reply
  • Carlos Soriano @csoriano

    mentioned in issue #185

    Jan 02, 2018

    mentioned in issue #185

    mentioned in issue #185
    Toggle commit list
  • Carlos Soriano @csoriano

    mentioned in issue #186 (closed)

    Jan 02, 2018

    mentioned in issue #186 (closed)

    mentioned in issue #186
    Toggle commit list
  • Carlos Soriano @csoriano

    resolved all discussions

    Jan 02, 2018

    resolved all discussions

    resolved all discussions
    Toggle commit list
  • Carlos Soriano @csoriano

    mentioned in issue #187 (closed)

    Jan 02, 2018

    mentioned in issue #187 (closed)

    mentioned in issue #187
    Toggle commit list
  • Carlos Soriano @csoriano

    unmarked as a Work In Progress

    Jan 02, 2018

    unmarked as a Work In Progress

    unmarked as a **Work In Progress**
    Toggle commit list
  • Carlos Soriano @csoriano commented Jan 02, 2018
    Master

    All good modulo some small issues we can fix on the upcoming days. Thanks a lot for this work Ernestas!!

    All good modulo some small issues we can fix on the upcoming days. Thanks a lot for this work Ernestas!!
  • Carlos Soriano @csoriano

    mentioned in commit 6584c178

    Jan 02, 2018

    mentioned in commit 6584c178

    mentioned in commit 6584c17896d4206a45313d49ca136c67de008b56
    Toggle commit list
  • Carlos Soriano @csoriano

    merged

    Jan 02, 2018

    merged

    merged
    Toggle commit list
  • Carlos Soriano
    @csoriano started a discussion on commit ac0e5578 Jan 02, 2018
    • Carlos Soriano @csoriano

      mentioned in commit 3fc52e01

      Jan 02, 2018

      mentioned in commit 3fc52e01

      mentioned in commit 3fc52e01065e1c2e046f9684ab962dbd9a205a3f
      Toggle commit list
    Please register or sign in to reply
  • António Fernandes
    @antoniof started a discussion on commit 74dd9c9f Jan 03, 2018
    Last updated by António Fernandes Mar 23, 2018
    • António Fernandes @antoniof

      mentioned in commit eb3b172f

      Jan 03, 2018

      mentioned in commit eb3b172f

      mentioned in commit eb3b172fe7d926168fc0027860e5d00889a561ad
      Toggle commit list
    • António Fernandes @antoniof

      mentioned in commit b98fa17d

      Mar 23, 2018

      mentioned in commit b98fa17d

      mentioned in commit b98fa17dfcbaab48517271cee12bae4707771a5a
      Toggle commit list
    Please register or sign in to reply
  • Jeremy Bicha
    @jbicha started a discussion on commit 983892a6 Jan 30, 2018
    • Jeremy Bicha @jbicha

      mentioned in merge request !71 (merged)

      Jan 30, 2018

      mentioned in merge request !71 (merged)

      mentioned in merge request !71
      Toggle commit list
    Please register or sign in to reply
  • Write
  • Preview
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment
Assignee
No assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
0
Labels
None
Assign labels
  • View labels
Reference: GNOME/nautilus!46
×

Revert this merge request

This will create a new commit in order to revert the existing changes.

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.
×

Cherry-pick this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.