Merge lp:~jdstrand/hud/hud-lp1218107 into lp:hud/13.10

[Jamie Strandboge]

use libnih-dbus to generate object path name (LP: #1218107)
- CMakeLists.txt: add NIH_INCLUDE_DIRS and NIH_DBUS_INCLUDE_DIRS
- src/CMakeLists.txt: add NIH_LIBRARIES and NIH_DBUS_LIBRARIES
- src/application-source.c: use nih_dbus_path()
- debian/control: Build-Depends on libnih-dbus-dev

use libnih-dbus to generate object path name (LP: #1218107)
- CMakeLists.txt: add NIH_INCLUDE_DIRS and NIH_DBUS_INCLUDE_DIRS
- src/CMakeLists.txt: add NIH_LIBRARIES and NIH_DBUS_LIBRARIES
- src/application-source.c: use nih_dbus_path()
- debian/control: Build-Depends on libnih-dbus-dev

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:317
http://jenkins.qa.ubuntu.com/job/hud-ci/117/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/hud-saucy-amd64-ci/78
    SUCCESS: http://jenkins.qa.ubuntu.com/job/hud-saucy-armhf-ci/9
    SUCCESS: http://jenkins.qa.ubuntu.com/job/hud-saucy-i386-ci/78

Click here to trigger a rebuild:
http://s-jenkins:8080/job/hud-ci/117/rebuild

review: Approve (continuous-integration)

[Ted Gould (ted)]

Great, thanks!

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-06-04 20:47:57 +0000
+++ CMakeLists.txt	2013-09-03 20:24:10 +0000
@@ -85,6 +85,15 @@
 pkg_search_module(GTK3 REQUIRED gtk+-3.0)
 include_directories(${GTK3_INCLUDE_DIRS})
 
+pkg_check_modules(NIH REQUIRED libnih)
+include_directories(${NIH_INCLUDE_DIRS})
+
+pkg_check_modules(NIH_DBUS REQUIRED libnih-dbus)
+include_directories(${NIH_DBUS_INCLUDE_DIRS})
+
+pkg_check_modules(DBUS REQUIRED dbus-1)
+include_directories(${DBUS_INCLUDE_DIRS})
+
 find_package(Vala 0.12)
 
 find_package(GObjectIntrospection 0.9.12)

=== modified file 'debian/control'
--- debian/control	2013-07-22 04:57:50 +0000
+++ debian/control	2013-09-03 20:24:10 +0000
@@ -29,9 +29,10 @@
                libpocketsphinx-dev (>= 0.8),
                libsphinxbase-dev (>= 0.8),
                sphinx-voxforge-hmm-en,
-               sphinx-voxforge-lm-en,               
+               sphinx-voxforge-lm-en,
                pulseaudio,
                python-setuptools,
+               libnih-dbus-dev,
 Standards-Version: 3.9.4
 Homepage: http://launchpad.net/hud
 # If you aren't a member of ~indicator-applet-developers but need to upload

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2013-06-14 00:48:33 +0000
+++ src/CMakeLists.txt	2013-09-03 20:24:10 +0000
@@ -156,6 +156,8 @@
 ${SQLITE3_LIBRARIES}
 ${POCKETSPHINX_LIBRARIES}
 ${PHABLET_LIBRARIES}
+${NIH_LIBRARIES}
+${NIH_DBUS_LIBRARIES}
 )
 
 ###########################

=== modified file 'src/application-source.c'
--- src/application-source.c	2013-08-21 18:10:29 +0000
+++ src/application-source.c	2013-09-03 20:24:10 +0000
@@ -30,6 +30,9 @@
 #include "dbusmenu-collector.h"
 #include "source-list.h"
 
+#include <nih/alloc.h>
+#include <libnih-dbus.h>
+
 struct _HudApplicationSourcePrivate {
 	GDBusConnection * session;
 
@@ -442,14 +445,11 @@
 
 	source->priv->skel = app_iface_com_canonical_hud_application_skeleton_new();
 
-	gchar * app_id_clean = g_strdup(id);
-	gchar * app_id_cleanp;
-	for (app_id_cleanp = app_id_clean; app_id_cleanp[0] != '\0'; app_id_cleanp++) {
-		if (!g_ascii_isalnum(app_id_cleanp[0])) {
-			app_id_cleanp[0] = '_';
-		}
-	}
-	source->priv->path = g_strdup_printf("/com/canonical/hud/applications/%s", app_id_clean);
+	char * app_id_path;
+	app_id_path = nih_dbus_path(NULL, "/com/canonical/hud/applications", id, NULL);
+	if (app_id_path == NULL) /* emulate glib memory handling and terminate */
+		g_error("Unable to allocate memory for nih_dbus_path()");
+	source->priv->path = g_strdup(app_id_path);
 
 	int i = 0;
 	GError * error = NULL;
@@ -472,7 +472,7 @@
 		g_free(source->priv->path);
 		g_clear_object(&source->priv->skel);
 
-		source->priv->path = g_strdup_printf("/com/canonical/hud/applications/%s_%d", app_id_clean, ++i);
+		source->priv->path = g_strdup_printf("%s_%d", app_id_path, ++i);
 		source->priv->skel = app_iface_com_canonical_hud_application_skeleton_new();
 	}
 
@@ -480,7 +480,7 @@
 	g_signal_connect(G_OBJECT(source->priv->skel), "handle-set-window-context", G_CALLBACK(dbus_set_context), source);
 
 	g_debug("Application ('%s') path: %s", id, source->priv->path);
-	g_free(app_id_clean);
+	nih_free(app_id_path);
 
 	return source;
 }