Skip to content
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
2 changes: 1 addition & 1 deletion compositor/PantheonShell.vala
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ namespace GreeterCompositor {
wayland_pantheon_shell_interface = {
get_panel,
get_widget,
get_greeter,
get_extended_behavior,
get_greeter,
};

wayland_pantheon_panel_interface = {
Expand Down
16 changes: 8 additions & 8 deletions compositor/protocol/pantheon-desktop-shell-v1.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,21 +29,21 @@
<arg name="surface" type="object" interface="wl_surface"/>
</request>

<request name="get_greeter">
<description summary="create a greeter surface from a surface">
Create a greeter surface from an existing surface.
</description>
<arg name="output" type="new_id" interface="io_elementary_pantheon_greeter_v1"/>
<arg name="surface" type="object" interface="wl_surface"/>
</request>

<request name="get_extended_behavior">
<description summary="create a desktop-specific surface from a surface">
Create a desktop-specific surface from an existing surface.
</description>
<arg name="output" type="new_id" interface="io_elementary_pantheon_extended_behavior_v1"/>
<arg name="surface" type="object" interface="wl_surface"/>
</request>

<request name="get_greeter">
<description summary="create a greeter surface from a surface">
Create a greeter surface from an existing surface.
</description>
<arg name="output" type="new_id" interface="io_elementary_pantheon_greeter_v1"/>
<arg name="surface" type="object" interface="wl_surface"/>
</request>
</interface>

<interface name="io_elementary_pantheon_panel_v1" version="1">
Expand Down
3 changes: 1 addition & 2 deletions compositor/protocol/pantheon-desktop-shell.vapi
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,8 @@ namespace Pantheon.Desktop {
public static Wl.Interface iface;
public Pantheon.Desktop.GetPanel get_panel;
public Pantheon.Desktop.GetWidget get_widget;
public Pantheon.Desktop.GetGreeter get_greeter;
public Pantheon.Desktop.GetExtendedBehavior get_extended_behavior;

public Pantheon.Desktop.GetGreeter get_greeter;
}

[CCode (cheader_filename = "pantheon-desktop-shell-server-protocol.h", cname = "enum io_elementary_pantheon_panel_v1_anchor", cprefix="IO_ELEMENTARY_PANTHEON_PANEL_V1_ANCHOR_", has_type_id = false)]
Expand Down
16 changes: 8 additions & 8 deletions protocol/pantheon-desktop-shell-v1.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,21 +29,21 @@
<arg name="surface" type="object" interface="wl_surface"/>
</request>

<request name="get_greeter">
<description summary="create a greeter surface from a surface">
Create a greeter surface from an existing surface.
</description>
<arg name="output" type="new_id" interface="io_elementary_pantheon_greeter_v1"/>
<arg name="surface" type="object" interface="wl_surface"/>
</request>

<request name="get_extended_behavior">
<description summary="create a desktop-specific surface from a surface">
Create a desktop-specific surface from an existing surface.
</description>
<arg name="output" type="new_id" interface="io_elementary_pantheon_extended_behavior_v1"/>
<arg name="surface" type="object" interface="wl_surface"/>
</request>

<request name="get_greeter">
<description summary="create a greeter surface from a surface">
Create a greeter surface from an existing surface.
</description>
<arg name="output" type="new_id" interface="io_elementary_pantheon_greeter_v1"/>
<arg name="surface" type="object" interface="wl_surface"/>
</request>
</interface>

<interface name="io_elementary_pantheon_panel_v1" version="1">
Expand Down
2 changes: 1 addition & 1 deletion protocol/pantheon-desktop-shell.vapi
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ namespace Pantheon.Desktop {
public uint32 get_version ();
public Pantheon.Desktop.Panel get_panel (Wl.Surface surface);
public Pantheon.Desktop.Widget get_widget (Wl.Surface surface);
public Pantheon.Desktop.Greeter get_greeter (Wl.Surface surface);
public Pantheon.Desktop.ExtendedBehavior get_extended_behavior (Wl.Surface surface);
public Pantheon.Desktop.Greeter get_greeter (Wl.Surface surface);

}
[CCode (cheader_filename = "pantheon-desktop-shell-client-protocol.h", cname = "enum io_elementary_pantheon_panel_v1_anchor", cprefix="IO_ELEMENTARY_PANTHEON_PANEL_V1_ANCHOR_", has_type_id = false)]
Expand Down
Loading