From 858d8ee663212c5efa4561b0a2abb9c1d2485c27 Mon Sep 17 00:00:00 2001
From: Ken VanDine <ken.vandine@canonical.com>
Date: Mon, 19 Mar 2012 10:58:53 -0400
Subject: Import upstream version 0.8.4.1

---
 src/Makefile.in         | 5 ++++-
 src/indicator-sound.c   | 4 +++-
 src/metadata-widget.c   | 2 +-
 src/voip-input-widget.c | 2 +-
 src/volume-widget.c     | 2 +-
 5 files changed, 10 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/Makefile.in b/src/Makefile.in
index ca34bba..308bbfc 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -56,7 +56,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(top_srcdir)/Makefile.am.marshal
 subdir = src
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/gcov.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/gcov.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
diff --git a/src/indicator-sound.c b/src/indicator-sound.c
index 272c8da..d21d722 100644
--- a/src/indicator-sound.c
+++ b/src/indicator-sound.c
@@ -17,10 +17,12 @@ You should have received a copy of the GNU General Public License along
 with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include "config.h"
+
 #include <math.h>
 #include <glib.h>
 #include <glib-object.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <libdbusmenu-gtk/menu.h>
diff --git a/src/metadata-widget.c b/src/metadata-widget.c
index da2ae9a..ceae79a 100644
--- a/src/metadata-widget.c
+++ b/src/metadata-widget.c
@@ -22,7 +22,7 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "config.h"
 #endif
 
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include "metadata-widget.h"
 #include "common-defs.h"
 #include <gtk/gtk.h>
diff --git a/src/voip-input-widget.c b/src/voip-input-widget.c
index 5f67fab..03879e7 100644
--- a/src/voip-input-widget.c
+++ b/src/voip-input-widget.c
@@ -22,7 +22,7 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "config.h"
 #endif
 
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <math.h>
 #include <glib.h>
 #include "voip-input-widget.h"
diff --git a/src/volume-widget.c b/src/volume-widget.c
index c71c1e3..ac603c1 100644
--- a/src/volume-widget.c
+++ b/src/volume-widget.c
@@ -22,7 +22,7 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "config.h"
 #endif
 
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <math.h>
 #include <glib.h>
 #include "volume-widget.h"
-- 
cgit v1.2.3