After an evaluation, GNOME has moved from Bugzilla to GitLab. Learn more about GitLab.
No new issues can be reported in GNOME Bugzilla anymore.
To report an issue in a GNOME project, go to GNOME GitLab.
Do not go to GNOME Gitlab for: Bluefish, Doxygen, GnuCash, GStreamer, java-gnome, LDTP, NetworkManager, Tomboy.
Bug 722234 - Use unity-control-center if running under Unity
Use unity-control-center if running under Unity
Status: RESOLVED FIXED
Product: nautilus
Classification: Core
Component: Preferences
unspecified
Other Linux
: Normal enhancement
: ---
Assigned To: Nautilus Maintainers
Nautilus Maintainers
Depends on:
Blocks:
 
 
Reported: 2014-01-15 02:38 UTC by Robert Ancell
Modified: 2014-01-17 20:29 UTC
See Also:
GNOME target: ---
GNOME version: ---


Attachments
Use unity-control-center if in Unity (1.96 KB, patch)
2014-01-15 02:38 UTC, Robert Ancell
none Details | Review
Use unity-control-center if in Unity (2.25 KB, patch)
2014-01-15 02:56 UTC, Robert Ancell
reviewed Details | Review
Use unity-control-center if in Unity (2.62 KB, patch)
2014-01-17 19:56 UTC, Robert Ancell
committed Details | Review

Description Robert Ancell 2014-01-15 02:38:53 UTC
Created attachment 266320 [details] [review]
Use unity-control-center if in Unity

In Ubuntu 14.04 the system settings will be managed by unity-control-center
instead of gnome-control-center [1]. This is done so the Ubuntu GNOME team can
use newer versions of gnome-control-center without conflicting with Unity.

The attached patch allows nautilus to use the unity-control-center when running
under Unity, please consider it for inclusion.

Thanks!

[1] https://lists.ubuntu.com/archives/ubuntu-desktop/2013-December/004360.html
Comment 1 Robert Ancell 2014-01-15 02:56:36 UTC
Created attachment 266322 [details] [review]
Use unity-control-center if in Unity

Had an uninitialized variable
Comment 2 Cosimo Cecchi 2014-01-15 05:52:49 UTC
Review of attachment 266322 [details] [review]:

::: src/nautilus-desktop-canvas-view.c
@@ +532,3 @@
         g_assert (NAUTILUS_VIEW (data));
 
+	path = g_find_program_in_path ("unity-control-center");

Can you refactor these checks in a separate function, and also use it below? Something like get_control_center_command() that returns NULL if it also doesn't find gnome-control-center in path (you can just return early here if you hit that case, as the action will be hidden anyway).
Comment 3 Robert Ancell 2014-01-17 19:56:09 UTC
Created attachment 266575 [details] [review]
Use unity-control-center if in Unity
Comment 4 Cosimo Cecchi 2014-01-17 20:28:51 UTC
Attachment 266575 [details] pushed as 7e6e4c9 - Use unity-control-center if in Unity

Thanks, I pushed a slightly modified version of this patch to git master.