Unity Greeter

Merge lp:~larsu/unity-greeter/dont-set-spinner into lp:unity-greeter

  1. dont-set-spinner
  2. Merge into trunk
Proposed by Lars Karlitski on 2015-01-27
Status: Merged
Approved by: Iain Lane on 2015-01-28
Approved revision: 1520
Merged at revision: 1519
Proposed branch: lp:~larsu/unity-greeter/dont-set-spinner
Merge into: lp:unity-greeter
Diff against target: 89 lines (+8/-27)
4 files modified
debian/changelog (+6/-0)
debian/control (+1/-0)
src/dash-entry.vala (+0/-25)
tests/test.vala (+1/-2)
To merge this branch: bzr merge lp:~larsu/unity-greeter/dont-set-spinner
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve on 2015-01-28
Dmitry Shachnev (community) Approve on 2015-01-28
Robert Ancell 2015-01-27 Approve on 2015-01-27
Review via email: mp+247770@code.launchpad.net

Commit Message

DashEntry: remove .spinner class

Spinners are drawn differently now, which caused the entry to be not drawn at all.

This depends on the theme setting (and animating) the -gtk-icon-source of this entry.

Description of the Change

DashEntry: remove .spinner class

Spinners are drawn differently now, which caused the entry to be not drawn at all.

This depends on the theme setting (and animating) the -gtk-icon-source of this entry (see my other MR for this).

To post a comment you must log in.
Robert Ancell (robert-ancell) wrote :
Robert Ancell (robert-ancell) wrote :

Less code is better :)

review: Approve
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Dmitry Shachnev (mitya57) wrote :

The build fails for me:

UBUNTU_MENUPROXY=0 top_srcdir=.. . xvfb-run -a ./unity-greeter-test
/Simple Navigation:
[...]
(./unity-greeter-test:29537): GLib-GObject-CRITICAL **: g_object_ref: assertion 'G_IS_OBJECT (object)' failed
/usr/bin/xvfb-run: line 184: 29537 Trace/breakpoint trap DISPLAY=:$SERVERNUM XAUTHORITY=$AUTHFILE "$@" 2>&1
Makefile:1267: recipe for target 'check' failed

See https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/landing-000/+build/6757367/+files/buildlog_ubuntu-vivid-amd64.unity-greeter_15.04.2-0ubuntu2_FAILEDTOBUILD.txt.gz

review: Needs Fixing
lp:~larsu/unity-greeter/dont-set-spinner updated on 2015-01-28
1520. By Iain Lane on 2015-01-28

Set GSETTINGS_SCHEMA_DIR and install an icon theme.

Dmitry Shachnev (mitya57) wrote :

This is in archive now, the changes are:

* Changelog entry
* Archive version has s/ubuntu-mono/humanity-icon-theme/, but ubuntu-mono is better, so let's keep it.

review: Approve
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2014-12-07 20:17:28 +0000
3+++ debian/changelog 2015-01-28 10:24:01 +0000
4@@ -1,3 +1,9 @@
5+unity-greeter (15.04.2-0ubuntu2) UNRELEASED; urgency=medium
6+
7+ * Set GSETTINGS_SCHEMA_DIR and install an icon theme.
8+
9+ -- Iain Lane <iain@orangesquash.org.uk> Wed, 28 Jan 2015 10:03:39 +0000
10+
11 unity-greeter (15.04.2-0ubuntu1) vivid; urgency=medium
12
13 * Launch user upstart session with 'upstart' instead of 'init' which doesn't
14
15=== modified file 'debian/control'
16--- debian/control 2014-12-06 01:56:56 +0000
17+++ debian/control 2015-01-28 10:24:01 +0000
18@@ -9,6 +9,7 @@
19 debhelper (>= 9),
20 dh-autoreconf,
21 gnome-common,
22+ ubuntu-mono,
23 ttf-ubuntu-font-family,
24 unity-settings-daemon-dev,
25 libcanberra-dev,
26
27=== modified file 'src/dash-entry.vala'
28--- src/dash-entry.vala 2013-02-20 16:17:42 +0000
29+++ src/dash-entry.vala 2015-01-28 10:24:01 +0000
30@@ -47,8 +47,6 @@
31 }
32 }
33
34- private static const string NO_BORDER_CLASS = "unity-greeter-no-border";
35-
36 protected FadeTracker fade_tracker { get; protected set; }
37 private Gdk.Window arrow_win;
38 private static Gdk.Pixbuf arrow_pixbuf;
39@@ -89,27 +87,6 @@
40 {
41 debug ("Internal error loading padding style: %s", e.message);
42 }
43-
44- // We add the styles and classes we need for normal operation of the
45- // spinner animation. These are always "on" and we just turn them off
46- // right before drawing our parent class's draw function. This is done
47- // opt-out like that rather than just turning the styles on when we
48- // need to draw the spinner because the animation doesn't work right
49- // otherwise. See the draw() function for how we turn it off.
50- var no_border_provider = new Gtk.CssProvider ();
51- try
52- {
53- var css = ".%s {border: 0px;}".printf (NO_BORDER_CLASS);
54- no_border_provider.load_from_data (css, -1);
55- }
56- catch (Error e)
57- {
58- debug ("Internal error loading spinner style: %s", e.message);
59- }
60- style_ctx.add_provider (no_border_provider,
61- Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
62- style_ctx.add_class (NO_BORDER_CLASS);
63- style_ctx.add_class (Gtk.STYLE_CLASS_SPINNER);
64 }
65
66 public override bool draw (Cairo.Context c)
67@@ -118,8 +95,6 @@
68
69 // See construct method for explanation of why we remove classes
70 style_ctx.save ();
71- style_ctx.remove_class (Gtk.STYLE_CLASS_SPINNER);
72- style_ctx.remove_class (NO_BORDER_CLASS);
73 c.save ();
74 c.push_group ();
75 base.draw (c);
76
77=== modified file 'tests/test.vala'
78--- tests/test.vala 2013-08-01 14:54:56 +0000
79+++ tests/test.vala 2015-01-28 10:24:01 +0000
80@@ -754,8 +754,7 @@
81 var schema_dir = Path.build_filename(dir, "share", "glib-2.0", "schemas");
82 DirUtils.create_with_parents(schema_dir, 0700);
83
84- var data_dirs = Environment.get_variable("XDG_DATA_DIRS");
85- Environment.set_variable("XDG_DATA_DIRS", "%s:%s".printf(Path.build_filename(dir, "share"), data_dirs), true);
86+ Environment.set_variable("GSETTINGS_SCHEMA_DIR", schema_dir, true);
87
88 var top_srcdir = Environment.get_variable("top_srcdir");
89 if (top_srcdir == null || top_srcdir == "")

Subscribers

People subscribed via source and target branches