Unity

Merge lp:~brandontschaefer/unity/ftbfs-gtk3-fix-panel-tray into lp:unity

  1. ftbfs-gtk3-fix-panel-tray
  2. Merge into trunk
Proposed by Brandon Schaefer
Status: Merged
Approved by: Stephen M. Webb
Approved revision: no longer in the source branch.
Merged at revision: 3900
Proposed branch: lp:~brandontschaefer/unity/ftbfs-gtk3-fix-panel-tray
Merge into: lp:unity
Diff against target: 29 lines (+3/-1)
2 files modified
decorations/DecorationsForceQuitDialog.cpp (+3/-0)
panel/PanelTray.cpp (+0/-1)
To merge this branch: bzr merge lp:~brandontschaefer/unity/ftbfs-gtk3-fix-panel-tray
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Stephen M. Webb (community) Approve
Marco Trevisan (Treviño) Approve
Review via email: mp+246027@code.launchpad.net

Commit message

Remove deprecated code that is no longer supported:
https://mail.gnome.org/archives/commits-list/2014-July/msg00351.html

Description of the change

Fixes FTBFS, though theres still one more file that needs changing.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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

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

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

+1

review: Approve
Revision history for this message
Stephen M. Webb (bregma) wrote :

Appears to fix the build. I don't like leaving the FIXME in the code but the FTBFS is critical, we can open another bug to track a long-term fix for realz.

review: Approve
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

Nicer :)

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

FAILED: Continuous integration, rev:3901
http://jenkins.qa.ubuntu.com/job/unity-ci/1134/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-amd64-ci/21
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-armhf-ci/21
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-vivid-i386-ci/21/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1134/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 'decorations/DecorationsForceQuitDialog.cpp'
2--- decorations/DecorationsForceQuitDialog.cpp 2014-10-01 14:09:36 +0000
3+++ decorations/DecorationsForceQuitDialog.cpp 2015-01-12 18:31:29 +0000
4@@ -338,10 +338,13 @@
5 kill_data, [] (gpointer data, GClosure*) { g_free(data); },
6 static_cast<GConnectFlags>(0));
7
8+ // FIXME Look at moving to non deprecated functions
9+ G_GNUC_BEGIN_IGNORE_DEPRECATIONS
10 auto* buttons_aligment = gtk_alignment_new(1, 1, 0, 0);
11 gtk_alignment_set_padding(GTK_ALIGNMENT(buttons_aligment), 20, 0, 0, 0);
12 gtk_container_add(GTK_CONTAINER(buttons_aligment), buttons_box);
13 gtk_container_add(GTK_CONTAINER(content_box), buttons_aligment);
14+ G_GNUC_END_IGNORE_DEPRECATIONS
15
16 gtk_container_add(GTK_CONTAINER(self), main_box);
17
18
19=== modified file 'panel/PanelTray.cpp'
20--- panel/PanelTray.cpp 2014-02-18 18:27:30 +0000
21+++ panel/PanelTray.cpp 2015-01-12 18:31:29 +0000
22@@ -45,7 +45,6 @@
23
24 auto gtkwindow = glib::object_cast<GtkWindow>(window_);
25 gtk_window_set_type_hint(gtkwindow, GDK_WINDOW_TYPE_HINT_DOCK);
26- gtk_window_set_has_resize_grip(gtkwindow, FALSE);
27 gtk_window_set_keep_above(gtkwindow, TRUE);
28 gtk_window_set_skip_pager_hint(gtkwindow, TRUE);
29 gtk_window_set_skip_taskbar_hint(gtkwindow, TRUE);