Merge lp:~voldyman/pantheon-greeter/no-warnings into lp:~elementary-pantheon/pantheon-greeter/trunk

Proposed by Akshay Shekher
Status: Merged
Approved by: Danielle Foré
Approved revision: 397
Merged at revision: 400
Proposed branch: lp:~voldyman/pantheon-greeter/no-warnings
Merge into: lp:~elementary-pantheon/pantheon-greeter/trunk
Diff against target: 50 lines (+6/-5)
3 files modified
src/LoginBox.vala (+1/-2)
src/PantheonGreeter.vala (+3/-1)
src/Wallpaper.vala (+2/-2)
To merge this branch: bzr merge lp:~voldyman/pantheon-greeter/no-warnings
Reviewer Review Type Date Requested Status
elementary Pantheon team Pending
Review via email: mp+273613@code.launchpad.net

Commit message

Fix deprecated functions

Actor.scale_gravity is deprecated and pivot point is the replacement
Gtk.cursor the new cursor requires you to provide an object for the display now
Clutter.texture.get_base_size has been deprecated in favor of get_preferred_size
Actor.show_all has been deprecated and all children are shown by default

Description of the change

greeter used some functions that were deprecated, removed/fixed them according to the recommendations.

To post a comment you must log in.
Revision history for this message
Akshay Shekher (voldyman) wrote :

Actor.scale_gravity is deprecated and pivot point is the replacement
Gtk.cursor the new cursor requires you to provide an object for the display now
Clutter.texture.get_base_size has been deprecated in favor of get_preferred_size
Actor.show_all has been deprecated and all children are shown by default

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/LoginBox.vala'
2--- src/LoginBox.vala 2015-07-12 23:01:27 +0000
3+++ src/LoginBox.vala 2015-10-06 20:30:12 +0000
4@@ -62,7 +62,7 @@
5 public LoginBox (LoginOption user) {
6 this.user = user;
7 this.reactive = true;
8- this.scale_gravity = Clutter.Gravity.CENTER;
9+ this.pivot_point = Clutter.Point.alloc ().init (0.5f, 0.5f);
10
11 create_label ();
12 create_credentials ();
13@@ -74,7 +74,6 @@
14 update_avatar ();
15 });
16 }
17- show_all ();
18 }
19
20 void create_credentials () {
21
22=== modified file 'src/PantheonGreeter.vala'
23--- src/PantheonGreeter.vala 2015-04-23 06:09:09 +0000
24+++ src/PantheonGreeter.vala 2015-10-06 20:30:12 +0000
25@@ -455,7 +455,9 @@
26 Intl.bind_textdomain_codeset ("pantheon-greeter", "UTF-8");
27 Intl.textdomain ("pantheon-greeter");
28
29- Gdk.get_default_root_window ().set_cursor (new Gdk.Cursor (Gdk.CursorType.LEFT_PTR));
30+ var cursor = new Gdk.Cursor.for_display (Gdk.Display.get_default (),
31+ Gdk.CursorType.LEFT_PTR);
32+ Gdk.get_default_root_window ().set_cursor (cursor);
33
34 var settings = Gtk.Settings.get_default ();
35 settings.gtk_theme_name = "elementary";
36
37=== modified file 'src/Wallpaper.vala'
38--- src/Wallpaper.vala 2015-04-22 21:10:35 +0000
39+++ src/Wallpaper.vala 2015-10-06 20:30:12 +0000
40@@ -205,8 +205,8 @@
41 }
42
43 void resize (GtkClutter.Texture tex) {
44- int w, h;
45- tex.get_base_size (out w, out h);
46+ float w, h;
47+ (tex as Clutter.Content).get_preferred_size (out w, out h);
48
49 if (width > (w * height) / h) {
50 tex.width = width;

Subscribers

People subscribed via source and target branches