aboutsummaryrefslogtreecommitdiff
path: root/test/indicator-messages-service-activate.c
diff options
context:
space:
mode:
authorPete Woods <pete.woods@canonical.com>2013-08-21 16:04:53 +0000
committerTarmac <Unknown>2013-08-21 16:04:53 +0000
commit933deb6d32c36e8bf6db23d5673982cab788337a (patch)
treebe808298ec80ca3dc6d73309ac9e1e7024ee7950 /test/indicator-messages-service-activate.c
parent94fef3bf0ca765544ef93f4a6cd38684b3ccf02e (diff)
parent046f655a8859e2e3eaa6015fc2ecd226c8b46b1f (diff)
downloadayatana-indicator-messages-933deb6d32c36e8bf6db23d5673982cab788337a.tar.gz
ayatana-indicator-messages-933deb6d32c36e8bf6db23d5673982cab788337a.tar.bz2
ayatana-indicator-messages-933deb6d32c36e8bf6db23d5673982cab788337a.zip
Re-merge the consolidate branch, but with additional bugfix.
Approved by Sebastien Bacher, PS Jenkins bot.
Diffstat (limited to 'test/indicator-messages-service-activate.c')
-rw-r--r--test/indicator-messages-service-activate.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/test/indicator-messages-service-activate.c b/test/indicator-messages-service-activate.c
index b0ec9b7..f5a26b0 100644
--- a/test/indicator-messages-service-activate.c
+++ b/test/indicator-messages-service-activate.c
@@ -28,6 +28,10 @@ with this program. If not, see <http://www.gnu.org/licenses/>.
int
main (int argc, char ** argv)
{
+#if G_ENCODE_VERSION(GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION) <= GLIB_VERSION_2_34
+ g_type_init();
+#endif
+
guint returnval = 0;
GError * error = NULL;