aboutsummaryrefslogtreecommitdiffstats
path: root/src/empathy.c
diff options
context:
space:
mode:
authorXavier Claessens <xclaesse@src.gnome.org>2008-12-12 23:49:38 +0800
committerXavier Claessens <xclaesse@src.gnome.org>2008-12-12 23:49:38 +0800
commitcbedf400e93dd3526607df4aedd3e623a54199d3 (patch)
tree0532271104d323cb02d8e069db9c612854f4342e /src/empathy.c
parentf3b9e7312962dae85b0476d7232db8a213bef856 (diff)
downloadgsoc2013-empathy-cbedf400e93dd3526607df4aedd3e623a54199d3.tar
gsoc2013-empathy-cbedf400e93dd3526607df4aedd3e623a54199d3.tar.gz
gsoc2013-empathy-cbedf400e93dd3526607df4aedd3e623a54199d3.tar.bz2
gsoc2013-empathy-cbedf400e93dd3526607df4aedd3e623a54199d3.tar.lz
gsoc2013-empathy-cbedf400e93dd3526607df4aedd3e623a54199d3.tar.xz
gsoc2013-empathy-cbedf400e93dd3526607df4aedd3e623a54199d3.tar.zst
gsoc2013-empathy-cbedf400e93dd3526607df4aedd3e623a54199d3.zip
gtk_init and g_thread_init shouldn't be called by libraries. Let applications do it.
svn path=/trunk/; revision=1971
Diffstat (limited to 'src/empathy.c')
-rw-r--r--src/empathy.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/empathy.c b/src/empathy.c
index 1e506ba6e..815b2b487 100644
--- a/src/empathy.c
+++ b/src/empathy.c
@@ -401,19 +401,21 @@ main (int argc, char *argv[])
{ NULL }
};
- startup_timestamp = get_startup_timestamp ();
-
- if (!empathy_gtk_init_with_args (&argc, &argv,
- _("- Empathy Instant Messenger"),
- options, GETTEXT_PACKAGE, &error)) {
+ /* Init */
+ g_thread_init (NULL);
+ if (!gtk_init_with_args (&argc, &argv,
+ _("- Empathy Instant Messenger"),
+ options, GETTEXT_PACKAGE, &error)) {
g_warning ("Error in empathy init: %s", error->message);
return EXIT_FAILURE;
}
+ empathy_gtk_init ();
g_set_application_name (PACKAGE_NAME);
gtk_window_set_default_icon_name ("empathy");
textdomain (GETTEXT_PACKAGE);
/* Setting up the bacon connection */
+ startup_timestamp = get_startup_timestamp ();
connection = bacon_message_connection_new ("empathy");
if (connection != NULL) {
if (!bacon_message_connection_get_is_server (connection)) {