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

[Christopher Townsend]

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

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

[Marco Trevisan (Treviño) (3v1n0)]

Cool, thanks!

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== 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 @@
 #include "config.h"
 #include <glib/gi18n-lib.h>
 #include <NuxCore/Logger.h>
+#include <zeitgeist.h>
 
 #include "QuicklistMenuItemLabel.h"
 #include "unity-shared/DesktopApplicationManager.h"
 #include "unity-shared/GnomeFileManager.h"
-#include "unity-shared/ZeitgeistUtils.h"
 
 namespace unity
 {

=== 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 @@
 
 #include <config.h>
 #include <gmock/gmock.h>
+#include <zeitgeist.h>
 
 #include <UnityCore/GLibWrapper.h>
 
@@ -28,7 +29,6 @@
 #include "FavoriteStore.h"
 #include "UBusWrapper.h"
 #include "UBusMessages.h"
-#include "ZeitgeistUtils.h"
 #include "mock-application.h"
 #include "test_utils.h"
 #include "test_standalone_wm.h"

=== 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 @@
 #ifndef UNITYSHARED_DESKTOP_APPLICATION_MANAGER_H
 #define UNITYSHARED_DESKTOP_APPLICATION_MANAGER_H
 
+#include <zeitgeist.h>
 #include <UnityCore/GLibWrapper.h>
 #include <UnityCore/GLibSignal.h>
 
 #include "unity-shared/ApplicationManager.h"
-#include "unity-shared/ZeitgeistUtils.h"
 
 namespace unity
 {

=== 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 @@
-// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
-/*
- * Copyright (C) 2013 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * 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, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Marco Trevisan <[e-mail]>
- */
-
-#ifndef UNITY_ZEITGEIST_UTILS
-#define UNITY_ZEITGEIST_UTILS
-
-#include <zeitgeist.h>
-
-/* Unfortunately valac-generated zeitgeist library contains invalid definitions
- * that makes impossible for us to compile with -Werror -Wall, so we need to
- * workaround them.
- * Unfortunately using #pragma doesn't help much here as we can't limit the
- * errors to the header inclusion only, so it's better to use this way in order
- * to be able to include zeitgeist in multiple places without ignoring warnings.
- */
-
-static 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)
-{
-  return nullptr;
-}
-
-namespace unity
-{
-namespace zeitgeist
-{
-namespace workaround
-{
-namespace
-{
-void ___dummy_function()
-{
-  (void) zeitgeist_event_constructv_full;
-}
-} // anonymous namespace
-} // workaround namespace
-} // zeitgeist namespace
-} // unity namespace
-
-#endif // UNITY_ZEITGEIST_UTILS
\ No newline at end of file