diff options
Diffstat (limited to 'libempathy-gtk')
| -rw-r--r-- | libempathy-gtk/empathy-ui-utils.c | 39 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-ui-utils.h | 9 |
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, |