Unity

Merge lp:~townsend/unity/fix-zeitgeist-build-failure into lp:unity

  1. fix-zeitgeist-build-failure
  2. Merge into trunk
Proposed by Christopher Townsend
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: no longer in the source branch.
Merged at revision: 3627
Proposed branch: lp:~townsend/unity/fix-zeitgeist-build-failure
Merge into: lp:unity
Diff against target: 114 lines (+3/-58)
4 files modified
launcher/TrashLauncherIcon.cpp (+1/-1)
tests/test_application_launcher_icon.cpp (+1/-1)
unity-shared/DesktopApplicationManager.h (+1/-1)
unity-shared/ZeitgeistUtils.h (+0/-55)
To merge this branch: bzr merge lp:~townsend/unity/fix-zeitgeist-build-failure
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Marco Trevisan (Treviño) Approve
Review via email: mp+201791@code.launchpad.net

Commit message

Removed the ZeitgeistUtils.h as this is no longer needed since Zeitgeist in main is now fixed.

Description of the change

Removed the ZeitgeistUtils.h as this is no longer needed since Zeitgeist in main is now fixed.

To post a comment you must log in.
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

Cool, thanks!

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'launcher/TrashLauncherIcon.cpp'
--- launcher/TrashLauncherIcon.cpp 2013-10-18 18:48:25 +0000
+++ launcher/TrashLauncherIcon.cpp 2014-01-15 14:53:40 +0000
@@ -24,11 +24,11 @@
24#include "config.h"24#include "config.h"
25#include <glib/gi18n-lib.h>25#include <glib/gi18n-lib.h>
26#include <NuxCore/Logger.h>26#include <NuxCore/Logger.h>
27#include <zeitgeist.h>
2728
28#include "QuicklistMenuItemLabel.h"29#include "QuicklistMenuItemLabel.h"
29#include "unity-shared/DesktopApplicationManager.h"30#include "unity-shared/DesktopApplicationManager.h"
30#include "unity-shared/GnomeFileManager.h"31#include "unity-shared/GnomeFileManager.h"
31#include "unity-shared/ZeitgeistUtils.h"
3232
33namespace unity33namespace unity
34{34{
3535
=== modified file 'tests/test_application_launcher_icon.cpp'
--- tests/test_application_launcher_icon.cpp 2014-01-10 21:28:27 +0000
+++ tests/test_application_launcher_icon.cpp 2014-01-15 14:53:40 +0000
@@ -21,6 +21,7 @@
2121
22#include <config.h>22#include <config.h>
23#include <gmock/gmock.h>23#include <gmock/gmock.h>
24#include <zeitgeist.h>
2425
25#include <UnityCore/GLibWrapper.h>26#include <UnityCore/GLibWrapper.h>
2627
@@ -28,7 +29,6 @@
28#include "FavoriteStore.h"29#include "FavoriteStore.h"
29#include "UBusWrapper.h"30#include "UBusWrapper.h"
30#include "UBusMessages.h"31#include "UBusMessages.h"
31#include "ZeitgeistUtils.h"
32#include "mock-application.h"32#include "mock-application.h"
33#include "test_utils.h"33#include "test_utils.h"
34#include "test_standalone_wm.h"34#include "test_standalone_wm.h"
3535
=== modified file 'unity-shared/DesktopApplicationManager.h'
--- unity-shared/DesktopApplicationManager.h 2013-09-05 20:24:41 +0000
+++ unity-shared/DesktopApplicationManager.h 2014-01-15 14:53:40 +0000
@@ -20,11 +20,11 @@
20#ifndef UNITYSHARED_DESKTOP_APPLICATION_MANAGER_H20#ifndef UNITYSHARED_DESKTOP_APPLICATION_MANAGER_H
21#define UNITYSHARED_DESKTOP_APPLICATION_MANAGER_H21#define UNITYSHARED_DESKTOP_APPLICATION_MANAGER_H
2222
23#include <zeitgeist.h>
23#include <UnityCore/GLibWrapper.h>24#include <UnityCore/GLibWrapper.h>
24#include <UnityCore/GLibSignal.h>25#include <UnityCore/GLibSignal.h>
2526
26#include "unity-shared/ApplicationManager.h"27#include "unity-shared/ApplicationManager.h"
27#include "unity-shared/ZeitgeistUtils.h"
2828
29namespace unity29namespace unity
30{30{
3131
=== removed file 'unity-shared/ZeitgeistUtils.h'
--- unity-shared/ZeitgeistUtils.h 2013-09-03 16:03:55 +0000
+++ unity-shared/ZeitgeistUtils.h 1970-01-01 00:00:00 +0000
@@ -1,55 +0,0 @@
1// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
2/*
3 * Copyright (C) 2013 Canonical Ltd
4 *
5 * This program is free software: you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License version 3 as
7 * published by the Free Software Foundation.
8 *
9 * This program is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 * GNU General Public License for more details.
13 *
14 * You should have received a copy of the GNU General Public License
15 * along with this program. If not, see <http://www.gnu.org/licenses/>.
16 *
17 * Authored by: Marco Trevisan <marco.trevisan@canonical.com>
18 */
19
20#ifndef UNITY_ZEITGEIST_UTILS
21#define UNITY_ZEITGEIST_UTILS
22
23#include <zeitgeist.h>
24
25/* Unfortunately valac-generated zeitgeist library contains invalid definitions
26 * that makes impossible for us to compile with -Werror -Wall, so we need to
27 * workaround them.
28 * Unfortunately using #pragma doesn't help much here as we can't limit the
29 * errors to the header inclusion only, so it's better to use this way in order
30 * to be able to include zeitgeist in multiple places without ignoring warnings.
31 */
32
33static ZeitgeistEvent* zeitgeist_event_constructv_full(GType object_type, const gchar* interpretation, const gchar* manifestation, const gchar* actor, const gchar* origin, va_list _vala_va_list)
34{
35 return nullptr;
36}
37
38namespace unity
39{
40namespace zeitgeist
41{
42namespace workaround
43{
44namespace
45{
46void ___dummy_function()
47{
48 (void) zeitgeist_event_constructv_full;
49}
50} // anonymous namespace
51} // workaround namespace
52} // zeitgeist namespace
53} // unity namespace
54
55#endif // UNITY_ZEITGEIST_UTILS
56\ No newline at end of file0\ No newline at end of file