diff options
| author | Dmitry Shachnev <[email protected]> | 2015-01-28 13:48:58 +0300 |
|---|---|---|
| committer | git-ubuntu importer <[email protected]> | 2015-01-28 10:59:09 +0000 |
| commit | d7102a6593018fd837b35ba2cd4c6b0b05868a29 (patch) | |
| tree | 3e2b5ebeb879d362a47f780d4d8eef373683d856 | |
| parent | 393a51208648449a6f12f9f034942cab5de1300f (diff) | |
15.04.2-0ubuntu2 (patches unapplied)import/15.04.2-0ubuntu2
Imported using git-ubuntu import.
Notes
Notes:
[ Iain Lane ]
* Set GSETTINGS_SCHEMA_DIR and install an icon theme.
[ Lars Uebernickel ]
* Remove old code for drawing DashEntry that is no longer needed.
| -rw-r--r-- | debian/changelog | 10 | ||||
| -rw-r--r-- | debian/control | 1 | ||||
| -rw-r--r-- | src/dash-entry.vala | 25 | ||||
| -rw-r--r-- | tests/test.vala | 3 |
4 files changed, 12 insertions, 27 deletions
diff --git a/debian/changelog b/debian/changelog index fb6ac686..5e2f625a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +unity-greeter (15.04.2-0ubuntu2) vivid; urgency=medium + + [ Iain Lane ] + * Set GSETTINGS_SCHEMA_DIR and install an icon theme. + + [ Lars Uebernickel ] + * Remove old code for drawing DashEntry that is no longer needed. + + -- Dmitry Shachnev <[email protected]> Wed, 28 Jan 2015 13:48:58 +0300 + unity-greeter (15.04.2-0ubuntu1) vivid; urgency=medium * Launch user upstart session with 'upstart' instead of 'init' which doesn't diff --git a/debian/control b/debian/control index a37c23f5..86273de4 100644 --- a/debian/control +++ b/debian/control @@ -9,6 +9,7 @@ Build-Depends: appmenu-gtk3, debhelper (>= 9), dh-autoreconf, gnome-common, + humanity-icon-theme, ttf-ubuntu-font-family, unity-settings-daemon-dev, libcanberra-dev, diff --git a/src/dash-entry.vala b/src/dash-entry.vala index 9528705c..ef0a0dce 100644 --- a/src/dash-entry.vala +++ b/src/dash-entry.vala @@ -47,8 +47,6 @@ public class DashEntry : Gtk.Entry, Fadable } } - 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 @@ public class DashEntry : Gtk.Entry, Fadable { 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 @@ public class DashEntry : Gtk.Entry, Fadable // 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); diff --git a/tests/test.vala b/tests/test.vala index 8c6e35d2..14f0a5ea 100644 --- a/tests/test.vala +++ b/tests/test.vala @@ -754,8 +754,7 @@ public class Test 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 == "") |