Skip to content

Commit 17c20e6

Browse files
committed
Rename to make_greeter
1 parent 8c833eb commit 17c20e6

4 files changed

Lines changed: 12 additions & 11 deletions

File tree

protocol/pantheon-desktop-shell-v1.xml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -181,9 +181,10 @@
181181
<interface name="io_elementary_pantheon_greeter_v1" version="1">
182182
<request name="destroy" type="destructor"/>
183183

184-
<request name="init">
185-
<description summary="init greeter">
186-
Init Greeter
184+
<request name="make_greeter">
185+
<description summary="make greeter">
186+
Request to make the surface a Greeter window, which will be displayed bellow other windows
187+
when running in greeter compositor mode.
187188
</description>
188189
</request>
189190
</interface>

protocol/pantheon-desktop-shell.vapi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ namespace Pantheon.Desktop {
7070
[CCode (cheader_filename = "pantheon-desktop-shell-server-protocol.h", cname = "io_elementary_pantheon_greeter_v1_interface")]
7171
public static Wl.Interface iface;
7272
public Destroy destroy;
73-
public Init init;
73+
public MakeGreeter make_greeter;
7474
}
7575

7676
[CCode (has_target = false, has_typedef = false)]
@@ -104,7 +104,7 @@ namespace Pantheon.Desktop {
104104
[CCode (has_target = false, has_typedef = false)]
105105
public delegate void MakeMonitorLabel (Wl.Client client, Wl.Resource resource, int monitor_index);
106106
[CCode (has_target = false, has_typedef = false)]
107-
public delegate void Init (Wl.Client client, Wl.Resource resource);
107+
public delegate void MakeGreeter (Wl.Client client, Wl.Resource resource);
108108
[CCode (has_target = false, has_typedef = false)]
109109
public delegate void Destroy (Wl.Client client, Wl.Resource resource);
110110
}

src/PantheonShell.vala

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ namespace Gala {
6161

6262
wayland_pantheon_greeter_interface = {
6363
destroy_greeter_surface,
64-
init_greeter,
64+
make_greeter,
6565
};
6666

6767
PanelSurface.quark = GLib.Quark.from_string ("-gala-wayland-panel-surface-data");
@@ -464,21 +464,21 @@ namespace Gala {
464464
ShellClientsManager.get_instance ().make_monitor_label (window, monitor_index);
465465
}
466466

467-
internal static void init_greeter (Wl.Client client, Wl.Resource resource) {
467+
internal static void make_greeter (Wl.Client client, Wl.Resource resource) {
468468
unowned GreeterSurface? greeter_surface = resource.get_user_data<GreeterSurface> ();
469469
if (greeter_surface.wayland_surface == null) {
470-
warning ("Window tried to init greeter but wayland surface is null.");
470+
warning ("Window tried to make greeter but wayland surface is null.");
471471
return;
472472
}
473473

474474
Meta.Window? window;
475475
greeter_surface.wayland_surface.get ("window", out window, null);
476476
if (window == null) {
477-
warning ("Window tried to init greeter but wayland surface had no associated window.");
477+
warning ("Window tried to make greeter but wayland surface had no associated window.");
478478
return;
479479
}
480480

481-
ShellClientsManager.get_instance ().init_greeter (window);
481+
ShellClientsManager.get_instance ().make_greeter (window);
482482
}
483483

484484
internal static void destroy_panel_surface (Wl.Client client, Wl.Resource resource) {

src/ShellClients/ShellClientsManager.vala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ public class Gala.ShellClientsManager : Object, GestureTarget {
315315
window.unmanaged.connect_after (() => ibus_candidate_window = null);
316316
}
317317

318-
public void init_greeter (Meta.Window window) {
318+
public void make_greeter (Meta.Window window) {
319319
make_desktop (window);
320320

321321
wm.override_window_group (window, LOCK_SCREEN);

0 commit comments

Comments
 (0)