aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am6
-rw-r--r--src/empathy-logs.c16
-rw-r--r--src/empathy.c23
3 files changed, 9 insertions, 36 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 4112f65e4..d9c2b2aa4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,11 +1,5 @@
AM_CPPFLAGS = \
-I$(top_srcdir) \
- -DPREFIX="\"$(prefix)"\" \
- -DSYSCONFDIR=\""$(sysconfdir)"\" \
- -DDATADIR=\""$(datadir)"\" \
- -DPKGDATADIR=\""$(pkgdatadir)"\" \
- -DLIBDIR=\""$(libdir)"\" \
- -DLOCALEDIR=\""$(datadir)/locale"\" \
$(EMPATHY_CFLAGS) \
$(WARN_CFLAGS)
diff --git a/src/empathy-logs.c b/src/empathy-logs.c
index f49207ebf..f805f9094 100644
--- a/src/empathy-logs.c
+++ b/src/empathy-logs.c
@@ -21,15 +21,13 @@
*/
#include <config.h>
-
-#include <string.h>
#include <stdlib.h>
-
#include <glib.h>
#include <gtk/gtk.h>
#include <libempathy/empathy-debug.h>
#include <libempathy-gtk/empathy-log-window.h>
+#include <libempathy-gtk/empathy-ui-utils.h>
static void
destroy_cb (GtkWidget *dialog,
@@ -43,16 +41,10 @@ main (int argc, char *argv[])
{
GtkWidget *window;
- gtk_init (&argc, &argv);
-
- if (g_getenv ("EMPATHY_TIMING") != NULL) {
- g_log_set_default_handler (tp_debug_timestamped_log_handler, NULL);
- }
- empathy_debug_set_flags (g_getenv ("EMPATHY_DEBUG"));
- tp_debug_divert_messages (g_getenv ("EMPATHY_LOGFILE"));
+ empathy_gtk_init (&argc, &argv);
+ g_set_application_name (PACKAGE_NAME);
+ gtk_window_set_default_icon_name ("empathy");
- gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
- PKGDATADIR G_DIR_SEPARATOR_S "icons");
window = empathy_log_window_show (NULL, NULL, FALSE, NULL);
g_signal_connect (window, "destroy",
diff --git a/src/empathy.c b/src/empathy.c
index dc295be6d..8a0bf5abd 100644
--- a/src/empathy.c
+++ b/src/empathy.c
@@ -44,6 +44,7 @@
#include <libempathy/empathy-tp-group.h>
#include <libempathy-gtk/empathy-conf.h>
+#include <libempathy-gtk/empathy-ui-utils.h>
#include <extensions/extensions.h>
@@ -400,30 +401,16 @@ main (int argc, char *argv[])
{ NULL }
};
- bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
- bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
- textdomain (GETTEXT_PACKAGE);
-
startup_timestamp = get_startup_timestamp ();
- if (!gtk_init_with_args (&argc, &argv,
- _("- Empathy Instant Messenger"),
- options, GETTEXT_PACKAGE, &error)) {
- g_warning ("Error in gtk init: %s", error->message);
+ if (!empathy_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;
}
-
- if (g_getenv ("EMPATHY_TIMING") != NULL) {
- g_log_set_default_handler (tp_debug_timestamped_log_handler, NULL);
- }
- empathy_debug_set_flags (g_getenv ("EMPATHY_DEBUG"));
- tp_debug_divert_messages (g_getenv ("EMPATHY_LOGFILE"));
-
g_set_application_name (PACKAGE_NAME);
-
gtk_window_set_default_icon_name ("empathy");
- gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
- PKGDATADIR G_DIR_SEPARATOR_S "icons");
/* Setting up the bacon connection */
connection = bacon_message_connection_new ("empathy");