libindicator

Merge lp://qastaging/~ted/libindicator/more-licenses into lp://qastaging/libindicator/0.4

  1. more-licenses
  2. Merge into trunk
Proposed by Ted Gould
Status: Merged
Merged at revision: not available
Proposed branch: lp://qastaging/~ted/libindicator/more-licenses
Merge into: lp://qastaging/libindicator/0.4
Diff against target: 60 lines (+45/-0)
2 files modified
libindicator/dbus-shared.h (+22/-0)
tools/indicator-loader.c (+23/-0)
To merge this branch: bzr merge lp://qastaging/~ted/libindicator/more-licenses
Reviewer Review Type Date Requested Status
Cody Russell (community) Approve
Review via email: mp+15961@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
Cody Russell (bratsche) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libindicator/dbus-shared.h'
2--- libindicator/dbus-shared.h 2009-10-30 20:58:57 +0000
3+++ libindicator/dbus-shared.h 2009-12-10 16:36:16 +0000
4@@ -1,3 +1,25 @@
5+/*
6+Shared defines for DBus interfaces and API versions to
7+make sure the server and client agree.
8+
9+Copyright 2009 Canonical Ltd.
10+
11+Authors:
12+ Ted Gould <ted@canonical.com>
13+
14+This library is free software; you can redistribute it and/or
15+modify it under the terms of the GNU General Public License
16+version 3.0 as published by the Free Software Foundation.
17+
18+This library is distributed in the hope that it will be useful,
19+but WITHOUT ANY WARRANTY; without even the implied warranty of
20+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
21+GNU General Public License version 3.0 for more details.
22+
23+You should have received a copy of the GNU General Public
24+License along with this library. If not, see
25+<http://www.gnu.org/licenses/>.
26+*/
27
28 #define INDICATOR_SERVICE_INTERFACE "org.ayatana.indicator.service"
29 #define INDICATOR_SERVICE_OBJECT "/org/ayatana/indicator/service"
30
31=== modified file 'tools/indicator-loader.c'
32--- tools/indicator-loader.c 2009-11-24 20:50:53 +0000
33+++ tools/indicator-loader.c 2009-12-10 16:36:16 +0000
34@@ -1,3 +1,26 @@
35+/*
36+A small test loader for loading indicators in test suites
37+and during development of them.
38+
39+Copyright 2009 Canonical Ltd.
40+
41+Authors:
42+ Ted Gould <ted@canonical.com>
43+
44+This library is free software; you can redistribute it and/or
45+modify it under the terms of the GNU General Public License
46+version 3.0 as published by the Free Software Foundation.
47+
48+This library is distributed in the hope that it will be useful,
49+but WITHOUT ANY WARRANTY; without even the implied warranty of
50+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
51+GNU General Public License version 3.0 for more details.
52+
53+You should have received a copy of the GNU General Public
54+License along with this library. If not, see
55+<http://www.gnu.org/licenses/>.
56+*/
57+
58
59 #include <gtk/gtk.h>
60 #include <libindicator/indicator-object.h>

Subscribers

People subscribed via source and target branches