diff options
| author | Ted Gould <ted@canonical.com> | 2009-09-17 10:04:37 -0500 |
|---|---|---|
| committer | Ted Gould <ted@canonical.com> | 2009-09-17 10:04:37 -0500 |
| commit | c99553f4efc2b2a1a113ed47e8847ead4bf3b619 (patch) | |
| tree | 26358b19015680f60130c5b52046e37de93008bd | |
| parent | 6e72241e9c5805bd0f0b1fae1acdb2e938ea850d (diff) | |
| parent | 40a0102f12f2c355d32394a8480fe953726b65c9 (diff) | |
| download | ayatana-indicator-messages-c99553f4efc2b2a1a113ed47e8847ead4bf3b619.tar.gz ayatana-indicator-messages-c99553f4efc2b2a1a113ed47e8847ead4bf3b619.tar.bz2 ayatana-indicator-messages-c99553f4efc2b2a1a113ed47e8847ead4bf3b619.zip | |
Upstream release 0.2.3
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | configure.ac | 32 | ||||
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | po/POTFILES.in | 7 | ||||
| -rw-r--r-- | src/messages-service.c | 8 |
5 files changed, 53 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index 7d58c6b..26c2a33 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,8 @@ SUBDIRS = \ src \ - data + data \ + po DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall diff --git a/configure.ac b/configure.ac index 174aec6..7c83506 100644 --- a/configure.ac +++ b/configure.ac @@ -4,10 +4,12 @@ AC_INIT(src/indicator-messages.c) AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(indicator-messages, 0.2.2) +AM_INIT_AUTOMAKE(indicator-messages, 0.2.3) AM_MAINTAINER_MODE +IT_PROG_INTLTOOL([0.35.0]) + AC_ISC_POSIX AC_PROG_CC AM_PROG_CC_C_O @@ -67,6 +69,33 @@ else fi AC_SUBST(DBUSSERVICEDIR) +############################## +# Custom Junk +############################## + +AC_DEFUN([AC_DEFINE_PATH], [ + test "x$prefix" = xNONE && prefix="$ac_default_prefix" + test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' + ac_define_path=`eval echo [$]$2` + ac_define_path=`eval echo [$]ac_define_path` + $1="$ac_define_path" + AC_SUBST($1) + ifelse($3, , + AC_DEFINE_UNQUOTED($1, "$ac_define_path"), + AC_DEFINE_UNQUOTED($1, "$ac_define_path", $3)) +]) + +########################### +# Internationalization +########################### + +GETTEXT_PACKAGE=indicator-messages +AC_SUBST(GETTEXT_PACKAGE) +AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Name of the default get text domain]) +AC_DEFINE_PATH(GNOMELOCALEDIR, "${datadir}/locale", [locale directory]) + +AM_GLIB_GNU_GETTEXT + ########################### # Files ########################### @@ -88,6 +117,7 @@ data/icons/48x48/Makefile data/icons/48x48/status/Makefile data/icons/scalable/Makefile data/icons/scalable/status/Makefile +po/Makefile.in ]) ########################### diff --git a/debian/changelog b/debian/changelog index ff2011d..1d4e69a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +indicator-messages (0.2.3-0ubuntu1~ppa1) UNRELEASED; urgency=low + + * Upstream release 0.2.3 + + -- Ted Gould <ted@ubuntu.com> Thu, 17 Sep 2009 10:04:06 -0500 + indicator-messages (0.2.2-0ubuntu2) karmic; urgency=low * src/messages-service.c: initialise the translations diff --git a/po/POTFILES.in b/po/POTFILES.in new file mode 100644 index 0000000..0d88e74 --- /dev/null +++ b/po/POTFILES.in @@ -0,0 +1,7 @@ +[encoding: UTF-8] +src/messages-service-dbus.c +src/indicator-messages.c +src/messages-service.c +src/launcher-menu-item.c +src/im-menu-item.c +src/app-menu-item.c diff --git a/src/messages-service.c b/src/messages-service.c index 0ba0deb..e37a721 100644 --- a/src/messages-service.c +++ b/src/messages-service.c @@ -22,6 +22,8 @@ with this program. If not, see <http://www.gnu.org/licenses/>. #include <string.h> #include <locale.h> +#include <libintl.h> +#include <config.h> #include <pango/pango-utils.h> #include <dbus/dbus-glib-bindings.h> #include <libindicate/listener.h> @@ -1220,7 +1222,11 @@ main (int argc, char ** argv) return 1; } - setlocale(LC_ALL,""); + /* Setting up i18n and gettext. Apparently, we need + all of these. */ + setlocale (LC_ALL, ""); + bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR); + textdomain (GETTEXT_PACKAGE); dbus_interface = message_service_dbus_new(); |