← Back to branch summary

~abreu-alexandre/libunity-webapps/bump-2.4.4-fix-distcheck

~abreu-alexandre/libunity-webapps/bump-2.4.4-fix-distcheck

« back to all changes in this revision

Viewing changes to tools/service-tracker.c

Committer: Robert Carr
Date: 2012-02-04 06:17:39 UTC
mfrom: (503.1.2 build-system-fixes)
Revision ID: racarr@canonical.com-20120204061739-9ws9mbfc1n78f1kw

Merge lp:~robertcarr/libunity-webapps/build-system-fixes

files added:
src/libunity-webapps

src/libunity-webapps/Makefile.am

src/libunity-webapps/libunity_webapps-0.2.pc.in

src/libunity-webapps/unity-webapps-context-private.h

src/libunity-webapps/unity-webapps-context.c

src/libunity-webapps/unity-webapps-context.h

src/libunity-webapps/unity-webapps-dbus-defs.h

src/libunity-webapps/unity-webapps-debug.c

src/libunity-webapps/unity-webapps-indicator-context.c

src/libunity-webapps/unity-webapps-indicator-context.h

src/libunity-webapps/unity-webapps-launcher-context.c

src/libunity-webapps/unity-webapps-launcher-context.h

src/libunity-webapps/unity-webapps-music-player-context.c

src/libunity-webapps/unity-webapps-music-player-context.h

src/libunity-webapps/unity-webapps-notification-context.c

src/libunity-webapps/unity-webapps-notification-context.h

src/libunity-webapps/unity-webapps-permissions.c

src/libunity-webapps/unity-webapps-permissions.h

src/libunity-webapps/unity-webapps-rate.c

src/libunity-webapps/unity-webapps-rate.h

src/libunity-webapps/unity-webapps-sanitizer.c

src/libunity-webapps/unity-webapps-sanitizer.h

src/libunity-webapps/unity-webapps-service.c

src/libunity-webapps/unity-webapps-service.h

files removed:
src/libunity_webapps-0.2.pc.in

src/unity-webapps-context-private.h

src/unity-webapps-context.c

src/unity-webapps-context.h

src/unity-webapps-dbus-defs.h

src/unity-webapps-debug.c

src/unity-webapps-indicator-context.c

src/unity-webapps-indicator-context.h

src/unity-webapps-launcher-context.c

src/unity-webapps-launcher-context.h

src/unity-webapps-music-player-context.c

src/unity-webapps-music-player-context.h

src/unity-webapps-notification-context.c

src/unity-webapps-notification-context.h

src/unity-webapps-permissions.c

src/unity-webapps-permissions.h

src/unity-webapps-rate.c

src/unity-webapps-rate.h

src/unity-webapps-sanitizer.c

src/unity-webapps-sanitizer.h

src/unity-webapps-service.c

src/unity-webapps-service.h

files modified:
configure.ac

src/Makefile.am

src/context-daemon/Makefile.am

src/context-daemon/unity-webapps-context-daemon.c

src/context-daemon/unity-webapps-indicator-context.c

src/context-daemon/unity-webapps-launcher-context.c

src/context-daemon/unity-webapps-music-player-context.c

src/context-daemon/unity-webapps-notification-context.c

src/runner/Makefile.am

src/runner/unity-webapps-runner.c

src/webapps-service/Makefile.am

src/webapps-service/unity-webapps-service.c

tests/traced/actions/Makefile.am

tests/traced/actions/hierarchy.c

tests/traced/actions/simple-actions.c

tests/traced/common/uwa-test-client.c

tests/traced/fuzz/Makefile.am

tests/traced/fuzz/thousand-indicators.c

tests/traced/indicator/Makefile.am

tests/traced/indicator/actions-callback.c

tests/traced/indicator/add-actions.c

tests/traced/indicator/data-uri.c

tests/traced/indicator/indicator-callback.c

tests/traced/indicator/indicator-clear.c

tests/traced/indicator/interactive-presence-changed.c

tests/traced/indicator/multiple-servers.c

tests/traced/indicator/presence.c

tests/traced/indicator/raise-callback.c

tests/traced/indicator/set-property-icon-invalid.c

tests/traced/indicator/set-property-icon.c

tests/traced/indicator/set-property-time.c

tests/traced/indicator/set-property.c

tests/traced/indicator/simple-show.c

tests/traced/indicator/themed-icon.c

tests/traced/indicator/unicode.c

tests/traced/launcher/Makefile.am

tests/traced/launcher/add-actions.c

tests/traced/launcher/clear-count.c

tests/traced/launcher/clear-progress.c

tests/traced/launcher/interactive-action-callbacks.c

tests/traced/launcher/set-count.c

tests/traced/launcher/set-progress.c

tests/traced/launcher/set-urgent.c

tests/traced/misc/Makefile.am

tests/traced/misc/add-icon.c

tests/traced/misc/context-properties.c

tests/traced/misc/create-2-same.c

tests/traced/misc/create-2.c

tests/traced/misc/invalid-data-url.c

tests/traced/misc/invalid-icon-url.c

tests/traced/misc/oversized-icon.c

tests/traced/misc/simple-create.c

tests/traced/multicontext/Makefile.am

tests/traced/multicontext/raise-most-recent.c

tests/traced/music-player/Makefile.am

tests/traced/music-player/callbacks.c

tests/traced/music-player/data-uri.c

tests/traced/music-player/properties.c

tests/traced/music-player/set-track.c

tests/traced/notification/Makefile.am

tests/traced/notification/data-uri.c

tests/traced/notification/invalid-data-uri.c

tests/traced/notification/invalid-image.c

tests/traced/notification/simple-show.c

tests/traced/notification/theme-icon.c

tests/traced/notification/url-image.c

tests/traced/test-runner/post-actions/Makefile.am

tools/Makefile.am

tools/action-invoker.c

tools/context-tracker.c

tools/service-tracker.c

Show diffs side-by-side

added added

removed removed

tools/service-tracker.c

24

24

25

25

#include <gtk/gtk.h>

26

26

27

#include "../src/unity-webapps-service.h"

28

#include "../src/unity-webapps-context.h"

27

#include "unity-webapps-service.h"

28

#include "unity-webapps-context.h"

29

29

30

30

static UnityWebappsService *service = NULL;

31

31

static GMainLoop *mainloop = NULL;

Older »