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
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2014-03-31 18:00:13 +0000
+++ CMakeLists.txt 2014-06-19 13:47:26 +0000
@@ -259,6 +259,7 @@
259add_subdirectory(unity-shared)259add_subdirectory(unity-shared)
260add_subdirectory(dash)260add_subdirectory(dash)
261add_subdirectory(launcher)261add_subdirectory(launcher)
262add_subdirectory(data)
262if (ENABLE_X_SUPPORT)263if (ENABLE_X_SUPPORT)
263 add_subdirectory(hud)264 add_subdirectory(hud)
264 add_subdirectory(lockscreen)265 add_subdirectory(lockscreen)
265266
=== added directory 'data'
=== added file 'data/CMakeLists.txt'
--- data/CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ data/CMakeLists.txt 2014-06-19 13:47:26 +0000
@@ -0,0 +1,1 @@
1add_subdirectory(pam)
0\ No newline at end of file2\ No newline at end of file
13
=== added directory 'data/pam'
=== added file 'data/pam/CMakeLists.txt'
--- data/pam/CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ data/pam/CMakeLists.txt 2014-06-19 13:47:26 +0000
@@ -0,0 +1,1 @@
1install(FILES unity DESTINATION ${CMAKE_INSTALL_PREFIX}/etc/pam.d)
0\ No newline at end of file2\ No newline at end of file
13
=== added file 'data/pam/unity'
--- data/pam/unity 1970-01-01 00:00:00 +0000
+++ data/pam/unity 2014-06-19 13:47:26 +0000
@@ -0,0 +1,2 @@
1@include common-auth
2auth optional pam_gnome_keyring.so
03
=== modified file 'decorations/DecorationsForceQuitDialog.cpp'
--- decorations/DecorationsForceQuitDialog.cpp 2014-04-02 13:14:43 +0000
+++ decorations/DecorationsForceQuitDialog.cpp 2014-06-19 13:47:26 +0000
@@ -286,8 +286,13 @@
286286
287 auto* content_box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5);287 auto* content_box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5);
288 gtk_container_set_border_width(GTK_CONTAINER(content_box), 10);288 gtk_container_set_border_width(GTK_CONTAINER(content_box), 10);
289#if GTK_CHECK_VERSION(3, 11, 0)
290 gtk_widget_set_margin_start(content_box, 20);
291 gtk_widget_set_margin_end(content_box, 20);
292#else
289 gtk_widget_set_margin_left(content_box, 20);293 gtk_widget_set_margin_left(content_box, 20);
290 gtk_widget_set_margin_right(content_box, 20);294 gtk_widget_set_margin_right(content_box, 20);
295#endif
291 gtk_container_add(GTK_CONTAINER(main_box), content_box);296 gtk_container_add(GTK_CONTAINER(main_box), content_box);
292297
293 auto* title = gtk_label_new(_("This window is not responding"));298 auto* title = gtk_label_new(_("This window is not responding"));
294299
=== modified file 'lockscreen/UserAuthenticatorPam.cpp'
--- lockscreen/UserAuthenticatorPam.cpp 2014-03-24 00:16:06 +0000
+++ lockscreen/UserAuthenticatorPam.cpp 2014-06-19 13:47:26 +0000
@@ -70,8 +70,7 @@
70 conversation.conv = ConversationFunction;70 conversation.conv = ConversationFunction;
71 conversation.appdata_ptr = static_cast<void*>(this);71 conversation.appdata_ptr = static_cast<void*>(this);
7272
73 // FIXME (andy) We should install our own unityshell pam file.73 return pam_start("unity", username_.c_str(),
74 return pam_start("lightdm", username_.c_str(),
75 &conversation, &pam_handle_) == PAM_SUCCESS;74 &conversation, &pam_handle_) == PAM_SUCCESS;
76}75}
7776
7877
=== modified file 'unity-shared/DecorationStyle.cpp'
--- unity-shared/DecorationStyle.cpp 2014-04-02 17:05:04 +0000
+++ unity-shared/DecorationStyle.cpp 2014-06-19 13:47:26 +0000
@@ -169,7 +169,9 @@
169169
170 GtkSettings* settings = gtk_settings_get_default();170 GtkSettings* settings = gtk_settings_get_default();
171 signals_.Add<void, GtkSettings*, GParamSpec*>(settings, "notify::gtk-theme-name", [this] (GtkSettings*, GParamSpec*) {171 signals_.Add<void, GtkSettings*, GParamSpec*>(settings, "notify::gtk-theme-name", [this] (GtkSettings*, GParamSpec*) {
172#if !GTK_CHECK_VERSION(3, 11, 0)
172 gtk_style_context_invalidate(ctx_);173 gtk_style_context_invalidate(ctx_);
174#endif
173 UpdateThemedValues();175 UpdateThemedValues();
174 parent_->theme = glib::String(GetSettingValue<gchar*>("gtk-theme-name")).Str();176 parent_->theme = glib::String(GetSettingValue<gchar*>("gtk-theme-name")).Str();
175 LOG_INFO(logger) << "gtk-theme-name changed to " << parent_->theme();177 LOG_INFO(logger) << "gtk-theme-name changed to " << parent_->theme();
@@ -192,7 +194,9 @@
192 parent_->font_scale.changed.connect([this] (bool scale) {194 parent_->font_scale.changed.connect([this] (bool scale) {
193 UpdateTitlePangoContext(parent_->title_font);195 UpdateTitlePangoContext(parent_->title_font);
194 UpdateMenuItemPangoContext(parent_->font);196 UpdateMenuItemPangoContext(parent_->font);
197#if !GTK_CHECK_VERSION(3, 11, 0)
195 gtk_style_context_invalidate(ctx_);198 gtk_style_context_invalidate(ctx_);
199#endif
196 parent_->theme.changed.emit(parent_->theme());200 parent_->theme.changed.emit(parent_->theme());
197 LOG_INFO(logger) << "font scale changed to " << scale;201 LOG_INFO(logger) << "font scale changed to " << scale;
198 });202 });
199203
=== modified file 'unity-shared/PanelStyle.cpp'
--- unity-shared/PanelStyle.cpp 2014-03-31 21:08:10 +0000
+++ unity-shared/PanelStyle.cpp 2014-06-19 13:47:26 +0000
@@ -154,7 +154,9 @@
154154
155void Style::RefreshContext()155void Style::RefreshContext()
156{156{
157#if !GTK_CHECK_VERSION(3, 11, 0)
157 gtk_style_context_invalidate(style_context_);158 gtk_style_context_invalidate(style_context_);
159#endif
158 bg_textures_.assign(monitors::MAX, BaseTexturePtr());160 bg_textures_.assign(monitors::MAX, BaseTexturePtr());
159161
160 changed.emit();162 changed.emit();