diff options
author | Danny Baumann <dannybaumann@web.de> | 2008-11-08 14:18:06 +0100 |
---|---|---|
committer | Danny Baumann <dannybaumann@web.de> | 2008-11-08 14:18:06 +0100 |
commit | 205ed12e5a78b0b37b4d71d5487ed92dcae1c198 (patch) | |
tree | c38292fe46c04df82f4add1215d9a639b9091a50 /gtk | |
parent | 3a8fde4e009e851bf8c55b57ad07aae250d162c8 (diff) |
Use glib i18n header file and compiz text domain.
Diffstat (limited to 'gtk')
-rw-r--r-- | gtk/gnome/Makefile.am | 3 | ||||
-rw-r--r-- | gtk/gnome/compiz-window-manager.c | 10 |
2 files changed, 7 insertions, 6 deletions
diff --git a/gtk/gnome/Makefile.am b/gtk/gnome/Makefile.am index c0ed0252..e37641d8 100644 --- a/gtk/gnome/Makefile.am +++ b/gtk/gnome/Makefile.am @@ -77,7 +77,8 @@ endif endif INCLUDES = @GNOME_WINDOW_SETTINGS_CFLAGS@ \ - -DMETACITY_THEME_DIR=\""$(windowsettingsdatadir)/themes"\" + -DMETACITY_THEME_DIR=\""$(windowsettingsdatadir)/themes"\" \ + -DLOCALEDIR="\"@datadir@/locale"\" noinst_LTLIBRARIES = \ $(libcompiz_module) diff --git a/gtk/gnome/compiz-window-manager.c b/gtk/gnome/compiz-window-manager.c index 713cedf0..114bd847 100644 --- a/gtk/gnome/compiz-window-manager.c +++ b/gtk/gnome/compiz-window-manager.c @@ -28,14 +28,10 @@ #include <dirent.h> #include <string.h> #include <gconf/gconf-client.h> -#include <libintl.h> +#include <glib/gi18n.h> #include "compiz-window-manager.h" -/* I18N helpers */ -#define _(x) gettext (x) -#define N_(x) x - #define COMPIZ_CLICK_TO_FOCUS_KEY \ "/apps/compiz/general/allscreens/options/click_to_focus" @@ -514,6 +510,10 @@ compiz_window_manager_class_init (CompizWindowManagerClass *class) GObjectClass *object_class; GnomeWindowManagerClass *wm_class; + bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); + bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); + textdomain (GETTEXT_PACKAGE); + object_class = G_OBJECT_CLASS (class); wm_class = GNOME_WINDOW_MANAGER_CLASS (class); |