aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>2011-02-22 19:24:26 +0800
committerEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>2011-06-09 17:20:05 +0800
commitf72a2717725a4865ebd313f7a496bd0e4f99baca (patch)
tree572188fcea0965afcc1a19685653582ab8eaed43
parent7a9b33315229b4747a1b55741ca0493458181a22 (diff)
downloadgsoc2013-empathy-f72a2717725a4865ebd313f7a496bd0e4f99baca.tar
gsoc2013-empathy-f72a2717725a4865ebd313f7a496bd0e4f99baca.tar.gz
gsoc2013-empathy-f72a2717725a4865ebd313f7a496bd0e4f99baca.tar.bz2
gsoc2013-empathy-f72a2717725a4865ebd313f7a496bd0e4f99baca.tar.lz
gsoc2013-empathy-f72a2717725a4865ebd313f7a496bd0e4f99baca.tar.xz
gsoc2013-empathy-f72a2717725a4865ebd313f7a496bd0e4f99baca.tar.zst
gsoc2013-empathy-f72a2717725a4865ebd313f7a496bd0e4f99baca.zip
Initialize GObject
Conflicts: src/empathy.c
-rw-r--r--src/empathy.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/empathy.c b/src/empathy.c
index fb4590fd8..4300485c9 100644
--- a/src/empathy.c
+++ b/src/empathy.c
@@ -716,8 +716,8 @@ main (int argc, char *argv[])
gtk_clutter_init (&argc, &argv);
#endif
+ g_type_init ();
tpy_cli_init ();
-
empathy_init ();
gtk_init (&argc, &argv);
empathy_gtk_init ();