Unity

Merge lp:~smspillaz/unity/unity.gnome-control-center-integration into lp:unity

  1. unity.gnome-control-center-integration
  2. Merge into trunk
Proposed by Sam Spilsbury
Status: Merged
Approved by: Sam Spilsbury
Approved revision: no longer in the source branch.
Merged at revision: 2609
Proposed branch: lp:~smspillaz/unity/unity.gnome-control-center-integration
Merge into: lp:unity
Diff against target: 82 lines (+25/-3)
5 files modified
CMakeLists.txt (+5/-1)
gnome/50-unity-launchers.xml.in (+6/-0)
gnome/CMakeLists.txt (+12/-0)
po/POTFILES.in (+1/-1)
services/CMakeLists.txt (+1/-1)
To merge this branch: bzr merge lp:~smspillaz/unity/unity.gnome-control-center-integration
Reviewer Review Type Date Requested Status
Timo Jyrinki Approve
Tim Penhey (community) Approve
Review via email: mp+120505@code.launchpad.net

This proposal supersedes a proposal from 2012-08-17.

Commit message

Provides integration into gnome-control-center for unity.

Description of the change

Provides integration into gnome-control-center for unity.

Depends on lp:~compiz-team/compiz/compiz.gnome-control-center-integration

To post a comment you must log in.
Revision history for this message
MC Return (mc-return) wrote : Posted in a previous version of this proposal

Sam, there are conflict markers in po/POTFILES.in, no ?

Revision history for this message
Tim Penhey (thumper) wrote : Posted in a previous version of this proposal

Sam, you have conflicts with trunk

review: Needs Fixing
Revision history for this message
Sam Spilsbury (smspillaz) wrote : Posted in a previous version of this proposal

Um, why is it saying there are conflicts ... I did just resolve them.

I think the diff is wrong.

Revision history for this message
Tim Penhey (thumper) :
review: Approve
Revision history for this message
Unity Merger (unity-merger) wrote :

No commit message specified.

Revision history for this message
Sam Spilsbury (smspillaz) wrote :

*grumble*

Revision history for this message
Unity Merger (unity-merger) wrote :

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/1100/console reported an error when processing this lp:~smspillaz/unity/unity.gnome-control-center-integration branch.
Not merging it.

Revision history for this message
Sam Spilsbury (smspillaz) wrote :

^packaging needs to be updated

Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote :

Packaging updated in lp:ubuntu/unity, and with the last fix together with new compiz the g-c-c's keyboard section doesn't crash anymore.

review: Approve
Revision history for this message
Unity Merger (unity-merger) wrote :

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/1108/console reported an error when processing this lp:~smspillaz/unity/unity.gnome-control-center-integration branch.
Not merging it.

Revision history for this message
Unity Merger (unity-merger) wrote :

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/1112/console reported an error when processing this lp:~smspillaz/unity/unity.gnome-control-center-integration branch.
Not merging it.

Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote :

The merge from lp:~smspillaz/unity/unity.remove_explicit_gconf_dep into lp:unity should indeed be enough for everything to work finally.

review: Approve

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 2012-08-20 15:04:22 +0000
3+++ CMakeLists.txt 2012-08-22 15:29:38 +0000
4@@ -99,6 +99,8 @@
5 #
6 find_package (Gettext REQUIRED)
7
8+set (COMPIZ_I18N_DIR ${CMAKE_SOURCE_DIR}/po)
9+
10 add_custom_command (OUTPUT ${CMAKE_SOURCE_DIR}/po/unity.pot
11 COMMAND xgettext -c --files-from ${CMAKE_SOURCE_DIR}/po/POTFILES.in --keyword=_ -o ${CMAKE_SOURCE_DIR}/po/unity.pot --copyright-holder="Canonical Ltd" --msgid-bugs-address="ayatana-dev@lists.launchpad.net" --no-wrap --no-location
12 WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
13@@ -129,7 +131,7 @@
14 # Compiz Plugins
15 #
16
17-set (UNITY_PLUGIN_DEPS "compiz;nux-3.0>=3.0.0;libbamf3;dee-1.0;gio-2.0;gio-unix-2.0;dbusmenu-glib-0.4;x11;libstartup-notification-1.0;gthread-2.0;indicator3-0.4>=0.4.90;atk;unity-misc>=0.4.0;gtk+-3.0>=3.1;sigc++-2.0;json-glib-1.0;libnotify;xfixes;unity-protocol-private>=5.95.1;libgeis")
18+set (UNITY_PLUGIN_DEPS "compiz;nux-3.0>=3.0.0;libbamf3;dee-1.0;gio-2.0;gio-unix-2.0;dbusmenu-glib-0.4;x11;libstartup-notification-1.0;gthread-2.0;indicator3-0.4>=0.4.90;atk;unity-misc>=0.4.0;dbus-glib-1;gtk+-3.0>=3.1;sigc++-2.0;json-glib-1.0;libnotify;xfixes;unity-protocol-private>=5.95.1;libgeis")
19 # FIXME: unity-protocol-private shouldn't be there, but building of unityshell is just broken
20 set (UNITY_PROTOCOL_PRIVATE_DEPS "unity-protocol-private>=5.95.1")
21
22@@ -175,6 +177,8 @@
23 add_subdirectory(UnityCore)
24 add_subdirectory(guides)
25
26+add_subdirectory(gnome)
27+
28 #
29 # GSettings Schema
30 #
31
32=== added directory 'gnome'
33=== added file 'gnome/50-unity-launchers.xml.in'
34--- gnome/50-unity-launchers.xml.in 1970-01-01 00:00:00 +0000
35+++ gnome/50-unity-launchers.xml.in 2012-08-22 15:29:38 +0000
36@@ -0,0 +1,6 @@
37+<?xml version="1.0" encoding="UTF-8"?>
38+<KeyListEntries schema="org.compiz.integrated" wm_name="Compiz" group="system" _name="Launchers" package="unity">
39+
40+ <KeyListEntry name="show-hud" _description="Key to show the HUD"/>
41+
42+</KeyListEntries>
43
44=== added file 'gnome/CMakeLists.txt'
45--- gnome/CMakeLists.txt 1970-01-01 00:00:00 +0000
46+++ gnome/CMakeLists.txt 2012-08-22 15:29:38 +0000
47@@ -0,0 +1,12 @@
48+find_package (Compiz REQUIRED)
49+
50+include (CompizCommon)
51+
52+compiz_translate_xml (${CMAKE_CURRENT_SOURCE_DIR}/50-unity-launchers.xml.in
53+ ${CMAKE_CURRENT_BINARY_DIR}/50-unity-launchers.xml NOTRANSLATIONS)
54+
55+install (FILES ${CMAKE_CURRENT_BINARY_DIR}/50-unity-launchers.xml
56+ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/gnome-control-center/keybindings)
57+
58+add_custom_target (unity-gnome-keybindings ALL DEPENDS
59+ ${CMAKE_CURRENT_BINARY_DIR}/50-unity-launchers.xml)
60
61=== modified file 'po/POTFILES.in'
62--- po/POTFILES.in 2012-08-20 14:21:31 +0000
63+++ po/POTFILES.in 2012-08-22 15:29:38 +0000
64@@ -33,4 +33,4 @@
65 shortcuts/ShortcutView.cpp
66 unity-shared/DashStyle.cpp
67 unity-shared/SearchBar.cpp
68-
69+gnome/50-unity-launchers.xml.in
70
71=== modified file 'services/CMakeLists.txt'
72--- services/CMakeLists.txt 2012-03-21 12:31:11 +0000
73+++ services/CMakeLists.txt 2012-08-22 15:29:38 +0000
74@@ -2,7 +2,7 @@
75 # Panel Service
76 #
77 find_package(PkgConfig)
78-pkg_check_modules(SERVICE_DEPS REQUIRED gtk+-3.0>=3.3 gobject-2.0 gio-2.0 gthread-2.0 indicator3-0.4>=0.4.90 x11 gconf-2.0)
79+pkg_check_modules(SERVICE_DEPS REQUIRED gtk+-3.0>=3.3 gobject-2.0 gio-2.0 gthread-2.0 indicator3-0.4>=0.4.90 x11)
80
81 execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} indicator3-0.4 --variable indicatordir OUTPUT_VARIABLE _indicatordir OUTPUT_STRIP_TRAILING_WHITESPACE)
82 execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} indicator3-0.4 --variable iconsdir OUTPUT_VARIABLE _iconsdir OUTPUT_STRIP_TRAILING_WHITESPACE)