From cf587626632dbd9e7b00b58f23064a3f75d2bfd7 Mon Sep 17 00:00:00 2001 From: rbuj Date: Fri, 5 Feb 2021 21:55:45 +0100 Subject: Drop local macro mate_gettext(package, locale, codeset) --- mate-about/mate-about.c | 13 +++---------- tools/mate-color-select.c | 9 +++------ 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/mate-about/mate-about.c b/mate-about/mate-about.c index a7ada15..1210571 100644 --- a/mate-about/mate-about.c +++ b/mate-about/mate-about.c @@ -20,15 +20,6 @@ #include "mate-about.h" -/* get text macro, this should be on the common macros. or not? - */ -#ifndef mate_gettext -#define mate_gettext(package, locale, codeset) \ - bindtextdomain(package, locale); \ - bind_textdomain_codeset(package, codeset); \ - textdomain(package); -#endif - static void mate_about_on_activate(GtkApplication* app) { GList* list; @@ -86,7 +77,9 @@ int main(int argc, char** argv) { int status = 0; - mate_gettext(GETTEXT_PACKAGE, LOCALE_DIR, "UTF-8"); + bindtextdomain (GETTEXT_PACKAGE, LOCALE_DIR); + bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); + textdomain (GETTEXT_PACKAGE); GOptionContext* context = g_option_context_new(NULL); g_option_context_add_main_entries(context, command_entries, GETTEXT_PACKAGE); diff --git a/tools/mate-color-select.c b/tools/mate-color-select.c index fb9d585..e48ef38 100644 --- a/tools/mate-color-select.c +++ b/tools/mate-color-select.c @@ -28,11 +28,6 @@ #include #include -#define mate_gettext(package, locale, codeset) \ - bindtextdomain(package, locale); \ - bind_textdomain_codeset(package, codeset); \ - textdomain(package); - gboolean copy_color (GtkWidget *widget, GdkEvent *event, MateColorSelectionDialog *color_dialog) { @@ -56,7 +51,9 @@ main (int argc, char **argv) GtkWidget *widget; GtkWidget *image; - mate_gettext (GETTEXT_PACKAGE, LOCALE_DIR, "UTF-8"); + bindtextdomain (GETTEXT_PACKAGE, LOCALE_DIR); + bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); + textdomain (GETTEXT_PACKAGE); /* initialize GTK+ */ gtk_init (&argc, &argv); -- cgit v1.2.1