Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Finish gtk-layer-shell to gtk4-layer-shell renames #14

Merged
merged 1 commit into from
Apr 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/deploy_docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ jobs:
run: ninja -C build install
- name: Move files into place
run: |
mv $HOME/share/gtk-doc/html/gtk-layer-shell ./_site
cp ./_site/gtk-layer-shell-GTK4-Layer-Shell.html ./_site/index.html
mv $HOME/share/gtk-doc/html/gtk4-layer-shell ./_site
cp ./_site/gtk4-layer-shell-GTK4-Layer-Shell.html ./_site/index.html
- name: Upload artifact
uses: actions/upload-pages-artifact@v1

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
<title>API Reference</title>
<partintro>
<para>
Gtk-layer-shell is a library to write <ulink type ="http" url="https://www.gtk.org/">GTK</ulink>
gtk4-layer-shell is a library to write <ulink type ="http" url="https://www.gtk.org/">GTK</ulink>
applications that use <ulink type="https" url="https://github.com/swaywm/wlr-protocols/blob/master/unstable/wlr-layer-shell-unstable-v1.xml">Layer Shell</ulink>.
Layer Shell is a Wayland protocol for desktop shell components,
such as panels, notifications and wallpapers. You can use it to anchor
Expand Down
6 changes: 3 additions & 3 deletions doc/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ glib_docpath = join_paths(glib_prefix, 'share', 'gtk-doc', 'html')
docpath = join_paths(get_option('datadir'), 'gtk-doc', 'html')

gnome.gtkdoc(
'gtk-layer-shell',
main_xml: 'gtk-layer-shell-docs.sgml',
'gtk4-layer-shell',
main_xml: 'gtk4-layer-shell-docs.sgml',
src_dir: [
join_paths(meson.source_root(), 'include'),
join_paths(meson.build_root(), 'include'),
Expand All @@ -19,6 +19,6 @@ gnome.gtkdoc(
'--extra-dir=@0@'.format(join_paths(glib_docpath, 'gio')),
'--extra-dir=@0@'.format(join_paths(glib_docpath, 'gtk3')),
],
install_dir: 'gtk-layer-shell',
install_dir: 'gtk4-layer-shell',
install: true
)
4 changes: 2 additions & 2 deletions examples/demo/gtk-layer-demo.c
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ static const GOptionEntry options[] = {
.flags = G_OPTION_FLAG_NONE,
.arg = G_OPTION_ARG_NONE,
.arg_data = &no_layer_shell,
.description = "Disable gtk-layer-shell, create a normal shell surface instead",
.description = "Disable gtk4-layer-shell, create a normal shell surface instead",
.arg_description = NULL,
},
{ NULL, 0, 0, 0, NULL, NULL, NULL }
Expand Down Expand Up @@ -250,7 +250,7 @@ process_args (int *argc, char ***argv)
if (show_version_and_exit)
{
g_print (
"%s on gtk-layer-shell v%d.%d.%d\n",
"%s on gtk4-layer-shell v%d.%d.%d\n",
prog_name,
gtk_layer_get_major_version (),
gtk_layer_get_minor_version (),
Expand Down
2 changes: 1 addition & 1 deletion examples/vala-standalone/meson.build
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
project('vala-gtk-layer-shell-example',
project('vala-gtk4-layer-shell-example',
['vala', 'c'],
version: '0.1.0',
license: 'MIT',
Expand Down
6 changes: 3 additions & 3 deletions include/gtk4-layer-shell.h
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ struct zwlr_layer_surface_v1 *gtk_layer_get_zwlr_layer_surface_v1 (GtkWindow *wi
* ownership of original. If the window is currently mapped, it will get remapped so
* the change can take effect.
*
* Default is "gtk-layer-shell" (which will be used if set to %NULL)
* Default is "gtk4-layer-shell" (which will be used if set to %NULL)
*/
void gtk_layer_set_namespace (GtkWindow *window, char const* name_space);

Expand All @@ -166,7 +166,7 @@ void gtk_layer_set_namespace (GtkWindow *window, char const* name_space);
* Future calls into the library may invalidate the returned string.
*
* Returns: a reference to the namespace property. If namespace is unset, returns the
* default namespace ("gtk-layer-shell"). Never returns %NULL.
* default namespace ("gtk4-layer-shell"). Never returns %NULL.
*/
const char *gtk_layer_get_namespace (GtkWindow *window);

Expand Down Expand Up @@ -290,7 +290,7 @@ int gtk_layer_get_exclusive_zone (GtkWindow *window);
* exclusive zone to 0 or any other fixed value.
*
* NOTE: you can control the auto exclusive zone by changing the margin on the non-anchored
* edge. This behavior is specific to gtk-layer-shell and not part of the underlying protocol
* edge. This behavior is specific to gtk4-layer-shell and not part of the underlying protocol
*/
void gtk_layer_auto_exclusive_zone_enable (GtkWindow *window);

Expand Down
2 changes: 1 addition & 1 deletion src/layer-surface.c
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,7 @@ layer_surface_get_namespace (LayerSurface *self)
if (self && self->name_space)
return self->name_space;
else
return "gtk-layer-shell";
return "gtk4-layer-shell";
}

static void
Expand Down
2 changes: 1 addition & 1 deletion test/README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# GTK Layer Shell tests
This directory is home to the gtk-layer-shell test suite.
This directory is home to the gtk4-layer-shell test suite.

## To run tests
`ninja -C build test` (where `build` is the path to your build directory).
Expand Down
2 changes: 1 addition & 1 deletion test/integration-tests/test-get-namespace-default.c
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ static void callback_0()
gtk_layer_init_for_window(window);
gtk_window_present(window);
const char *name_space = gtk_layer_get_namespace(window);
ASSERT_STR_EQ(name_space, "gtk-layer-shell");
ASSERT_STR_EQ(name_space, "gtk4-layer-shell");
}

TEST_CALLBACKS(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ static void callback_0()
{
window = create_default_window();
const char *name_space = gtk_layer_get_namespace(window);
ASSERT_STR_EQ(name_space, "gtk-layer-shell");
ASSERT_STR_EQ(name_space, "gtk4-layer-shell");
}

TEST_CALLBACKS(
Expand Down