Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
nautilus
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
266
Issues
266
List
Board
Labels
Milestones
Merge Requests
15
Merge Requests
15
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
GNOME
nautilus
Commits
423c4baf
Commit
423c4baf
authored
Mar 19, 2018
by
Carlos Soriano Sánchez
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Flatpak: Add stable handling
parent
79914350
Pipeline
#6401
failed with stage
in 14 minutes and 16 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
20 additions
and
17 deletions
+20
-17
org.gnome.NautilusDevel.json
build-aux/flatpak/org.gnome.NautilusDevel.json
+5
-6
meson.build
meson.build
+10
-10
nautilus-application.c
src/nautilus-application.c
+2
-1
Adwaita.css
src/resources/css/Adwaita.css
+3
-0
No files found.
build-aux/flatpak/org.gnome.NautilusDevel.json
View file @
423c4baf
{
"app-id"
:
"org.gnome.Nautilus
Devel
"
,
"app-id"
:
"org.gnome.Nautilus
StableFlatpak
"
,
"runtime"
:
"org.gnome.Platform"
,
"runtime-version"
:
"
master
"
,
"runtime-version"
:
"
3.28
"
,
"sdk"
:
"org.gnome.Sdk"
,
"command"
:
"nautilus"
,
"tags"
:
[
"
devel"
,
"development"
,
"nightly
"
],
"desktop-file-name-prefix"
:
"(
Development
) "
,
"tags"
:
[
"
test"
,
"stable
"
],
"desktop-file-name-prefix"
:
"(
3.28 Flatpak
) "
,
"finish-args"
:
[
"--share=ipc"
,
"--socket=x11"
,
"--socket=wayland"
,
...
...
@@ -15,7 +15,6 @@
"--talk-name=org.gtk.vfs"
,
"--talk-name=org.gtk.vfs.*"
,
"--talk-name=ca.desrt.dconf"
,
"--env=DCONF_USER_CONFIG_DIR=.config/dconf"
],
"cleanup"
:
[
"/include"
,
"/share/bash-completion"
],
"modules"
:
[
{
"name"
:
"exiv2"
,
...
...
@@ -84,7 +83,7 @@
"name"
:
"nautilus"
,
"config-opts"
:
[
"--libdir=/app/lib"
,
"-Dprofile=
development
"
"-Dprofile=
stable-flatpak
"
],
"sources"
:
[
{
...
...
meson.build
View file @
423c4baf
...
...
@@ -94,17 +94,16 @@ conf = configuration_data()
if get_option('profile') == 'development'
version = '@0@-@VCS_TAG@'.format(meson.project_version())
conf.set_quoted('NAME_SUFFIX', ' (Development Snapshot)')
profile = 'Devel'
name_suffix = ' (Development Snapshot)'
elif get_option('profile') == 'stable-flatpak'
version = '@0@-flatpak'.format(meson.project_version())
profile = 'StableFlatpak'
name_suffix = ' (3.28 Flatpak)'
else
if get_option('profile') == 'stable-flatpak'
version = '@0@-flatpak'.format(meson.project_version())
profile = 'Stable'
else
version = meson.project_version()
profile = ''
endif
conf.set_quoted('NAME_SUFFIX', '')
version = meson.project_version()
profile = ''
name_suffix = ''
endif
application_id = 'org.gnome.Nautilus@0@'.format(profile)
...
...
@@ -117,6 +116,7 @@ conf.set_quoted('NAUTILUS_DATADIR', join_paths(datadir, 'nautilus'))
conf.set_quoted('NAUTILUS_EXTENSIONDIR', join_paths(prefix, extensiondir))
conf.set_quoted('APPLICATION_ID', application_id)
conf.set_quoted('PROFILE', profile)
conf.set_quoted('NAME_SUFFIX', name_suffix)
if get_option('packagekit')
conf.set10('ENABLE_PACKAGEKIT', true)
...
...
@@ -128,7 +128,7 @@ if get_option('selinux')
conf.set10('HAVE_SELINUX', true)
endif
if get_option('profile') == 'development'
if
true or
get_option('profile') == 'development'
config_h = declare_dependency(
sources: vcs_tag(
command: ['git', 'rev-parse', '--short', 'HEAD'],
...
...
src/nautilus-application.c
View file @
423c4baf
...
...
@@ -272,7 +272,8 @@ nautilus_application_create_window (NautilusApplication *self,
MAX
(
NAUTILUS_WINDOW_MIN_HEIGHT
,
default_height
));
application_id
=
g_application_get_application_id
(
G_APPLICATION
(
self
));
if
(
g_strcmp0
(
application_id
,
"org.gnome.NautilusDevel"
)
==
0
)
if
(
g_strcmp0
(
application_id
,
"org.gnome.NautilusDevel"
)
==
0
||
g_strcmp0
(
application_id
,
"org.gnome.NautilusStableFlatpak"
)
==
0
)
{
GtkStyleContext
*
style_context
;
...
...
src/resources/css/Adwaita.css
View file @
423c4baf
...
...
@@ -4,6 +4,7 @@
background
:
@
theme_base_color
;
}
/* Devel window styling */
.nautilus-window.devel
headerbar
{
background
:
#cbd2d9
-gtk-icontheme
(
"system-run-symbolic"
)
70%
0
/
64px
64px
no-repeat
,
linear-gradient
(
to
top
,
#a5b1bd
,
#c5cdd5
2px
,
#cbd2d9
3px
);
box-shadow
:
inset
0
1px
#f1f3f5
;
...
...
@@ -119,6 +120,8 @@
-gtk-icon-shadow
:
none
;
}
/* End devel window styling */
.nautilus-canvas-item
{
border-radius
:
5px
;
}
...
...
Michael Catanzaro
@mcatanzaro
mentioned in issue
epiphany#20
·
Jun 15, 2018
mentioned in issue
epiphany#20
mentioned in issue epiphany#20
Toggle commit list
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment