From c759fadd251e4a5b95e0a4b483889f654ac89d62 Mon Sep 17 00:00:00 2001 From: infirit Date: Sat, 19 Oct 2013 00:26:42 +0200 Subject: Move to gucharmap --- charpick/Makefile.am | 4 ++-- charpick/charpick.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'charpick') diff --git a/charpick/Makefile.am b/charpick/Makefile.am index 678a06f1..56d7592f 100644 --- a/charpick/Makefile.am +++ b/charpick/Makefile.am @@ -5,7 +5,7 @@ AM_CPPFLAGS = \ -I$(srcdir) \ -DCHARPICK_MENU_UI_DIR=\""$(uidir)"\" \ $(MATE_APPLETS4_CFLAGS) \ - $(MUCHARMAP_CFLAGS) + $(GUCHARMAP_CFLAGS) libexec_PROGRAMS = charpick_applet2 @@ -15,7 +15,7 @@ charpick_applet2_SOURCES = charpick.c \ charpick_applet2_LDADD = \ $(MATE_APPLETS4_LIBS) \ - $(MUCHARMAP_LIBS) + $(GUCHARMAP_LIBS) appletdir = $(datadir)/mate-panel/applets applet_in_files = org.mate.applets.CharpickerApplet.mate-panel-applet.in diff --git a/charpick/charpick.c b/charpick/charpick.c index 54048794..6f5e766e 100644 --- a/charpick/charpick.c +++ b/charpick/charpick.c @@ -6,8 +6,8 @@ #include #include #include -#ifdef HAVE_MUCHARMAP -# include +#ifdef HAVE_GUCHARMAP +# include #endif #include "charpick.h" @@ -457,13 +457,13 @@ build_table(charpick_data *p_curr_data) g_utf8_strncpy (label, charlist, 1); charlist = g_utf8_next_char (charlist); -#ifdef HAVE_MUCHARMAP +#ifdef HAVE_GUCHARMAP /* TRANSLATOR: This sentance reads something like 'Insert "PILCROW SIGN"' * hopefully, the name of the unicode character has already * been translated. */ name = g_strdup_printf (_("Insert \"%s\""), - mucharmap_get_unicode_name (g_utf8_get_char (label))); + gucharmap_get_unicode_name (g_utf8_get_char (label))); #else name = g_strdup (_("Insert special character")); #endif -- cgit v1.2.1 From 31289af8390241e97c385528f5d7605a28a6bc8e Mon Sep 17 00:00:00 2001 From: infirit Date: Sat, 19 Oct 2013 11:44:45 +0200 Subject: Fix EXTRA_DIST for applet gschemas The following fails to include the needed schemas files: $(gsettings_SCHEMAS_in_in) replacing it with: $(gsettings_SCHEMAS).in.in --- charpick/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'charpick') diff --git a/charpick/Makefile.am b/charpick/Makefile.am index 56d7592f..b4c7d1d4 100644 --- a/charpick/Makefile.am +++ b/charpick/Makefile.am @@ -54,6 +54,6 @@ EXTRA_DIST = \ org.mate.applets.CharpickerApplet.mate-panel-applet.in.in \ $(service_in_files) \ $(ui_DATA) \ - $(gsettings_SCHEMAS_in_in) + $(gsettings_SCHEMAS).in.in -include $(top_srcdir)/git.mk -- cgit v1.2.1