summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2013-01-29 02:40:43 -0800
committerStefano Karapetsas <[email protected]>2013-01-29 02:40:43 -0800
commit205530f345e20850f814111399d89cd94daa6f36 (patch)
treec918bd0ff1292cfb03a883c2656c68ca9a53a955
parentad73fd8ef318fa8edd37fd949330e9173e089af2 (diff)
parent79c1485d955e32a1d2fc64e96f8b342c76be3f4f (diff)
downloadmate-applets-205530f345e20850f814111399d89cd94daa6f36.tar.bz2
mate-applets-205530f345e20850f814111399d89cd94daa6f36.tar.xz
Merge pull request #30 from NiceandGently/master
build charpic applet against mate-character-map
-rw-r--r--charpick/Makefile.am4
-rw-r--r--charpick/charpick.c8
-rw-r--r--configure.in36
3 files changed, 24 insertions, 24 deletions
diff --git a/charpick/Makefile.am b/charpick/Makefile.am
index 2597bded..4aa71adf 100644
--- a/charpick/Makefile.am
+++ b/charpick/Makefile.am
@@ -5,7 +5,7 @@ INCLUDES = \
-I$(srcdir) \
-DCHARPICK_MENU_UI_DIR=\""$(uidir)"\" \
$(MATE_APPLETS4_CFLAGS) \
- $(GUCHARMAP_CFLAGS)
+ $(MUCHARMAP_CFLAGS)
libexec_PROGRAMS = charpick_applet2
@@ -15,7 +15,7 @@ charpick_applet2_SOURCES = charpick.c \
charpick_applet2_LDADD = \
$(MATE_APPLETS4_LIBS) \
- $(GUCHARMAP_LIBS)
+ $(MUCHARMAP_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 3e3ab77b..abcdf3e2 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_GUCHARMAP
-# include <gucharmap/gucharmap.h>
+#ifdef HAVE_MUCHARMAP
+# include <mucharmap/mucharmap.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_GUCHARMAP
+#ifdef HAVE_MUCHARMAP
/* 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\""),
- gucharmap_get_unicode_name (g_utf8_get_char (label)));
+ mucharmap_get_unicode_name (g_utf8_get_char (label)));
#else
name = g_strdup (_("Insert special character"));
#endif
diff --git a/configure.in b/configure.in
index 5f680723..d586192e 100644
--- a/configure.in
+++ b/configure.in
@@ -28,8 +28,8 @@ PYGTK_REQUIRED=2.6
PYGOBJECT_REQUIRED=2.6
MATE_ICON_THEME_REQUIRED=1.1.0
LIBXML_REQUIRED=2.5.0
-GUCHARMAP2_REQUIRED=2.23.0
-GUCHARMAP_REQUIRED=1.4.0
+MUCHARMAP2_REQUIRED=1.5.0
+MUCHARMAP_REQUIRED=1.4.0
POLKIT_REQUIRED=0.92
NETWORKMANAGER_REQUIRED=0.7
dnl ***************************************************************************
@@ -238,27 +238,27 @@ fi
AC_SUBST(UPOWER_CFLAGS)
AC_SUBST(UPOWER_LIBS)
-dnl -- check for gucharmap (optional) -----------------------------------------
+dnl -- check for mucharmap (optional) -----------------------------------------
-PKG_CHECK_EXISTS([gucharmap-2 >= $GUCHARMAP2_REQUIRED],
- [have_gucharmap=yes have_gucharmap_2=yes],[have_gucharmap_2=no])
-if test "$have_gucharmap_2" = "yes"; then
- PKG_CHECK_MODULES([GUCHARMAP],[gucharmap-2 >= $GUCHARMAP2_REQUIRED])
+PKG_CHECK_EXISTS([mucharmap-2 >= $MUCHARMAP2_REQUIRED],
+ [have_mucharmap=yes have_mucharmap_2=yes],[have_mucharmap_2=no])
+if test "$have_mucharmap_2" = "yes"; then
+ PKG_CHECK_MODULES([MUCHARMAP],[mucharmap-2 >= $MUCHARMAP2_REQUIRED])
else
- PKG_CHECK_MODULES([GUCHARMAP], [gucharmap >= $GUCHARMAP_REQUIRED],
- [have_gucharmap=yes],[have_gucharmap=no])
+ PKG_CHECK_MODULES([MUCHARMAP], [mucharmap >= $MUCHARMAP_REQUIRED],
+ [have_mucharmap=yes],[have_mucharmap=no])
fi
-if test "$have_gucharmap_2" = "yes"; then
- AC_DEFINE([HAVE_GUCHARMAP_2],[1],[Define if gucharmap API is version 2])
+if test "$have_mucharmap_2" = "yes"; then
+ AC_DEFINE([HAVE_MUCHARMAP_2],[1],[Define if mucharmap API is version 2])
fi
-if test "$have_gucharmap" = "yes"; then
- AC_DEFINE([HAVE_GUCHARMAP],[1],[Gucharmap Available])
+if test "$have_mucharmap" = "yes"; then
+ AC_DEFINE([HAVE_MUCHARMAP],[1],[Mucharmap Available])
else
- AC_MSG_WARN([*** 'charpick' applet will not be built with gucharmap support ***])
+ AC_MSG_WARN([*** 'charpick' applet will not be built with mucharmap support ***])
fi
-AC_SUBST(GUCHARMAP_CFLAGS)
-AC_SUBST(GUCHARMAP_LIBS)
+AC_SUBST(MUCHARMAP_CFLAGS)
+AC_SUBST(MUCHARMAP_LIBS)
dnl -- check for Python modules (optional) ------------------------------
PYGTK_CFLAGS=
@@ -714,8 +714,8 @@ mate-applets-$VERSION configure summary:
- accessx-status $HAVE_XKB
- battstat $build_battstat_applet
- charpick always
- - gucharmap support $have_gucharmap
- - gucharmap-2 support $have_gucharmap_2
+ - mucharmap support $have_mucharmap
+ - mucharmap-2 support $have_mucharmap_2
- cpufreq $build_cpufreq_applet
- building selector $enable_selector
- using PolicyKit $HAVE_POLKIT