aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy-gtk
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 /libempathy-gtk
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 'libempathy-gtk')
-rw-r--r--libempathy-gtk/empathy-ui-utils.c39
-rw-r--r--libempathy-gtk/empathy-ui-utils.h9
2 files changed, 4 insertions, 44 deletions
diff --git a/libempathy-gtk/empathy-ui-utils.c b/libempathy-gtk/empathy-ui-utils.c
index 91bbfe58b..b317671d2 100644
--- a/libempathy-gtk/empathy-ui-utils.c
+++ b/libempathy-gtk/empathy-ui-utils.c
@@ -49,52 +49,19 @@
#include <libempathy/empathy-utils.h>
#include <libempathy/empathy-dispatcher.h>
-static gboolean
-init (gboolean abort_if_fail,
- int *argc,
- char ***argv,
- char *parameter_string,
- GOptionEntry *entries,
- char *translation_domain,
- GError **error)
+void
+empathy_gtk_init (void)
{
static gboolean initialized = FALSE;
- gboolean ret = TRUE;
if (initialized)
- return TRUE;
+ return;
empathy_init ();
- if (abort_if_fail) {
- gtk_init (argc, argv);
- } else {
- ret = gtk_init_with_args (argc, argv, parameter_string, entries,
- translation_domain, error);
- }
gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
PKGDATADIR G_DIR_SEPARATOR_S "icons");
initialized = TRUE;
-
- return ret;
-}
-
-void
-empathy_gtk_init (int *argc, char ***argv)
-{
- init (FALSE, argc, argv, NULL, NULL, NULL, NULL);
-}
-
-gboolean
-empathy_gtk_init_with_args (int *argc,
- char ***argv,
- char *parameter_string,
- GOptionEntry *entries,
- char *translation_domain,
- GError **error)
-{
- return init (TRUE, argc, argv, parameter_string, entries,
- translation_domain, error);
}
struct SizeData {
diff --git a/libempathy-gtk/empathy-ui-utils.h b/libempathy-gtk/empathy-ui-utils.h
index 777ce8ee0..1ec4f5da6 100644
--- a/libempathy-gtk/empathy-ui-utils.h
+++ b/libempathy-gtk/empathy-ui-utils.h
@@ -46,14 +46,7 @@ G_BEGIN_DECLS
#define G_STR_EMPTY(x) ((x) == NULL || (x)[0] == '\0')
-void empathy_gtk_init (int *argc,
- char ***argv);
-gboolean empathy_gtk_init_with_args (int *argc,
- char ***argv,
- char *parameter_string,
- GOptionEntry *entries,
- char *translation_domain,
- GError **error);
+void empathy_gtk_init (void);
/* Glade */
void empathy_glade_get_file_simple (const gchar *filename,
const gchar *root,