Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

wip: backport xrandr -> muffin changes #245

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
248 changes: 0 additions & 248 deletions debian/libcinnamon-desktop4.symbols

This file was deleted.

60 changes: 60 additions & 0 deletions libcinnamon-desktop/default-input-sources.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
typedef struct
{
const gchar *const locale;
const gchar *const type;
const gchar *const id;
} DefaultInputSource;

static DefaultInputSource default_input_sources[] =
{
{ "ar_DZ", "xkb", "ara+azerty" },
{ "as_IN", "ibus", "m17n:as:phonetic" },
{ "ast_ES", "xkb", "es+ast" },
{ "az_AZ", "xkb", "az" },
{ "be_BY", "xkb", "by" },
{ "bg_BG", "xkb", "bg+phonetic" },
{ "bn_IN", "ibus", "m17n:bn:inscript" },
{ "cat_ES", "xkb", "es+cat" },
{ "cs_CZ", "xkb", "cz" },
{ "de_CH", "xkb", "ch" },
{ "de_DE", "xkb", "de" },
{ "el_CY", "xkb", "gr" },
{ "el_GR", "xkb", "gr" },
{ "en_GB", "xkb", "gb" },
{ "en_US", "xkb", "us" },
{ "en_ZA", "xkb", "za" },
{ "es_ES", "xkb", "es" },
{ "es_GT", "xkb", "latam" },
{ "es_MX", "xkb", "latam" },
{ "fr_BE", "xkb", "be" },
{ "fr_CH", "xkb", "ch+fr" },
{ "fr_FR", "xkb", "fr+oss" },
{ "gl_ES", "xkb", "es" },
{ "gu_IN", "ibus", "m17n:gu:inscript" },
{ "he_IL", "xkb", "il" },
{ "hi_IN", "ibus", "m17n:hi:inscript" },
{ "id_ID", "xkb", "us" },
{ "it_IT", "xkb", "it" },
{ "ja_JP", "ibus", "kkc" },
{ "kn_IN", "ibus", "m17n:kn:kgp" },
{ "ko_KR", "ibus", "hangul" },
{ "mai_IN", "ibus", "m17n:mai:inscript" },
{ "ml_IN", "ibus", "m17n:ml:inscript" },
{ "mr_IN", "ibus", "m17n:mr:inscript" },
{ "nl_NL", "xkb", "us+altgr-intl" },
{ "or_IN", "ibus", "m17n:or:inscript" },
{ "pa_IN", "ibus", "m17n:pa:inscript" },
{ "pl_PL", "xkb", "pl" },
{ "pt_BR", "xkb", "br" },
{ "pt_PT", "xkb", "pt" },
{ "ru_RU", "xkb", "ru" },
{ "sd_IN", "ibus", "m17n:sd:inscript" },
{ "sk_SK", "xkb", "sk" },
{ "ta_IN", "ibus", "m17n:ta:tamil99" },
{ "te_IN", "ibus", "m17n:te:inscript" },

Check failure on line 54 in libcinnamon-desktop/default-input-sources.h

View workflow job for this annotation

GitHub Actions / build / build (mint22, linuxmintd/mint22-amd64, Mint 22, true) / Mint 22

te ==> the, be, we, to
{ "ur_IN", "ibus", "m17n:ur:phonetic" },
{ "zh_CN", "ibus", "libpinyin" },
{ "zh_HK", "ibus", "cangjie" },
{ "zh_TW", "ibus", "libzhuyin" },
{ NULL, NULL, NULL }
};
76 changes: 76 additions & 0 deletions libcinnamon-desktop/gnome-gettext-portable.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
/*-
* Copyright (c) 2021 Dan Cîrnaț <dan@alt.md>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public License
* as published by the Free Software Foundation; either version 2 of
* the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
* License along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301, USA.
*
*/
#include "config.h"

#include <locale.h>
#ifdef HAVE_XLOCALE
#include <xlocale.h>
#endif

#include <glib.h>
#include <glib/gi18n-lib.h>

#ifndef HAVE_USELOCALE

/*
* FIXME: This function does nothing if there's no thread-safe
* alternative to uselocale on some systems (NetBSD). Replace it
* when an implementation becomes available.
*/
locale_t
uselocale (locale_t newloc)
{
return (locale_t) 0;
}
#endif

char *
dgettext_l (locale_t locale,
const char *domain,
const char *msgid)
{
locale_t old_locale = uselocale (locale);
char *ret = dgettext (domain, msgid);
uselocale (old_locale);
return ret;
}

const gchar *
g_dgettext_l (locale_t locale,
const gchar *domain,
const gchar *msgid)
{
locale_t old_locale = uselocale (locale);
const gchar *ret = g_dgettext (domain, msgid);
uselocale (old_locale);
return ret;
}

const gchar *
g_dpgettext_l (locale_t locale,
const gchar *domain,
const gchar *msgctxtid,
gsize msgidoffset)
{
locale_t old_locale = uselocale (locale);
const gchar *ret = g_dpgettext (domain, msgctxtid, msgidoffset);
uselocale (old_locale);
return ret;
}
Loading
Loading