diff options
35 files changed, 35 insertions, 35 deletions
diff --git a/libempathy-gtk/empathy-account-chooser.c b/libempathy-gtk/empathy-account-chooser.c index 14e6e2786..bd343f53b 100644 --- a/libempathy-gtk/empathy-account-chooser.c +++ b/libempathy-gtk/empathy-account-chooser.c @@ -26,7 +26,7 @@ #include <string.h> -#include <glib/gi18n.h> +#include <glib/gi18n-lib.h> #include <gtk/gtk.h> #include <glade/glade.h> diff --git a/libempathy-gtk/empathy-account-widget-irc.c b/libempathy-gtk/empathy-account-widget-irc.c index 242085ccc..a5111381c 100644 --- a/libempathy-gtk/empathy-account-widget-irc.c +++ b/libempathy-gtk/empathy-account-widget-irc.c @@ -24,7 +24,7 @@ #include <string.h> #include <sys/stat.h> -#include <glib/gi18n.h> +#include <glib/gi18n-lib.h> #include <gtk/gtk.h> #include <glade/glade.h> diff --git a/libempathy-gtk/empathy-account-widget-sip.c b/libempathy-gtk/empathy-account-widget-sip.c index 28832e0d7..c5224df73 100644 --- a/libempathy-gtk/empathy-account-widget-sip.c +++ b/libempathy-gtk/empathy-account-widget-sip.c @@ -25,7 +25,7 @@ #include <string.h> #include <sys/stat.h> -#include <glib/gi18n.h> +#include <glib/gi18n-lib.h> #include <gtk/gtk.h> #include <glade/glade.h> diff --git a/libempathy-gtk/empathy-account-widget.c b/libempathy-gtk/empathy-account-widget.c index 6fe5e0204..066dac21f 100644 --- a/libempathy-gtk/empathy-account-widget.c +++ b/libempathy-gtk/empathy-account-widget.c @@ -27,7 +27,7 @@ #include <string.h> #include <gtk/gtk.h> -#include <glib/gi18n.h> +#include <glib/gi18n-lib.h> #include <libmissioncontrol/mc-account.h> #include <libmissioncontrol/mc-protocol.h> diff --git a/libempathy-gtk/empathy-avatar-chooser.c b/libempathy-gtk/empathy-avatar-chooser.c index 37abd42de..86df44953 100644 --- a/libempathy-gtk/empathy-avatar-chooser.c +++ b/libempathy-gtk/empathy-avatar-chooser.c @@ -25,7 +25,7 @@ #include <string.h> -#include <glib/gi18n.h> +#include <glib/gi18n-lib.h> #include <gtk/gtk.h> #include <gio/gio.h> diff --git a/libempathy-gtk/empathy-avatar-image.c b/libempathy-gtk/empathy-avatar-image.c index 7dd93aad9..51f30bdd5 100644 --- a/libempathy-gtk/empathy-avatar-image.c +++ b/libempathy-gtk/empathy-avatar-image.c @@ -23,7 +23,7 @@ #include "config.h" -#include <glib/gi18n.h> +#include <glib/gi18n-lib.h> #include <gdk/gdkkeysyms.h> #include <gdk/gdk.h> #include <gtk/gtk.h> diff --git a/libempathy-gtk/empathy-chat-view.c b/libempathy-gtk/empathy-chat-view.c index 367b6308d..5adccaff0 100644 --- a/libempathy-gtk/empathy-chat-view.c +++ b/libempathy-gtk/empathy-chat-view.c @@ -28,7 +28,7 @@ #include <string.h> #include <time.h> -#include <glib/gi18n.h> +#include <glib/gi18n-lib.h> #include <gtk/gtkbutton.h> #include <gtk/gtkimage.h> #include <gtk/gtkmenu.h> diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c index fe289539c..33aef5065 100644 --- a/libempathy-gtk/empathy-chat.c +++ b/libempathy-gtk/empathy-chat.c @@ -31,7 +31,7 @@ #include <stdlib.h> #include <gdk/gdkkeysyms.h> -#include <glib/gi18n.h> +#include <glib/gi18n-lib.h> #include <gtk/gtk.h> #include <libmissioncontrol/mission-control.h> diff --git a/libempathy-gtk/empathy-contact-dialogs.c b/libempathy-gtk/empathy-contact-dialogs.c index 692ca6430..f7b6cb635 100644 --- a/libempathy-gtk/empathy-contact-dialogs.c +++ b/libempathy-gtk/empathy-contact-dialogs.c @@ -26,7 +26,7 @@ #include <gtk/gtk.h> #include <glade/glade.h> -#include <glib/gi18n.h> +#include <glib/gi18n-lib.h> #include <libmissioncontrol/mission-control.h> diff --git a/libempathy-gtk/empathy-contact-list-view.c b/libempathy-gtk/empathy-contact-list-view.c index 868cc9ccb..839a0df36 100644 --- a/libempathy-gtk/empathy-contact-list-view.c +++ b/libempathy-gtk/empathy-contact-list-view.c @@ -27,7 +27,7 @@ #include <string.h> -#include <glib/gi18n.h> +#include <glib/gi18n-lib.h> #include <gdk/gdkkeysyms.h> #include <gtk/gtk.h> #include <glade/glade.h> diff --git a/libempathy-gtk/empathy-contact-menu.c b/libempathy-gtk/empathy-contact-menu.c index a83fbbdf7..f23508e1b 100644 --- a/libempathy-gtk/empathy-contact-menu.c +++ b/libempathy-gtk/empathy-contact-menu.c @@ -23,7 +23,7 @@ #include <string.h> -#include <glib/gi18n.h> +#include <glib/gi18n-lib.h> #include <gtk/gtk.h> #include <libempathy/empathy-log-manager.h> diff --git a/libempathy-gtk/empathy-contact-widget.c b/libempathy-gtk/empathy-contact-widget.c index 770d9874b..4100a6872 100644 --- a/libempathy-gtk/empathy-contact-widget.c +++ b/libempathy-gtk/empathy-contact-widget.c @@ -26,7 +26,7 @@ #include <gtk/gtk.h> #include <glade/glade.h> -#include <glib/gi18n.h> +#include <glib/gi18n-lib.h> #include <libmissioncontrol/mc-account.h> #include <telepathy-glib/util.h> diff --git a/libempathy-gtk/empathy-irc-network-dialog.c b/libempathy-gtk/empathy-irc-network-dialog.c index 7c6e27d30..b4ec2ff4c 100644 --- a/libempathy-gtk/empathy-irc-network-dialog.c +++ b/libempathy-gtk/empathy-irc-network-dialog.c @@ -24,7 +24,7 @@ #include <string.h> #include <sys/stat.h> -#include <glib/gi18n.h> +#include <glib/gi18n-lib.h> #include <gtk/gtk.h> #include <glade/glade.h> diff --git a/libempathy-gtk/empathy-log-window.c b/libempathy-gtk/empathy-log-window.c index b0bfe759c..89dbd09c9 100644 --- a/libempathy-gtk/empathy-log-window.c +++ b/libempathy-gtk/empathy-log-window.c @@ -27,7 +27,7 @@ #include <string.h> #include <stdlib.h> -#include <glib/gi18n.h> +#include <glib/gi18n-lib.h> #include <gtk/gtk.h> #include <glade/glade.h> diff --git a/libempathy-gtk/empathy-new-message-dialog.c b/libempathy-gtk/empathy-new-message-dialog.c index 2c88f38f9..44e3a6d05 100644 --- a/libempathy-gtk/empathy-new-message-dialog.c +++ b/libempathy-gtk/empathy-new-message-dialog.c @@ -26,7 +26,7 @@ #include <gtk/gtk.h> #include <glade/glade.h> -#include <glib/gi18n.h> +#include <glib/gi18n-lib.h> #include <libmissioncontrol/mc-account.h> #include <libmissioncontrol/mission-control.h> diff --git a/libempathy-gtk/empathy-presence-chooser.c b/libempathy-gtk/empathy-presence-chooser.c index 0af2238df..c86baade0 100644 --- a/libempathy-gtk/empathy-presence-chooser.c +++ b/libempathy-gtk/empathy-presence-chooser.c @@ -27,7 +27,7 @@ #include <string.h> #include <stdlib.h> -#include <glib/gi18n.h> +#include <glib/gi18n-lib.h> #include <gtk/gtk.h> #include <glade/glade.h> diff --git a/libempathy-gtk/empathy-spell-dialog.c b/libempathy-gtk/empathy-spell-dialog.c index 19531cf76..c5914ce94 100644 --- a/libempathy-gtk/empathy-spell-dialog.c +++ b/libempathy-gtk/empathy-spell-dialog.c @@ -22,7 +22,7 @@ #include <string.h> -#include <glib/gi18n.h> +#include <glib/gi18n-lib.h> #include <gtk/gtkcellrenderertext.h> #include <gtk/gtkdialog.h> #include <gtk/gtklabel.h> diff --git a/libempathy-gtk/empathy-spell.c b/libempathy-gtk/empathy-spell.c index c1c630354..914c0c78d 100644 --- a/libempathy-gtk/empathy-spell.c +++ b/libempathy-gtk/empathy-spell.c @@ -26,7 +26,7 @@ #include <string.h> #include <stdlib.h> -#include <glib/gi18n.h> +#include <glib/gi18n-lib.h> #ifdef HAVE_ENCHANT #include <enchant.h> diff --git a/libempathy-gtk/empathy-theme-boxes.c b/libempathy-gtk/empathy-theme-boxes.c index 8d3a813bd..4180d75e6 100644 --- a/libempathy-gtk/empathy-theme-boxes.c +++ b/libempathy-gtk/empathy-theme-boxes.c @@ -22,7 +22,7 @@ #include <string.h> -#include <glib/gi18n.h> +#include <glib/gi18n-lib.h> #include <gtk/gtk.h> #include <libempathy/empathy-utils.h> diff --git a/libempathy-gtk/empathy-theme-irc.c b/libempathy-gtk/empathy-theme-irc.c index fd315b2b1..da96f1ea6 100644 --- a/libempathy-gtk/empathy-theme-irc.c +++ b/libempathy-gtk/empathy-theme-irc.c @@ -20,7 +20,7 @@ #include "config.h" -#include <glib/gi18n.h> +#include <glib/gi18n-lib.h> #include <libempathy/empathy-utils.h> #include "empathy-chat.h" diff --git a/libempathy-gtk/empathy-theme-manager.c b/libempathy-gtk/empathy-theme-manager.c index 1bcb4204f..98694af2d 100644 --- a/libempathy-gtk/empathy-theme-manager.c +++ b/libempathy-gtk/empathy-theme-manager.c @@ -22,7 +22,7 @@ #include <string.h> -#include <glib/gi18n.h> +#include <glib/gi18n-lib.h> #include <gtk/gtk.h> #include <libempathy/empathy-utils.h> diff --git a/libempathy-gtk/empathy-theme.c b/libempathy-gtk/empathy-theme.c index eb84f08a9..971c6b1c9 100644 --- a/libempathy-gtk/empathy-theme.c +++ b/libempathy-gtk/empathy-theme.c @@ -21,7 +21,7 @@ #include <config.h> #include <string.h> -#include <glib/gi18n.h> +#include <glib/gi18n-lib.h> #include <gtk/gtk.h> #include <libempathy/empathy-utils.h> diff --git a/libempathy-gtk/empathy-ui-utils.c b/libempathy-gtk/empathy-ui-utils.c index 693bd8137..351a5aa9c 100644 --- a/libempathy-gtk/empathy-ui-utils.c +++ b/libempathy-gtk/empathy-ui-utils.c @@ -34,7 +34,7 @@ #include <string.h> #include <X11/Xatom.h> #include <gdk/gdkx.h> -#include <glib/gi18n.h> +#include <glib/gi18n-lib.h> #include <gtk/gtk.h> #include <gio/gio.h> #include <glade/glade.h> diff --git a/libempathy-gtk/totem-subtitle-encoding.c b/libempathy-gtk/totem-subtitle-encoding.c index 0fb892ad2..112f169fd 100644 --- a/libempathy-gtk/totem-subtitle-encoding.c +++ b/libempathy-gtk/totem-subtitle-encoding.c @@ -28,7 +28,7 @@ */ #include "config.h" -#include <glib/gi18n.h> +#include <glib/gi18n-lib.h> #include "totem-subtitle-encoding.h" #include <string.h> diff --git a/libempathy/empathy-contact-groups.c b/libempathy/empathy-contact-groups.c index 83d920a94..6973a960a 100644 --- a/libempathy/empathy-contact-groups.c +++ b/libempathy/empathy-contact-groups.c @@ -27,7 +27,7 @@ #include <sys/stat.h> #include <glib.h> -#include <glib/gi18n.h> +#include <glib/gi18n-lib.h> #include <libxml/parser.h> #include <libxml/tree.h> diff --git a/libempathy/empathy-contact.c b/libempathy/empathy-contact.c index 38fb662e1..314082b86 100644 --- a/libempathy/empathy-contact.c +++ b/libempathy/empathy-contact.c @@ -27,7 +27,7 @@ #include <string.h> -#include <glib/gi18n.h> +#include <glib/gi18n-lib.h> #include <telepathy-glib/util.h> diff --git a/libempathy/empathy-dispatcher.c b/libempathy/empathy-dispatcher.c index fd363fa17..d2995691e 100644 --- a/libempathy/empathy-dispatcher.c +++ b/libempathy/empathy-dispatcher.c @@ -23,7 +23,7 @@ #include <string.h> -#include <glib/gi18n.h> +#include <glib/gi18n-lib.h> #include <telepathy-glib/enums.h> #include <telepathy-glib/connection.h> diff --git a/libempathy/empathy-idle.c b/libempathy/empathy-idle.c index a138ea47d..bc40cc899 100644 --- a/libempathy/empathy-idle.c +++ b/libempathy/empathy-idle.c @@ -23,7 +23,7 @@ #include <string.h> -#include <glib/gi18n.h> +#include <glib/gi18n-lib.h> #include <dbus/dbus-glib.h> #include <telepathy-glib/dbus.h> diff --git a/libempathy/empathy-irc-network.c b/libempathy/empathy-irc-network.c index 17abd36e9..2f433e4ef 100644 --- a/libempathy/empathy-irc-network.c +++ b/libempathy/empathy-irc-network.c @@ -23,7 +23,7 @@ #include <string.h> #include <stdlib.h> #include <glib.h> -#include <glib/gi18n.h> +#include <glib/gi18n-lib.h> #include <telepathy-glib/util.h> diff --git a/libempathy/empathy-irc-server.c b/libempathy/empathy-irc-server.c index 482214532..2ef8dc59c 100644 --- a/libempathy/empathy-irc-server.c +++ b/libempathy/empathy-irc-server.c @@ -22,7 +22,7 @@ #include <string.h> #include <stdlib.h> #include <glib.h> -#include <glib/gi18n.h> +#include <glib/gi18n-lib.h> #include <telepathy-glib/util.h> diff --git a/libempathy/empathy-status-presets.c b/libempathy/empathy-status-presets.c index b5e1f9bf8..e7b8804ad 100644 --- a/libempathy/empathy-status-presets.c +++ b/libempathy/empathy-status-presets.c @@ -27,7 +27,7 @@ #include <string.h> #include <glib.h> -#include <glib/gi18n.h> +#include <glib/gi18n-lib.h> #include <libxml/parser.h> #include <libxml/tree.h> diff --git a/libempathy/empathy-tp-contact-list.c b/libempathy/empathy-tp-contact-list.c index 719a6cc1a..31e7bff0f 100644 --- a/libempathy/empathy-tp-contact-list.c +++ b/libempathy/empathy-tp-contact-list.c @@ -23,7 +23,7 @@ #include <config.h> #include <string.h> -#include <glib/gi18n.h> +#include <glib/gi18n-lib.h> #include <telepathy-glib/channel.h> #include <telepathy-glib/connection.h> diff --git a/libempathy/empathy-tp-file.c b/libempathy/empathy-tp-file.c index 940db073a..34f570f45 100644 --- a/libempathy/empathy-tp-file.c +++ b/libempathy/empathy-tp-file.c @@ -29,7 +29,7 @@ #include <sys/socket.h> #include <sys/un.h> -#include <glib/gi18n.h> +#include <glib/gi18n-lib.h> #include <gio/gio.h> #include <gio/gunixinputstream.h> diff --git a/libempathy/empathy-utils.c b/libempathy/empathy-utils.c index dc06081f3..26ae2ca65 100644 --- a/libempathy/empathy-utils.c +++ b/libempathy/empathy-utils.c @@ -29,7 +29,7 @@ #include <time.h> #include <sys/types.h> -#include <glib/gi18n.h> +#include <glib/gi18n-lib.h> #include <libxml/uri.h> #include <telepathy-glib/connection.h> @@ -58,7 +58,6 @@ empathy_init (void) /* Setup gettext */ bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); - textdomain (GETTEXT_PACKAGE); /* Setup debug output for empathy and telepathy-glib */ if (g_getenv ("EMPATHY_TIMING") != NULL) { diff --git a/src/empathy.c b/src/empathy.c index 8a0bf5abd..1e506ba6e 100644 --- a/src/empathy.c +++ b/src/empathy.c @@ -411,6 +411,7 @@ main (int argc, char *argv[]) } g_set_application_name (PACKAGE_NAME); gtk_window_set_default_icon_name ("empathy"); + textdomain (GETTEXT_PACKAGE); /* Setting up the bacon connection */ connection = bacon_message_connection_new ("empathy"); |