Use gi18n-lib.h instead of gi18n.h for libraries.

svn path=/trunk/; revision=1967

diff --git a/libempathy-gtk/empathy-account-chooser.c b/libempathy-gtk/empathy-account-chooser.c
index 14e6e2786c2de94b8f41900ac82719586a018a12..bd343f53bd751998c88a52bb25e5ff17b767d20a 100644 (file)
--- 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 242085ccc6b0615f7b66d22217acf467d9614b02..a5111381ceba6d737eac4bfba8aa16c0270735ec 100644 (file)
--- 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 28832e0d7ef6dd294235ef1f2bceca1cb8507059..c5224df7338525f05acff53505f57de5c63b2b1c 100644 (file)
--- 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 6fe5e02048f148fbe373ca88f9c84cba5535793f..066dac21f7735d9549c82e51e0d700130f743a4b 100644 (file)
--- 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 37abd42de5e1e380a9c13b244c97c82cba36de00..86df44953cacd45c81664026c797b4812f564e65 100644 (file)
--- 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 7dd93aad965c23a3fb77971042335e4e38db4dc2..51f30bdd501fe07b502d3932f60316066d480bae 100644 (file)
--- 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 367b6308d86ebf3f4f24f1e669fd685c041737f4..5adccaff0fb4fe77c9980cc31c4a958f3d35e202 100644 (file)
--- 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 fe289539c7b2121c6fd3732aa80db60373bea674..33aef50652035509b6e876e8ffa2fc6aa931709d 100644 (file)
--- 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 692ca64301449f937a6f07ff1f4c268e750c5917..f7b6cb635794b54012b0011614c847017dec2509 100644 (file)
--- 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 868cc9ccb44a8788511110247f38a3f18e5bc819..839a0df363318f49db5ff85e06b2ddf066401dd8 100644 (file)
--- 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 a83fbbdf72599e8e981059f5d21d6df409dbe5fa..f23508e1b43c847ced683fc2e45b6f52ed12fd26 100644 (file)
--- 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 770d9874b4d14b1f7f47c21d6273fa4cf716e9c3..4100a6872227e2e647b21b3d86470242a480315d 100644 (file)
--- 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 7c6e27d30964b2d1f4e79931cb685f1c4f12efca..b4ec2ff4cacb0b11620dcf8ec8dad2cacbb39c08 100644 (file)
--- 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 b0bfe759ccb1b3f49b424e3e0277437792df73e9..89dbd09c90fb7a5268b5ad31ea25290334bd13d4 100644 (file)
--- 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 2c88f38f90eeb8896a110981cbd7a52d5a373de7..44e3a6d05905882af2e5df1b51b78694e946b4cc 100644 (file)
--- 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 0af2238dffdcdeca41b403f9409458612ceb72fb..c86baade01bbaad32c8df4b4f1f0686d74bf5473 100644 (file)
--- 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 19531cf760040de80ef0f78b196a47a369f5cfb4..c5914ce9415fa3156872f18c7e775c6b69aeb740 100644 (file)
--- 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 c1c630354eba8290705168c7f4f0cf3a277b873e..914c0c78dcd781fac1f480a13ce853776f8b6e31 100644 (file)
--- 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 8d3a813bd8074d47ac4569fecda34ab3c6975fdd..4180d75e64e6a30bd2b4151b6c2abef57d346f8b 100644 (file)
--- 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 fd315b2b1981488b2105a836361860dc2aba1618..da96f1ea65a90f774d4a05a5b1be04e34f965bed 100644 (file)
--- 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 1bcb4204fed3028668e7b42033942222f185e2bf..98694af2db1d5463e7473f28815ac069acafcaa6 100644 (file)
--- 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 eb84f08a991c4649d43a89a33b33078420a059c0..971c6b1c973eb6ed375634f93609200adda28eea 100644 (file)
--- 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 693bd81371803adebb30dbc217aee6208460d3e7..351a5aa9c21a5188c7d732131094f43f38ca7968 100644 (file)
--- 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 0fb892ad22ed99de03b573de51e84b75d8c040ec..112f169fdac60e56a9d413ac358d9502df271494 100644 (file)
--- 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 83d920a948637a60f263708bf5200c55201442d3..6973a960a83000bad6c28d9fd77e26be8672ecb1 100644 (file)
--- 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 38fb662e100c0a987a447ffe1bc4c65a32068b9e..314082b8651b497f917217a2ee700f7eec0e88fb 100644 (file)
--- 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 fd363fa1798397df91a14a8a60d5f5cc6d27419d..d2995691e2e7b77244d1fec0548d162d4b44f3ed 100644 (file)
--- 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 a138ea47da96f74466f3c957d53dd2c9ba9d6d2f..bc40cc899e9b8e8b16288f3f9073178df79a6b4c 100644 (file)
--- 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 17abd36e95469d5eb6fba9fa602eedaa997d2867..2f433e4efcf58a8a50ddc1a8beb25487936b49a3 100644 (file)
--- 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 48221453274aa5fb0724f74cb75af8231b23e58e..2ef8dc59c1c65deea69b4680c661008ce5618cef 100644 (file)
--- 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 b5e1f9bf89b4f854932064cd74d4b4c9bd09b6e2..e7b8804ad6bc60168a006dd343febe8f6b209796 100644 (file)
--- 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 719a6cc1a8fc853b6d2e0b1e3bcc74fcc1ba9558..31e7bff0fa3f7878c334014236856829e27dda00 100644 (file)
--- 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 940db073a3c4d39261c03b78bb22e397ec485e8b..34f570f45390b5e649259be9a2fb90ee9946116c 100644 (file)
--- 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 dc06081f35d0a48ef98885e8a079a572100e637b..26ae2ca650c84c3fe72abfff74b59b2a393a77d9 100644 (file)
--- 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 8a0bf5abd64ed1fe179f587877bbf03625f35933..1e506ba6e6a09f4f793a0ab42e1d6ca66ad1e87a 100644 (file)
--- 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");