From dd147887cb70a52dcba1cd26d9bbf7e29545afc4 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Sat, 7 Sep 2013 09:39:38 -0500
Subject: add preliminary unit tests for utils

---
 src/utils.c | 51 ++++++++++++++++++++++++++++++---------------------
 1 file changed, 30 insertions(+), 21 deletions(-)

(limited to 'src')

diff --git a/src/utils.c b/src/utils.c
index b99de94..5dccc52 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -53,32 +53,41 @@ is_locale_12h (void)
 void
 split_settings_location (const gchar * location, gchar ** zone, gchar ** name)
 {
-  gchar * location_dup = g_strdup (location);
-  gchar * first = strchr (location_dup, ' ');
+  gchar * location_dup;
+  gchar * first;
 
-  if (first) {
-    first[0] = 0;
-  }
+  location_dup = g_strdup (location);
+  g_strstrip (location_dup);
 
-  if (zone) {
-    *zone = location_dup;
-  }
+  if ((first = strchr (location_dup, ' ')))
+    *first = '\0';
 
-  if (name) {
-    gchar * after = first ? g_strstrip (first + 1) : NULL;
-    if (after == NULL || after[0] == 0) {
-      /* Make up name from zone */
-      gchar * chr = strrchr (location_dup, '/');
-      after = g_strdup (chr ? chr + 1 : location_dup);
-      while ((chr = strchr (after, '_')) != NULL) { /* and turn underscores to spaces */
-        *chr = ' ';
-      }
-      *name = after;
+  if (zone != NULL)
+    {
+      *zone = location_dup;
     }
-    else {
-      *name = g_strdup (after);
+
+  if (name != NULL)
+    {
+      gchar * after = first ? g_strstrip (first + 1) : NULL;
+
+      if (after && *after)
+        {
+          *name = g_strdup (after);
+        }
+      else /* make the name from zone */
+        {
+          gchar * chr = strrchr (location_dup, '/');
+          after = g_strdup (chr ? chr + 1 : location_dup);
+
+          /* replace underscores with spaces */
+          for (chr=after; chr && *chr; chr++)
+            if (*chr == '_')
+              *chr = ' ';
+
+          *name = after;
+        }
     }
-  }
 }
 
 gchar *
-- 
cgit v1.2.3


From ecee96636e70894355aaee58675b1dbacd202ac9 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Sat, 7 Sep 2013 09:48:46 -0500
Subject: get coverage reports working. We now have nonzero coverage, whoo

---
 src/Makefile.am | 83 ++++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 53 insertions(+), 30 deletions(-)

(limited to 'src')

diff --git a/src/Makefile.am b/src/Makefile.am
index 2f247c1..093a258 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,44 +1,67 @@
 
-if BUILD_CCPANEL
-ccpaneldir = $(libdir)/control-center-1/panels/
-ccpanel_LTLIBRARIES = libindicator-datetime.la
-endif
+SHARED_CFLAGS = \
+  -Wall \
+  -Wextra -Wno-missing-field-initializers \
+  -Werror \
+  $(SERVICE_CFLAGS) \
+  $(COVERAGE_CFLAGS) \
+  -DTIMEZONE_FILE="\"/etc/timezone\"" \
+  -DG_LOG_DOMAIN=\"Indicator-Datetime\"
+
+###
+###
+###
+
+noinst_LIBRARIES = libindicator-datetime-service.a
+
+libindicator_datetime_service_a_CFLAGS = \
+  $(SHARED_CFLAGS)
+
+libindicator_datetime_service_a_SOURCES = \
+  planner.c \
+  planner.h \
+  planner-eds.c \
+  planner-eds.h \
+  service.c \
+  service.h \
+  timezone.c \
+  timezone.h \
+  timezone-file.c \
+  timezone-file.h \
+  timezone-geoclue.c \
+  timezone-geoclue.h \
+  utils.c \
+  utils.h \
+  dbus-shared.h \
+  settings-shared.h
+
+###
+###
+###
 
 libexec_PROGRAMS = indicator-datetime-service
 
 indicator_datetime_service_SOURCES = \
-	planner.c \
-	planner.h \
-	planner-eds.c \
-	planner-eds.h \
-	service.c \
-	service.h \
-	main.c \
-	timezone.c \
-	timezone.h \
-	timezone-file.c \
-	timezone-file.h \
-	timezone-geoclue.c \
-	timezone-geoclue.h \
-	utils.c \
-	utils.h \
-	dbus-shared.h \
-	settings-shared.h
+  main.c
 
 indicator_datetime_service_CFLAGS = \
-	-Wall \
-        -Wextra -Wno-missing-field-initializers \
-	-Werror \
-	$(SERVICE_CFLAGS) \
-	$(COVERAGE_CFLAGS) \
-	-DTIMEZONE_FILE="\"/etc/timezone\"" \
-	-DG_LOG_DOMAIN=\"Indicator-Datetime\"
+  $(SHARED_CFLAGS)
+
 indicator_datetime_service_LDADD = \
-	$(SERVICE_LIBS)
+  libindicator-datetime-service.a \
+  $(SERVICE_LIBS)
+
 indicator_datetime_service_LDFLAGS = \
-	$(COVERAGE_LDFLAGS)
+  $(COVERAGE_LDFLAGS)
+
+###
+###
+###
 
 if BUILD_CCPANEL
+ccpaneldir = $(libdir)/control-center-1/panels/
+ccpanel_LTLIBRARIES = libindicator-datetime.la
+
 libindicator_datetime_la_SOURCES =\
 	datetime-prefs.c \
 	datetime-prefs-locations.c \
-- 
cgit v1.2.3


From 2bf6740a420f35942e9f74b7f7ef566de0ba736b Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Mon, 9 Sep 2013 11:53:10 -0500
Subject: in utils.h, include gio/gio.h to ensure GSettings struct is declared

---
 src/utils.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src')

diff --git a/src/utils.h b/src/utils.h
index fff9194..31a12bc 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -24,6 +24,7 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define __DATETIME_UTILS_H__
 
 #include <glib.h>
+#include <gio/gio.h> /* GSettings */
 
 G_BEGIN_DECLS
 
-- 
cgit v1.2.3