From 63dad6a7ff9cebb6d55d19d8d4233a171100a320 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Mon, 8 Jun 2009 09:31:48 -0500
Subject: Patch from Mark Trompell to make suffix checking better.

---
 src/applet-main.c | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/applet-main.c b/src/applet-main.c
index fca71a7..2aa03ee 100644
--- a/src/applet-main.c
+++ b/src/applet-main.c
@@ -62,16 +62,10 @@ load_module (const gchar * name, GtkWidget * menu)
 	g_debug("Looking at Module: %s", name);
 	g_return_val_if_fail(name != NULL, FALSE);
 
-	guint suffix_len = strlen(G_MODULE_SUFFIX);
-	guint name_len = strlen(name);
-
-	g_return_val_if_fail(name_len > suffix_len, FALSE);
-
-	int i;
-	for (i = 0; i < suffix_len; i++) {
-		if (name[(name_len - suffix_len) + i] != (G_MODULE_SUFFIX)[i])
-			return FALSE;
+	if (!g_str_has_suffix(name, G_MODULE_SUFFIX)) {
+		return FALSE;
 	}
+
 	g_debug("Loading Module: %s", name);
 
 	gchar * fullpath = g_build_filename(INDICATOR_DIR, name, NULL);
-- 
cgit v1.2.3


From 8850baa192b65b5b9b4985cab9a08aacb5fed9d1 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Tue, 4 Aug 2009 00:01:06 +0100
Subject: A bunch of distcheck fixes to clean things up

---
 src/Makefile.am | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src')

diff --git a/src/Makefile.am b/src/Makefile.am
index 02b70c1..97af739 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,6 +6,7 @@ indicator_applet_CFLAGS = \
 	-DG_LOG_DOMAIN=\""Indicator-Applet"\" \
 	-DDATADIR=\""$(datadir)"\" \
 	-DINDICATOR_DIR=\""$(libdir)/indicators/2"\" \
+	-I$(srcdir)/.. \
 	$(APPLET_CFLAGS)
 
 indicator_applet_SOURCES = 			\
-- 
cgit v1.2.3