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

[Lars Karlitski]

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.

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).

[Robert Ancell (robert-ancell)]

Related MP is https://code.launchpad.net/~larsu/ubuntu-themes/unity-greeter-pw-entry/+merge/247771

[Robert Ancell (robert-ancell)]

Less code is better :)

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1519
http://jenkins.qa.ubuntu.com/job/unity-greeter-ci/58/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-greeter-vivid-amd64-ci/6/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-greeter-vivid-armhf-ci/6/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-greeter-ci/58/rebuild

review: Needs Fixing (continuous-integration)

[Dmitry Shachnev (mitya57)]

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]

1520. By Iain Lane on 2015-01-28

Set GSETTINGS_SCHEMA_DIR and install an icon theme.

[Dmitry Shachnev (mitya57)]

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)]

PASSED: Continuous integration, rev:1520
http://jenkins.qa.ubuntu.com/job/unity-greeter-ci/59/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-greeter-vivid-amd64-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-greeter-vivid-armhf-ci/7

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-greeter-ci/59/rebuild

review: Approve (continuous-integration)

=== modified file 'debian/changelog'
--- debian/changelog	2014-12-07 20:17:28 +0000
+++ debian/changelog	2015-01-28 10:24:01 +0000
@@ -1,3 +1,9 @@
+unity-greeter (15.04.2-0ubuntu2) UNRELEASED; urgency=medium
+
+  * Set GSETTINGS_SCHEMA_DIR and install an icon theme.
+
+ -- Iain Lane <[e-mail]>  Wed, 28 Jan 2015 10:03:39 +0000
+
 unity-greeter (15.04.2-0ubuntu1) vivid; urgency=medium
 
   * Launch user upstart session with 'upstart' instead of 'init' which doesn't

=== modified file 'debian/control'
--- debian/control	2014-12-06 01:56:56 +0000
+++ debian/control	2015-01-28 10:24:01 +0000
@@ -9,6 +9,7 @@
                debhelper (>= 9),
                dh-autoreconf,
                gnome-common,
+               ubuntu-mono,
                ttf-ubuntu-font-family,
                unity-settings-daemon-dev,
                libcanberra-dev,

=== modified file 'src/dash-entry.vala'
--- src/dash-entry.vala	2013-02-20 16:17:42 +0000
+++ src/dash-entry.vala	2015-01-28 10:24:01 +0000
@@ -47,8 +47,6 @@
         }
     }
 
-    private static const string NO_BORDER_CLASS = "unity-greeter-no-border";
-
     protected FadeTracker fade_tracker { get; protected set; }
     private Gdk.Window arrow_win;
     private static Gdk.Pixbuf arrow_pixbuf;
@@ -89,27 +87,6 @@
         {
             debug ("Internal error loading padding style: %s", e.message);
         }
-
-        // We add the styles and classes we need for normal operation of the
-        // spinner animation.  These are always "on" and we just turn them off
-        // right before drawing our parent class's draw function.  This is done
-        // opt-out like that rather than just turning the styles on when we
-        // need to draw the spinner because the animation doesn't work right
-        // otherwise.  See the draw() function for how we turn it off.
-        var no_border_provider = new Gtk.CssProvider ();
-        try
-        {
-            var css = ".%s {border: 0px;}".printf (NO_BORDER_CLASS);
-            no_border_provider.load_from_data (css, -1);
-        }
-        catch (Error e)
-        {
-            debug ("Internal error loading spinner style: %s", e.message);
-        }
-        style_ctx.add_provider (no_border_provider,
-                                Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
-        style_ctx.add_class (NO_BORDER_CLASS);
-        style_ctx.add_class (Gtk.STYLE_CLASS_SPINNER);
     }
 
     public override bool draw (Cairo.Context c)
@@ -118,8 +95,6 @@
 
         // See construct method for explanation of why we remove classes
         style_ctx.save ();
-        style_ctx.remove_class (Gtk.STYLE_CLASS_SPINNER);
-        style_ctx.remove_class (NO_BORDER_CLASS);
         c.save ();
         c.push_group ();
         base.draw (c);

=== modified file 'tests/test.vala'
--- tests/test.vala	2013-08-01 14:54:56 +0000
+++ tests/test.vala	2015-01-28 10:24:01 +0000
@@ -754,8 +754,7 @@
             var schema_dir = Path.build_filename(dir, "share", "glib-2.0", "schemas");
             DirUtils.create_with_parents(schema_dir, 0700);
 
-            var data_dirs = Environment.get_variable("XDG_DATA_DIRS");
-            Environment.set_variable("XDG_DATA_DIRS", "%s:%s".printf(Path.build_filename(dir, "share"), data_dirs), true);
+            Environment.set_variable("GSETTINGS_SCHEMA_DIR", schema_dir, true);
 
             var top_srcdir = Environment.get_variable("top_srcdir");
             if (top_srcdir == null || top_srcdir == "")