diff options
| author | Colomban Wendling <[email protected]> | 2023-10-03 11:25:43 +0200 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2023-10-05 11:54:26 +0200 |
| commit | 0c06fb5f7caf8bcdbbf0dc54f856d9099081b0ba (patch) | |
| tree | e459baaf52980ad32c6204946a1426b4814e237b /mate-volume-control | |
| parent | cb6f36c8ca31e3b714b651c3c2358e8091fa2eae (diff) | |
| download | mate-media-0c06fb5f7caf8bcdbbf0dc54f856d9099081b0ba.tar.bz2 mate-media-0c06fb5f7caf8bcdbbf0dc54f856d9099081b0ba.tar.xz | |
applet: Do not override the process' text domain
When loaded as in-process applet, we must not call `textdomain()` or we
will override mate-panel's text domain. Instead, properly use
gi18n-lib.h header that provides the same API but uses the compile-time
`GETTEXT_PACKAGE` value for each call.
Actually drop the whole i18n setup logic that is provided already by
mate-panel's factory macros.
Fixes #203.
Diffstat (limited to 'mate-volume-control')
| -rw-r--r-- | mate-volume-control/applet-main.c | 6 | ||||
| -rw-r--r-- | mate-volume-control/gvc-applet.c | 2 | ||||
| -rw-r--r-- | mate-volume-control/gvc-channel-bar.c | 2 | ||||
| -rw-r--r-- | mate-volume-control/gvc-stream-applet-icon.c | 2 |
4 files changed, 4 insertions, 8 deletions
diff --git a/mate-volume-control/applet-main.c b/mate-volume-control/applet-main.c index fe447b4..24dca77 100644 --- a/mate-volume-control/applet-main.c +++ b/mate-volume-control/applet-main.c @@ -24,7 +24,7 @@ #include "config.h" #include <glib.h> -#include <glib/gi18n.h> +#include <glib/gi18n-lib.h> #include <glib-object.h> #include <gtk/gtk.h> @@ -42,10 +42,6 @@ applet_main (MatePanelApplet* applet_widget) GvcApplet *applet; GApplication *app = NULL; - bindtextdomain (GETTEXT_PACKAGE, LOCALE_DIR); - bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); - textdomain (GETTEXT_PACKAGE); - app = g_application_new (GVC_APPLET_DBUS_NAME, G_APPLICATION_FLAGS_NONE); if (!g_application_register (app, NULL, &error)) { diff --git a/mate-volume-control/gvc-applet.c b/mate-volume-control/gvc-applet.c index 8476aa9..93e4623 100644 --- a/mate-volume-control/gvc-applet.c +++ b/mate-volume-control/gvc-applet.c @@ -25,7 +25,7 @@ #include <string.h> #include <glib.h> -#include <glib/gi18n.h> +#include <glib/gi18n-lib.h> #include <glib-object.h> #include <gtk/gtk.h> diff --git a/mate-volume-control/gvc-channel-bar.c b/mate-volume-control/gvc-channel-bar.c index 89fa3a5..1f57098 100644 --- a/mate-volume-control/gvc-channel-bar.c +++ b/mate-volume-control/gvc-channel-bar.c @@ -25,7 +25,7 @@ #include <sys/param.h> #include <glib.h> -#include <glib/gi18n.h> +#include <glib/gi18n-lib.h> #include <glib-object.h> #include <gtk/gtk.h> diff --git a/mate-volume-control/gvc-stream-applet-icon.c b/mate-volume-control/gvc-stream-applet-icon.c index 58d39e4..da8020f 100644 --- a/mate-volume-control/gvc-stream-applet-icon.c +++ b/mate-volume-control/gvc-stream-applet-icon.c @@ -23,7 +23,7 @@ #include <config.h> #include <glib.h> -#include <glib/gi18n.h> +#include <glib/gi18n-lib.h> #include <gtk/gtk.h> #include <gdk/gdkkeysyms.h> |