gnome-terminal r2478 - trunk/src

[chpe svn gnome org]

Author: chpe
Date: Wed Mar 19 18:11:09 2008
New Revision: 2478
URL: http://svn.gnome.org/viewvc/gnome-terminal?rev=2478&view=rev

Log:
Remove terminal-intl.h and use glib/gi18n.h directly.


Removed:
   trunk/src/terminal-intl.h
Modified:
   trunk/src/encoding.c
   trunk/src/profile-editor.c
   trunk/src/skey-popup.c
   trunk/src/terminal-accels.c
   trunk/src/terminal-profile.c
   trunk/src/terminal-screen.c
   trunk/src/terminal-widget-vte.c
   trunk/src/terminal-window.c
   trunk/src/terminal.c

Modified: trunk/src/encoding.c
==============================================================================
--- trunk/src/encoding.c	(original)
+++ trunk/src/encoding.c	Wed Mar 19 18:11:09 2008
@@ -19,7 +19,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "terminal-intl.h"
+#include <glib/gi18n.h>
+
 #include "terminal.h"
 
 #include "encoding.h"

Modified: trunk/src/profile-editor.c
==============================================================================
--- trunk/src/profile-editor.c	(original)
+++ trunk/src/profile-editor.c	Wed Mar 19 18:11:09 2008
@@ -20,8 +20,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <glib/gi18n.h>
+
 #include "profile-editor.h"
-#include "terminal-intl.h"
 #include "terminal.h"
 #include <glade/glade.h>
 #include <gio/gio.h>

Modified: trunk/src/skey-popup.c
==============================================================================
--- trunk/src/skey-popup.c	(original)
+++ trunk/src/skey-popup.c	Wed Mar 19 18:11:09 2008
@@ -18,7 +18,9 @@
  */
 
 #include <config.h>
-#include "terminal-intl.h"
+
+#include <glib/gi18n.h>
+
 #include "terminal.h"
 #include "terminal-widget.h"
 #include "skey-popup.h"

Modified: trunk/src/terminal-accels.c
==============================================================================
--- trunk/src/terminal-accels.c	(original)
+++ trunk/src/terminal-accels.c	Wed Mar 19 18:11:09 2008
@@ -18,7 +18,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "terminal-intl.h"
+#include <glib/gi18n.h>
+
 #include "terminal-accels.h"
 #include "terminal-profile.h"
 #include "terminal.h"

Modified: trunk/src/terminal-profile.c
==============================================================================
--- trunk/src/terminal-profile.c	(original)
+++ trunk/src/terminal-profile.c	Wed Mar 19 18:11:09 2008
@@ -20,7 +20,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "terminal-intl.h"
+#include <glib/gi18n.h>
+
 #include "terminal-profile.h"
 #include <gtk/gtk.h>
 #include <libgnome/gnome-program.h>

Modified: trunk/src/terminal-screen.c
==============================================================================
--- trunk/src/terminal-screen.c	(original)
+++ trunk/src/terminal-screen.c	Wed Mar 19 18:11:09 2008
@@ -19,6 +19,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <glib/gi18n.h>
+
 /* grab gtk_style_get_font and gdk_x11_get_font_name */
 #undef GTK_DISABLE_DEPRECATED
 #undef GDK_DISABLE_DEPRECATED
@@ -27,7 +29,6 @@
 #define GTK_DISABLE_DEPRECATED
 #define GDK_DISABLE_DEPRECATED
 
-#include "terminal-intl.h"
 #include "terminal-accels.h"
 #include "terminal-window.h"
 #include "terminal-widget.h"

Modified: trunk/src/terminal-widget-vte.c
==============================================================================
--- trunk/src/terminal-widget-vte.c	(original)
+++ trunk/src/terminal-widget-vte.c	Wed Mar 19 18:11:09 2008
@@ -19,7 +19,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "terminal-intl.h"
+#include <glib/gi18n.h>
+
 #include "terminal-widget.h"
 
 #include <string.h>

Modified: trunk/src/terminal-window.c
==============================================================================
--- trunk/src/terminal-window.c	(original)
+++ trunk/src/terminal-window.c	Wed Mar 19 18:11:09 2008
@@ -23,7 +23,8 @@
 
 #include <config.h>
 
-#include "terminal-intl.h"
+#include <glib/gi18n.h>
+
 #include "terminal-accels.h"
 #include "terminal-widget.h"
 #include "terminal-window.h"

Modified: trunk/src/terminal.c
==============================================================================
--- trunk/src/terminal.c	(original)
+++ trunk/src/terminal.c	Wed Mar 19 18:11:09 2008
@@ -21,7 +21,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "terminal-intl.h"
+#include <config.h>
+
+#include <glib/gi18n.h>
+
+#include <locale.h>
+
 #include "terminal.h"
 #include "terminal-accels.h"
 #include "terminal-window.h"