diff options
| author | Stefano Karapetsas <[email protected]> | 2013-10-19 04:46:59 -0700 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2013-10-19 04:46:59 -0700 |
| commit | d3178d6a81bb95316193d24926bed3fdc943355e (patch) | |
| tree | 3b1c45b791d590e1f69f9d67e002cabcc68d6016 /charpick | |
| parent | 3a822cb94c27a06bb72921edc1875689818ff0de (diff) | |
| parent | 15a5d5502765bc1a593d833ca9f613e77dc70aa2 (diff) | |
| download | mate-applets-d3178d6a81bb95316193d24926bed3fdc943355e.tar.bz2 mate-applets-d3178d6a81bb95316193d24926bed3fdc943355e.tar.xz | |
Merge pull request #59 from infirit/master
Move to gucharmap + make distcheck now works
Diffstat (limited to 'charpick')
| -rw-r--r-- | charpick/Makefile.am | 6 | ||||
| -rw-r--r-- | charpick/charpick.c | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/charpick/Makefile.am b/charpick/Makefile.am index 678a06f1..b4c7d1d4 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 @@ -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 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 <string.h> #include <mate-panel-applet.h> #include <mate-panel-applet-gsettings.h> -#ifdef HAVE_MUCHARMAP -# include <mucharmap/mucharmap.h> +#ifdef HAVE_GUCHARMAP +# include <gucharmap/gucharmap.h> #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 |