Skip to content
Snippets Groups Projects
Commit 6a47cebf authored by Ruben Rodriguez's avatar Ruben Rodriguez
Browse files

Merge branch 'indicator-datetime' into 'belenos'

Use unity-control-panel when avaliable

indicator-datetime package uses com.canonical.indicator.datetime gsettings namespace, and that namespace is managed by unity-control-panel, not by gnome-control-panel.

Fixes #12087 #13233 #13379

See merge request !61
parents 8a1c3bea 5ac7ce19
No related branches found
No related tags found
No related merge requests found
#!/bin/sh
#
# Copyright (C) 2015 Santiago Rodríguez <santi@trisquel.info>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
VERSION=1
. ./config
#Use unity-control-center when avaliable,not only when using Unity
sed -i '/XDG_CURRENT_DESKTOP/c\ if \(path != nullptr\)' src/actions-live.cpp
changelog "Revert from using gnome control panel to unity"
compile
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment