Unity

Merge lp:~azzar1/unity/fix-lp-1305440 into lp:unity

  1. fix-lp-1305440
  2. Merge into trunk
Proposed by Andrea Azzarone
Status: Superseded
Proposed branch: lp:~azzar1/unity/fix-lp-1305440
Merge into: lp:unity
Diff against target: 104 lines (+17/-2)
8 files modified
CMakeLists.txt (+1/-0)
data/CMakeLists.txt (+1/-0)
data/pam/CMakeLists.txt (+1/-0)
data/pam/unity (+2/-0)
decorations/DecorationsForceQuitDialog.cpp (+5/-0)
lockscreen/UserAuthenticatorPam.cpp (+1/-2)
unity-shared/DecorationStyle.cpp (+4/-0)
unity-shared/PanelStyle.cpp (+2/-0)
To merge this branch: bzr merge lp:~azzar1/unity/fix-lp-1305440
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Stephen M. Webb (community) Needs Fixing
Marco Trevisan (Treviño) Approve
Review via email: mp+221040@code.launchpad.net

This proposal has been superseded by a proposal from 2014-06-19.

Commit message

Allow a distinct pam config file for greeter and for lock-screen

To post a comment you must log in.
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

Fine enough!

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:3811
http://jenkins.qa.ubuntu.com/job/unity-ci/933/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/20/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/20/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/20/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Stephen M. Webb (bregma) wrote :

Please fix the packaging (see the Jenkins build failures)

review: Needs Fixing
Revision history for this message
Andrea Azzarone (azzar1) wrote :

I cannot see the failure anymore!

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:3812
http://jenkins.qa.ubuntu.com/job/unity-ci/970/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/57/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/57/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/57/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

The only errors I see here are related to jenkins failure due to deprecated gtk functions, that is fixed in lp:~3v1n0/unity/handle-gtk3.12-deprecations

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:3813
http://jenkins.qa.ubuntu.com/job/unity-ci/976/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/63/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/63/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/63/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:3814
http://jenkins.qa.ubuntu.com/job/unity-ci/977/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/64/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/64/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/64/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:3815
http://jenkins.qa.ubuntu.com/job/unity-ci/978/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/65/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/65/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/65/console

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

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2014-03-31 18:00:13 +0000
3+++ CMakeLists.txt 2014-06-19 13:47:26 +0000
4@@ -259,6 +259,7 @@
5 add_subdirectory(unity-shared)
6 add_subdirectory(dash)
7 add_subdirectory(launcher)
8+add_subdirectory(data)
9 if (ENABLE_X_SUPPORT)
10 add_subdirectory(hud)
11 add_subdirectory(lockscreen)
12
13=== added directory 'data'
14=== added file 'data/CMakeLists.txt'
15--- data/CMakeLists.txt 1970-01-01 00:00:00 +0000
16+++ data/CMakeLists.txt 2014-06-19 13:47:26 +0000
17@@ -0,0 +1,1 @@
18+add_subdirectory(pam)
19\ No newline at end of file
20
21=== added directory 'data/pam'
22=== added file 'data/pam/CMakeLists.txt'
23--- data/pam/CMakeLists.txt 1970-01-01 00:00:00 +0000
24+++ data/pam/CMakeLists.txt 2014-06-19 13:47:26 +0000
25@@ -0,0 +1,1 @@
26+install(FILES unity DESTINATION ${CMAKE_INSTALL_PREFIX}/etc/pam.d)
27\ No newline at end of file
28
29=== added file 'data/pam/unity'
30--- data/pam/unity 1970-01-01 00:00:00 +0000
31+++ data/pam/unity 2014-06-19 13:47:26 +0000
32@@ -0,0 +1,2 @@
33+@include common-auth
34+auth optional pam_gnome_keyring.so
35
36=== modified file 'decorations/DecorationsForceQuitDialog.cpp'
37--- decorations/DecorationsForceQuitDialog.cpp 2014-04-02 13:14:43 +0000
38+++ decorations/DecorationsForceQuitDialog.cpp 2014-06-19 13:47:26 +0000
39@@ -286,8 +286,13 @@
40
41 auto* content_box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5);
42 gtk_container_set_border_width(GTK_CONTAINER(content_box), 10);
43+#if GTK_CHECK_VERSION(3, 11, 0)
44+ gtk_widget_set_margin_start(content_box, 20);
45+ gtk_widget_set_margin_end(content_box, 20);
46+#else
47 gtk_widget_set_margin_left(content_box, 20);
48 gtk_widget_set_margin_right(content_box, 20);
49+#endif
50 gtk_container_add(GTK_CONTAINER(main_box), content_box);
51
52 auto* title = gtk_label_new(_("This window is not responding"));
53
54=== modified file 'lockscreen/UserAuthenticatorPam.cpp'
55--- lockscreen/UserAuthenticatorPam.cpp 2014-03-24 00:16:06 +0000
56+++ lockscreen/UserAuthenticatorPam.cpp 2014-06-19 13:47:26 +0000
57@@ -70,8 +70,7 @@
58 conversation.conv = ConversationFunction;
59 conversation.appdata_ptr = static_cast<void*>(this);
60
61- // FIXME (andy) We should install our own unityshell pam file.
62- return pam_start("lightdm", username_.c_str(),
63+ return pam_start("unity", username_.c_str(),
64 &conversation, &pam_handle_) == PAM_SUCCESS;
65 }
66
67
68=== modified file 'unity-shared/DecorationStyle.cpp'
69--- unity-shared/DecorationStyle.cpp 2014-04-02 17:05:04 +0000
70+++ unity-shared/DecorationStyle.cpp 2014-06-19 13:47:26 +0000
71@@ -169,7 +169,9 @@
72
73 GtkSettings* settings = gtk_settings_get_default();
74 signals_.Add<void, GtkSettings*, GParamSpec*>(settings, "notify::gtk-theme-name", [this] (GtkSettings*, GParamSpec*) {
75+#if !GTK_CHECK_VERSION(3, 11, 0)
76 gtk_style_context_invalidate(ctx_);
77+#endif
78 UpdateThemedValues();
79 parent_->theme = glib::String(GetSettingValue<gchar*>("gtk-theme-name")).Str();
80 LOG_INFO(logger) << "gtk-theme-name changed to " << parent_->theme();
81@@ -192,7 +194,9 @@
82 parent_->font_scale.changed.connect([this] (bool scale) {
83 UpdateTitlePangoContext(parent_->title_font);
84 UpdateMenuItemPangoContext(parent_->font);
85+#if !GTK_CHECK_VERSION(3, 11, 0)
86 gtk_style_context_invalidate(ctx_);
87+#endif
88 parent_->theme.changed.emit(parent_->theme());
89 LOG_INFO(logger) << "font scale changed to " << scale;
90 });
91
92=== modified file 'unity-shared/PanelStyle.cpp'
93--- unity-shared/PanelStyle.cpp 2014-03-31 21:08:10 +0000
94+++ unity-shared/PanelStyle.cpp 2014-06-19 13:47:26 +0000
95@@ -154,7 +154,9 @@
96
97 void Style::RefreshContext()
98 {
99+#if !GTK_CHECK_VERSION(3, 11, 0)
100 gtk_style_context_invalidate(style_context_);
101+#endif
102 bg_textures_.assign(monitors::MAX, BaseTexturePtr());
103
104 changed.emit();