aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac8
-rw-r--r--libindicator/Makefile.am21
-rw-r--r--libindicator/indicator-0.4.pc.in.in (renamed from libindicator/indicator.pc.in)4
-rw-r--r--libindicator/indicator-object.c5
-rw-r--r--libindicator/indicator-object.h6
-rw-r--r--libindicator/indicator3-0.4.pc.in.in (renamed from libindicator/indicator3.pc.in)4
-rw-r--r--tests/Makefile.am7
-rw-r--r--tests/dummy-indicator-blank.c22
-rw-r--r--tests/dummy-indicator-null.c22
-rw-r--r--tests/dummy-indicator-signaler.c22
-rw-r--r--tests/dummy-indicator-simple.c22
-rw-r--r--tests/service-manager-connect-service.c22
-rw-r--r--tests/service-manager-connect.c22
-rw-r--r--tests/service-manager-no-connect.c22
-rw-r--r--tests/service-manager-nostart-connect.c22
-rw-r--r--tests/service-shutdown-timeout.c22
-rw-r--r--tests/service-version-bad-service.c22
-rw-r--r--tests/service-version-good-service.c22
-rw-r--r--tests/service-version-manager.c22
-rw-r--r--tests/service-version-multiwatch-manager-impolite.c22
-rw-r--r--tests/service-version-multiwatch-manager.c22
-rw-r--r--tests/service-version-multiwatch-service.c22
-rw-r--r--tests/service-version-values.h22
-rw-r--r--tests/test-desktop-shortcuts.c22
-rw-r--r--tests/test-loader.c22
-rw-r--r--tools/indicator-loader.c4
26 files changed, 442 insertions, 13 deletions
diff --git a/configure.ac b/configure.ac
index c35802e..1188b04 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_INIT([libindicator],
- [0.3.22],
+ [0.3.90],
[http://bugs.launchpad.net/libindicator],
[libindicator],
[http://launchpad.net/libindicator])
@@ -49,7 +49,7 @@ AC_ARG_WITH([gtk],
[AS_HELP_STRING([--with-gtk],
[Which version of gtk to use @<:@default=2@:>@])],
[],
- [with_gtk=2])
+ [with_gtk=3])
AS_IF([test "x$with_gtk" = x3],
[PKG_CHECK_MODULES(LIBINDICATOR, gtk+-3.0 >= $GTK3_REQUIRED_VERSION
gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION)
@@ -125,8 +125,8 @@ AM_CONDITIONAL(ENABLE_DEBUG, test "$enable_debug" = "yes")
AC_CONFIG_FILES([
Makefile
libindicator/Makefile
-libindicator/indicator.pc
-libindicator/indicator3.pc
+libindicator/indicator-0.4.pc.in
+libindicator/indicator3-0.4.pc.in
tests/Makefile
tools/Makefile
])
diff --git a/libindicator/Makefile.am b/libindicator/Makefile.am
index d63f841..4433655 100644
--- a/libindicator/Makefile.am
+++ b/libindicator/Makefile.am
@@ -10,12 +10,23 @@ BUILT_SOURCES = indicator-object-enum-types.h indicator-object-enum-types.c
CLEANFILES =
DISTCLEANFILES =
EXTRA_DIST = \
- indicator3.pc.in \
- indicator.pc.in
+ indicator3-0.$(INDICATOR_API_VERSION).pc.in.in \
+ indicator-0.$(INDICATOR_API_VERSION).pc.in.in
+
+INDICATOR_ABI_VERSION = 6
+INDICATOR_API_VERSION = 4
+
+%.pc: %.pc.in
+ sed \
+ -e "s|\@indicator_api_version\@|$(INDICATOR_API_VERSION)|" \
+ -e "s|\@indicator_abi_version\@|$(INDICATOR_ABI_VERSION)|" \
+ $< > $@
+
+CLEANFILES = indicator$(VER)-0.$(INDICATOR_API_VERSION).pc
include $(top_srcdir)/Makefile.am.marshal
-libindicatorincludedir=$(includedir)/libindicator$(VER)-0.3/libindicator
+libindicatorincludedir=$(includedir)/libindicator$(VER)-0.$(INDICATOR_API_VERSION)/libindicator
indicator_headers = \
indicator.h \
@@ -51,7 +62,7 @@ libindicator_la_LIBADD = \
$(LIBINDICATOR_LIBS)
libindicator_la_LDFLAGS = \
- -version-info 3:0:0 \
+ -version-info $(INDICATOR_ABI_VERSION):0:0 \
-no-undefined \
-export-symbols-regex "^[^_].*"
@@ -66,7 +77,7 @@ libindicator3_la_CFLAGS = $(libindicator_la_CFLAGS)
libindicator3_la_LIBADD = $(libindicator_la_LIBADD)
libindicator3_la_LDFLAGS = $(libindicator_la_LDFLAGS)
-pkgconfig_DATA = indicator$(VER).pc
+pkgconfig_DATA = indicator$(VER)-0.$(INDICATOR_API_VERSION).pc
pkgconfigdir = $(libdir)/pkgconfig
glib_marshal_list = indicator-object-marshal.list
diff --git a/libindicator/indicator.pc.in b/libindicator/indicator-0.4.pc.in.in
index 4e9b177..df4d6c8 100644
--- a/libindicator/indicator.pc.in
+++ b/libindicator/indicator-0.4.pc.in.in
@@ -4,10 +4,10 @@ libdir=@libdir@
bindir=@bindir@
includedir=@includedir@
-indicatordir=${libdir}/indicators/5/
+indicatordir=${libdir}/indicators/@indicator_abi_version@
iconsdir=@datarootdir@/@PACKAGE@/icons/
-Cflags: -I${includedir}/libindicator-0.3
+Cflags: -I${includedir}/libindicator-0.@indicator_api_version@
Requires: gtk+-2.0
Libs: -lindicator
diff --git a/libindicator/indicator-object.c b/libindicator/indicator-object.c
index a91251c..2fe8dd1 100644
--- a/libindicator/indicator-object.c
+++ b/libindicator/indicator-object.c
@@ -240,6 +240,7 @@ indicator_object_init (IndicatorObject *self)
self->priv->entry.label = NULL;
self->priv->entry.image = NULL;
self->priv->entry.accessible_desc = NULL;
+ self->priv->entry.name_hint = NULL;
self->priv->gotten_entries = FALSE;
@@ -435,6 +436,10 @@ get_entries_default (IndicatorObject * io)
g_warning("IndicatorObject class does not have an accessible description.");
}
+ if (class->get_name_hint) {
+ priv->entry.name_hint = class->get_name_hint(io);
+ }
+
priv->gotten_entries = TRUE;
}
diff --git a/libindicator/indicator-object.h b/libindicator/indicator-object.h
index 5faeff5..a285949 100644
--- a/libindicator/indicator-object.h
+++ b/libindicator/indicator-object.h
@@ -77,6 +77,8 @@ typedef struct _IndicatorObjectEntry IndicatorObjectEntry;
object.
@get_accessible_desc: Gets the accessible descriptionfor this
object.
+ @get_name_hint: Gets the hint of the type of indicator that this
+ is for the caller.
@get_entries: Gets all of the entires for this object returning
a #GList of #IndicatorObjectEntries. The list should be
under the ownership of the caller but the entires will
@@ -106,6 +108,7 @@ struct _IndicatorObjectClass {
GtkImage * (*get_image) (IndicatorObject * io);
GtkMenu * (*get_menu) (IndicatorObject * io);
const gchar * (*get_accessible_desc) (IndicatorObject * io);
+ const gchar * (*get_name_hint) (IndicatorObject * io);
GList * (*get_entries) (IndicatorObject * io);
guint (*get_location) (IndicatorObject * io, IndicatorObjectEntry * entry);
@@ -150,6 +153,8 @@ struct _IndicatorObject {
@menu: The menu to be added to the menubar
@accessible_desc: The accessible description
of the indicator
+ @name_hint: A name to describe the indicator being placed to allow
+ the caller to be more aware of the individual entries.
@reserved1: Reserved for future use
@reserved2: Reserved for future use
@@ -161,6 +166,7 @@ struct _IndicatorObjectEntry {
GtkImage * image;
GtkMenu * menu;
const gchar * accessible_desc;
+ const gchar * name_hint;
void (*reserved1) (void);
void (*reserved2) (void);
diff --git a/libindicator/indicator3.pc.in b/libindicator/indicator3-0.4.pc.in.in
index 9fa0eac..1f34567 100644
--- a/libindicator/indicator3.pc.in
+++ b/libindicator/indicator3-0.4.pc.in.in
@@ -4,10 +4,10 @@ libdir=@libdir@
bindir=@bindir@
includedir=@includedir@
-indicatordir=${libdir}/indicators3/2/
+indicatordir=${libdir}/indicators3/@indicator_abi_version@/
iconsdir=@datarootdir@/@PACKAGE@/icons/
-Cflags: -I${includedir}/libindicator-0.3
+Cflags: -I${includedir}/libindicator-0.@indicator_api_version@
Requires: gtk+-3.0
Libs: -lindicator3
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 569055c..e78ac6b 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -6,6 +6,7 @@ endif
TESTS =
DISTCLEANFILES =
+XFAIL_TESTS =
check_PROGRAMS =
@@ -257,6 +258,8 @@ service-manager-connect-tester: service-manager-connect service-manager-connect-
TESTS += service-manager-connect-tester
DISTCLEANFILES += service-manager-connect-tester session.conf service-manager-connect.service
+# Bug 806690
+XFAIL_TESTS += service-manager-connect-tester
#############################
# Service Versions
@@ -320,6 +323,8 @@ service-version-tester: service-version-manager service-version-bad-service serv
TESTS += service-version-tester
DISTCLEANFILES += service-version-tester service-version-bad.service service-version-good.service
+# Bug 806691
+XFAIL_TESTS += service-version-tester
#############################
# Service Versions
@@ -377,6 +382,8 @@ service-version-multiwatch-tester: service-version-multiwatch-manager service-ve
TESTS += service-version-multiwatch-tester
DISTCLEANFILES += service-version-multiwatch-tester
+# Bug 806692
+XFAIL_TESTS += service-version-multiwatch-tester
#############################
# Service Manager Shutdown
diff --git a/tests/dummy-indicator-blank.c b/tests/dummy-indicator-blank.c
index 5cfe0f0..874284b 100644
--- a/tests/dummy-indicator-blank.c
+++ b/tests/dummy-indicator-blank.c
@@ -1,3 +1,25 @@
+/*
+Test for libindicator
+
+Copyright 2009 Canonical Ltd.
+
+Authors:
+ Ted Gould <ted@canonical.com>
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+version 3.0 as published by the Free Software Foundation.
+
+This library 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 version 3.0 for more details.
+
+You should have received a copy of the GNU General Public
+License along with this library. If not, see
+<http://www.gnu.org/licenses/>.
+*/
+
#include "libindicator/indicator.h"
diff --git a/tests/dummy-indicator-null.c b/tests/dummy-indicator-null.c
index 169196c..8aec668 100644
--- a/tests/dummy-indicator-null.c
+++ b/tests/dummy-indicator-null.c
@@ -1,3 +1,25 @@
+/*
+Test for libindicator
+
+Copyright 2009 Canonical Ltd.
+
+Authors:
+ Ted Gould <ted@canonical.com>
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+version 3.0 as published by the Free Software Foundation.
+
+This library 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 version 3.0 for more details.
+
+You should have received a copy of the GNU General Public
+License along with this library. If not, see
+<http://www.gnu.org/licenses/>.
+*/
+
#include <glib.h>
#include <glib-object.h>
diff --git a/tests/dummy-indicator-signaler.c b/tests/dummy-indicator-signaler.c
index dcb2560..00eee3b 100644
--- a/tests/dummy-indicator-signaler.c
+++ b/tests/dummy-indicator-signaler.c
@@ -1,3 +1,25 @@
+/*
+Test for libindicator
+
+Copyright 2009 Canonical Ltd.
+
+Authors:
+ Ted Gould <ted@canonical.com>
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+version 3.0 as published by the Free Software Foundation.
+
+This library 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 version 3.0 for more details.
+
+You should have received a copy of the GNU General Public
+License along with this library. If not, see
+<http://www.gnu.org/licenses/>.
+*/
+
#include <glib.h>
#include <glib-object.h>
diff --git a/tests/dummy-indicator-simple.c b/tests/dummy-indicator-simple.c
index 70937ba..1aab711 100644
--- a/tests/dummy-indicator-simple.c
+++ b/tests/dummy-indicator-simple.c
@@ -1,3 +1,25 @@
+/*
+Test for libindicator
+
+Copyright 2009 Canonical Ltd.
+
+Authors:
+ Ted Gould <ted@canonical.com>
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+version 3.0 as published by the Free Software Foundation.
+
+This library 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 version 3.0 for more details.
+
+You should have received a copy of the GNU General Public
+License along with this library. If not, see
+<http://www.gnu.org/licenses/>.
+*/
+
#include <glib.h>
#include <glib-object.h>
diff --git a/tests/service-manager-connect-service.c b/tests/service-manager-connect-service.c
index d60e414..7f57f96 100644
--- a/tests/service-manager-connect-service.c
+++ b/tests/service-manager-connect-service.c
@@ -1,3 +1,25 @@
+/*
+Test for libindicator
+
+Copyright 2009 Canonical Ltd.
+
+Authors:
+ Ted Gould <ted@canonical.com>
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+version 3.0 as published by the Free Software Foundation.
+
+This library 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 version 3.0 for more details.
+
+You should have received a copy of the GNU General Public
+License along with this library. If not, see
+<http://www.gnu.org/licenses/>.
+*/
+
#include <glib.h>
#include "libindicator/indicator-service.h"
diff --git a/tests/service-manager-connect.c b/tests/service-manager-connect.c
index 91d2bad..5e7684f 100644
--- a/tests/service-manager-connect.c
+++ b/tests/service-manager-connect.c
@@ -1,3 +1,25 @@
+/*
+Test for libindicator
+
+Copyright 2009 Canonical Ltd.
+
+Authors:
+ Ted Gould <ted@canonical.com>
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+version 3.0 as published by the Free Software Foundation.
+
+This library 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 version 3.0 for more details.
+
+You should have received a copy of the GNU General Public
+License along with this library. If not, see
+<http://www.gnu.org/licenses/>.
+*/
+
#include <glib.h>
#include "libindicator/indicator-service-manager.h"
diff --git a/tests/service-manager-no-connect.c b/tests/service-manager-no-connect.c
index 1c32eb2..fab0607 100644
--- a/tests/service-manager-no-connect.c
+++ b/tests/service-manager-no-connect.c
@@ -1,3 +1,25 @@
+/*
+Test for libindicator
+
+Copyright 2009 Canonical Ltd.
+
+Authors:
+ Ted Gould <ted@canonical.com>
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+version 3.0 as published by the Free Software Foundation.
+
+This library 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 version 3.0 for more details.
+
+You should have received a copy of the GNU General Public
+License along with this library. If not, see
+<http://www.gnu.org/licenses/>.
+*/
+
#include <glib.h>
#include "libindicator/indicator-service-manager.h"
diff --git a/tests/service-manager-nostart-connect.c b/tests/service-manager-nostart-connect.c
index 7107f42..ce0ac80 100644
--- a/tests/service-manager-nostart-connect.c
+++ b/tests/service-manager-nostart-connect.c
@@ -1,3 +1,25 @@
+/*
+Test for libindicator
+
+Copyright 2009 Canonical Ltd.
+
+Authors:
+ Ted Gould <ted@canonical.com>
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+version 3.0 as published by the Free Software Foundation.
+
+This library 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 version 3.0 for more details.
+
+You should have received a copy of the GNU General Public
+License along with this library. If not, see
+<http://www.gnu.org/licenses/>.
+*/
+
#include <glib.h>
#include "libindicator/indicator-service-manager.h"
diff --git a/tests/service-shutdown-timeout.c b/tests/service-shutdown-timeout.c
index 820441c..e461af0 100644
--- a/tests/service-shutdown-timeout.c
+++ b/tests/service-shutdown-timeout.c
@@ -1,3 +1,25 @@
+/*
+Test for libindicator
+
+Copyright 2009 Canonical Ltd.
+
+Authors:
+ Ted Gould <ted@canonical.com>
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+version 3.0 as published by the Free Software Foundation.
+
+This library 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 version 3.0 for more details.
+
+You should have received a copy of the GNU General Public
+License along with this library. If not, see
+<http://www.gnu.org/licenses/>.
+*/
+
#include <glib.h>
#include "libindicator/indicator-service.h"
diff --git a/tests/service-version-bad-service.c b/tests/service-version-bad-service.c
index 6057e74..12081d1 100644
--- a/tests/service-version-bad-service.c
+++ b/tests/service-version-bad-service.c
@@ -1,3 +1,25 @@
+/*
+Test for libindicator
+
+Copyright 2009 Canonical Ltd.
+
+Authors:
+ Ted Gould <ted@canonical.com>
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+version 3.0 as published by the Free Software Foundation.
+
+This library 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 version 3.0 for more details.
+
+You should have received a copy of the GNU General Public
+License along with this library. If not, see
+<http://www.gnu.org/licenses/>.
+*/
+
#include <glib.h>
#include "libindicator/indicator-service.h"
diff --git a/tests/service-version-good-service.c b/tests/service-version-good-service.c
index 12a6a32..17f987e 100644
--- a/tests/service-version-good-service.c
+++ b/tests/service-version-good-service.c
@@ -1,3 +1,25 @@
+/*
+Test for libindicator
+
+Copyright 2009 Canonical Ltd.
+
+Authors:
+ Ted Gould <ted@canonical.com>
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+version 3.0 as published by the Free Software Foundation.
+
+This library 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 version 3.0 for more details.
+
+You should have received a copy of the GNU General Public
+License along with this library. If not, see
+<http://www.gnu.org/licenses/>.
+*/
+
#include <glib.h>
#include "libindicator/indicator-service.h"
diff --git a/tests/service-version-manager.c b/tests/service-version-manager.c
index aedc0ed..9e582f5 100644
--- a/tests/service-version-manager.c
+++ b/tests/service-version-manager.c
@@ -1,3 +1,25 @@
+/*
+Test for libindicator
+
+Copyright 2009 Canonical Ltd.
+
+Authors:
+ Ted Gould <ted@canonical.com>
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+version 3.0 as published by the Free Software Foundation.
+
+This library 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 version 3.0 for more details.
+
+You should have received a copy of the GNU General Public
+License along with this library. If not, see
+<http://www.gnu.org/licenses/>.
+*/
+
#include <glib.h>
#include "libindicator/indicator-service-manager.h"
diff --git a/tests/service-version-multiwatch-manager-impolite.c b/tests/service-version-multiwatch-manager-impolite.c
index 8bfd3c6..b4cd1c8 100644
--- a/tests/service-version-multiwatch-manager-impolite.c
+++ b/tests/service-version-multiwatch-manager-impolite.c
@@ -1,3 +1,25 @@
+/*
+Test for libindicator
+
+Copyright 2009 Canonical Ltd.
+
+Authors:
+ Ted Gould <ted@canonical.com>
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+version 3.0 as published by the Free Software Foundation.
+
+This library 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 version 3.0 for more details.
+
+You should have received a copy of the GNU General Public
+License along with this library. If not, see
+<http://www.gnu.org/licenses/>.
+*/
+
#include <glib.h>
#include "libindicator/indicator-service-manager.h"
diff --git a/tests/service-version-multiwatch-manager.c b/tests/service-version-multiwatch-manager.c
index 771426f..4db6769 100644
--- a/tests/service-version-multiwatch-manager.c
+++ b/tests/service-version-multiwatch-manager.c
@@ -1,3 +1,25 @@
+/*
+Test for libindicator
+
+Copyright 2009 Canonical Ltd.
+
+Authors:
+ Ted Gould <ted@canonical.com>
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+version 3.0 as published by the Free Software Foundation.
+
+This library 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 version 3.0 for more details.
+
+You should have received a copy of the GNU General Public
+License along with this library. If not, see
+<http://www.gnu.org/licenses/>.
+*/
+
#include <glib.h>
#include "libindicator/indicator-service-manager.h"
diff --git a/tests/service-version-multiwatch-service.c b/tests/service-version-multiwatch-service.c
index 9920306..30b7f00 100644
--- a/tests/service-version-multiwatch-service.c
+++ b/tests/service-version-multiwatch-service.c
@@ -1,3 +1,25 @@
+/*
+Test for libindicator
+
+Copyright 2009 Canonical Ltd.
+
+Authors:
+ Ted Gould <ted@canonical.com>
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+version 3.0 as published by the Free Software Foundation.
+
+This library 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 version 3.0 for more details.
+
+You should have received a copy of the GNU General Public
+License along with this library. If not, see
+<http://www.gnu.org/licenses/>.
+*/
+
#include <glib.h>
#include "libindicator/indicator-service.h"
diff --git a/tests/service-version-values.h b/tests/service-version-values.h
index e9fb087..1a60460 100644
--- a/tests/service-version-values.h
+++ b/tests/service-version-values.h
@@ -1,3 +1,25 @@
+/*
+Test for libindicator
+
+Copyright 2009 Canonical Ltd.
+
+Authors:
+ Ted Gould <ted@canonical.com>
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+version 3.0 as published by the Free Software Foundation.
+
+This library 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 version 3.0 for more details.
+
+You should have received a copy of the GNU General Public
+License along with this library. If not, see
+<http://www.gnu.org/licenses/>.
+*/
+
#define SERVICE_VERSION_GOOD 1342
#define SERVICE_VERSION_BAD 543
diff --git a/tests/test-desktop-shortcuts.c b/tests/test-desktop-shortcuts.c
index 00dccd4..2e121fa 100644
--- a/tests/test-desktop-shortcuts.c
+++ b/tests/test-desktop-shortcuts.c
@@ -1,3 +1,25 @@
+/*
+Test for libindicator
+
+Copyright 2009 Canonical Ltd.
+
+Authors:
+ Ted Gould <ted@canonical.com>
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+version 3.0 as published by the Free Software Foundation.
+
+This library 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 version 3.0 for more details.
+
+You should have received a copy of the GNU General Public
+License along with this library. If not, see
+<http://www.gnu.org/licenses/>.
+*/
+
#include <gtk/gtk.h>
#include "libindicator/indicator-desktop-shortcuts.h"
diff --git a/tests/test-loader.c b/tests/test-loader.c
index f5e05dc..ac9d4e5 100644
--- a/tests/test-loader.c
+++ b/tests/test-loader.c
@@ -1,3 +1,25 @@
+/*
+Test for libindicator
+
+Copyright 2009 Canonical Ltd.
+
+Authors:
+ Ted Gould <ted@canonical.com>
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+version 3.0 as published by the Free Software Foundation.
+
+This library 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 version 3.0 for more details.
+
+You should have received a copy of the GNU General Public
+License along with this library. If not, see
+<http://www.gnu.org/licenses/>.
+*/
+
#include <gtk/gtk.h>
#include "libindicator/indicator-object.h"
diff --git a/tools/indicator-loader.c b/tools/indicator-loader.c
index 03614aa..027d364 100644
--- a/tools/indicator-loader.c
+++ b/tools/indicator-loader.c
@@ -44,7 +44,11 @@ entry_added (IndicatorObject * io, IndicatorObjectEntry * entry, gpointer user_d
g_debug("Signal: Entry Added");
GtkWidget * menuitem = gtk_menu_item_new();
+#if GTK_CHECK_VERSION(3,0,0)
+ GtkWidget * hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3);
+#else
GtkWidget * hbox = gtk_hbox_new(FALSE, 3);
+#endif
if (entry->image != NULL) {
gtk_box_pack_start(GTK_BOX(hbox), GTK_WIDGET(entry->image), FALSE, FALSE, 0);